From fedd0080004c91fa7933d570811566f7b9ba5088 Mon Sep 17 00:00:00 2001 From: "Xiaofei Cao (from Dev Box)" Date: Thu, 19 Mar 2026 09:19:05 +0800 Subject: [PATCH 1/7] sync core PR: [http-client-java] fix discriminator with no subtypes Sync microsoft/typespec#10080 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 0b83fa0f7d..f1931a7b29 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 0b83fa0f7db2a42205d5187f862ef13098758700 +Subproject commit f1931a7b2978edc39bd58a0ca3fdf4fdb834eb7a From 943953c8441670444a4bd059ed2298984ddb8cc3 Mon Sep 17 00:00:00 2001 From: "Xiaofei Cao (from Dev Box)" Date: Thu, 19 Mar 2026 09:21:26 +0800 Subject: [PATCH 2/7] regenerate typespec-tests for discriminator fix Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../defaultclient/HeaderParamAsyncClient.java | 6 +- .../defaultclient/HeaderParamClient.java | 6 +- .../HeaderParamClientBuilder.java | 6 +- .../defaultclient/MixedParamsAsyncClient.java | 6 +- .../defaultclient/MixedParamsClient.java | 6 +- .../MixedParamsClientBuilder.java | 6 +- .../MultipleParamsAsyncClient.java | 6 +- .../defaultclient/MultipleParamsClient.java | 6 +- .../MultipleParamsClientBuilder.java | 6 +- .../defaultclient/ParamAliasAsyncClient.java | 4 +- .../defaultclient/ParamAliasClient.java | 4 +- .../ParamAliasClientBuilder.java | 6 +- .../defaultclient/PathParamAsyncClient.java | 6 +- .../defaultclient/PathParamClient.java | 6 +- .../defaultclient/PathParamClientBuilder.java | 6 +- .../defaultclient/QueryParamAsyncClient.java | 6 +- .../defaultclient/QueryParamClient.java | 6 +- .../QueryParamClientBuilder.java | 6 +- .../implementation/HeaderParamClientImpl.java | 2 +- .../implementation/MixedParamsClientImpl.java | 2 +- .../MultipleParamsClientImpl.java | 2 +- .../implementation/ParamAliasClientImpl.java | 2 +- .../implementation/PathParamClientImpl.java | 2 +- .../implementation/QueryParamClientImpl.java | 2 +- .../implementation/package-info.java | 2 +- .../defaultclient}/models/BlobProperties.java | 2 +- .../defaultclient/models/Input.java | 2 +- .../defaultclient/models/WithBodyRequest.java | 2 +- .../defaultclient/models/package-info.java | 2 +- .../defaultclient/package-info.java | 2 +- ...dividuallyNestedWithHeaderAsyncClient.java | 4 +- .../IndividuallyNestedWithHeaderClient.java | 4 +- ...viduallyNestedWithHeaderClientBuilder.java | 8 +- ...ndividuallyNestedWithMixedAsyncClient.java | 4 +- .../IndividuallyNestedWithMixedClient.java | 4 +- ...ividuallyNestedWithMixedClientBuilder.java | 8 +- ...viduallyNestedWithMultipleAsyncClient.java | 4 +- .../IndividuallyNestedWithMultipleClient.java | 4 +- ...duallyNestedWithMultipleClientBuilder.java | 8 +- ...duallyNestedWithParamAliasAsyncClient.java | 4 +- ...ndividuallyNestedWithParamAliasClient.java | 4 +- ...allyNestedWithParamAliasClientBuilder.java | 8 +- ...IndividuallyNestedWithPathAsyncClient.java | 6 +- .../IndividuallyNestedWithPathClient.java | 6 +- ...dividuallyNestedWithPathClientBuilder.java | 8 +- ...ndividuallyNestedWithQueryAsyncClient.java | 6 +- .../IndividuallyNestedWithQueryClient.java | 6 +- ...ividuallyNestedWithQueryClientBuilder.java | 8 +- ...ndividuallyNestedWithHeaderClientImpl.java | 2 +- ...IndividuallyNestedWithMixedClientImpl.java | 2 +- ...ividuallyNestedWithMultipleClientImpl.java | 2 +- ...iduallyNestedWithParamAliasClientImpl.java | 2 +- .../IndividuallyNestedWithPathClientImpl.java | 2 +- ...IndividuallyNestedWithQueryClientImpl.java | 2 +- .../implementation/package-info.java | 2 +- .../models/BlobProperties.java | 2 +- .../models/package-info.java | 2 +- .../individuallyclient/package-info.java | 2 +- .../IndividuallyParentAsyncClient.java | 4 +- .../IndividuallyParentClient.java | 4 +- .../IndividuallyParentClientBuilder.java | 6 +- ...allyParentNestedWithHeaderAsyncClient.java | 4 +- ...ividuallyParentNestedWithHeaderClient.java | 4 +- ...lyParentNestedWithHeaderClientBuilder.java | 6 +- ...uallyParentNestedWithMixedAsyncClient.java | 4 +- ...dividuallyParentNestedWithMixedClient.java | 4 +- ...llyParentNestedWithMixedClientBuilder.java | 6 +- ...lyParentNestedWithMultipleAsyncClient.java | 4 +- ...iduallyParentNestedWithMultipleClient.java | 4 +- ...ParentNestedWithMultipleClientBuilder.java | 6 +- ...ParentNestedWithParamAliasAsyncClient.java | 4 +- ...uallyParentNestedWithParamAliasClient.java | 4 +- ...rentNestedWithParamAliasClientBuilder.java | 6 +- ...duallyParentNestedWithPathAsyncClient.java | 6 +- ...ndividuallyParentNestedWithPathClient.java | 6 +- ...allyParentNestedWithPathClientBuilder.java | 6 +- ...uallyParentNestedWithQueryAsyncClient.java | 6 +- ...dividuallyParentNestedWithQueryClient.java | 6 +- ...llyParentNestedWithQueryClientBuilder.java | 6 +- .../IndividuallyParentClientImpl.java | 2 +- ...uallyParentNestedWithHeaderClientImpl.java | 2 +- ...duallyParentNestedWithMixedClientImpl.java | 2 +- ...llyParentNestedWithMultipleClientImpl.java | 2 +- ...yParentNestedWithParamAliasClientImpl.java | 2 +- ...iduallyParentNestedWithPathClientImpl.java | 2 +- ...duallyParentNestedWithQueryClientImpl.java | 2 +- .../implementation/package-info.java | 2 +- .../models/BlobProperties.java | 2 +- .../models/package-info.java | 2 +- .../package-info.java | 2 +- .../FlattenPropertyAsyncClient.java | 135 ----- .../FlattenPropertyClient.java | 128 ----- .../FlattenPropertyClientImpl.java | 220 -------- .../models/FlattenUnknownModel.java | 123 ----- .../models/SolutionProperties.java | 115 ---- .../java/azure/core/page/PageAsyncClient.java | 64 --- .../main/java/azure/core/page/PageClient.java | 53 -- .../page/implementation/PageClientImpl.java | 264 ---------- .../implementation/ErrorsImpl.java | 8 +- .../implementation/ManagedIdentitiesImpl.java | 8 +- ...ntResourceGroupResourceOperationsImpl.java | 8 +- ...entSubscriptionResourceOperationsImpl.java | 8 +- ...elSubscriptionResource1OperationsImpl.java | 8 +- ...elSubscriptionResource2OperationsImpl.java | 8 +- .../combined/implementation/DisksImpl.java | 8 +- .../implementation/VirtualMachinesImpl.java | 8 +- .../combined/implementation/DisksImpl.java | 8 +- .../implementation/VirtualMachinesImpl.java | 8 +- .../implementation/StorageAccountsImpl.java | 8 +- .../implementation/VirtualMachinesImpl.java | 8 +- .../NonResourceOperationsImpl.java | 8 +- .../CheckNameAvailabilitiesImpl.java | 16 +- .../implementation/OptionalBodiesImpl.java | 32 +- .../ExtensionsResourcesImpl.java | 8 +- .../implementation/LocationResourcesImpl.java | 8 +- .../resources/implementation/NestedsImpl.java | 8 +- .../implementation/SingletonsImpl.java | 16 +- .../implementation/TopLevelsImpl.java | 8 +- .../encode/duration/HeaderAsyncClient.java | 25 +- .../java/encode/duration/HeaderClient.java | 24 +- .../encode/duration/PropertyAsyncClient.java | 8 +- .../java/encode/duration/PropertyClient.java | 8 +- .../encode/duration/QueryAsyncClient.java | 25 +- .../java/encode/duration/QueryClient.java | 24 +- .../duration/implementation/HeadersImpl.java | 88 ++-- .../implementation/PropertiesImpl.java | 16 +- .../duration/implementation/QueriesImpl.java | 81 ++- .../Float64MillisecondsDurationProperty.java | 17 +- ...loatMillisecondsDurationArrayProperty.java | 24 +- .../FloatMillisecondsDurationProperty.java | 17 +- ...illisecondsLargerUnitDurationProperty.java | 17 +- .../Int32MillisecondsDurationProperty.java | 21 +- ...illisecondsLargerUnitDurationProperty.java | 21 +- .../ExtensibleStringsAsyncClient.java | 97 ---- .../specialwords/ExtensibleStringsClient.java | 93 ---- .../SpecialWordsClientBuilder.java | 22 - .../models/ExtensibleString.java | 243 --------- .../models/package-info.java | 49 -- .../implementation/ExtensibleStringsImpl.java | 152 ------ .../SpecialWordsClientImpl.java | 15 - .../implementation/VaultsImpl.java | 8 +- .../armlegacy/implementation/SkusImpl.java | 24 +- .../ChildExtensionResourceInterfacesImpl.java | 8 +- .../ChildResourcesInterfacesImpl.java | 8 +- ...MaintenanceWindowStatusOperationsImpl.java | 8 +- .../ModelInterfaceSameNamesImpl.java | 8 +- .../TopLevelArmResourceInterfacesImpl.java | 8 +- .../fluent/ItemsClient.java | 68 --- .../models/ListResultSummary2Inner.java | 132 ----- .../implementation/FishesImpl.java | 24 +- .../implementation/ItemsClientImpl.java | 494 ------------------ .../implementation/ItemsImpl.java | 35 -- .../ListResultSummary2Impl.java | 48 -- .../implementation/PrioritiesClientImpl.java | 4 +- .../implementation/models/ListResult.java | 26 +- .../models/ListResultSummary.java | 131 ----- .../models/Items.java | 61 --- .../models/ListResult2.java | 133 ----- .../models/ListResultSummary2.java | 41 -- .../TopLevelArmResourcesImpl.java | 16 +- .../DiscriminatorEdgeCasesAsyncClient.java | 46 ++ .../DiscriminatorEdgeCasesClient.java | 45 ++ .../DiscriminatorEdgeCasesClientImpl.java | 71 +++ .../ModelWithDiscriminatorNoSubtypes.java} | 75 ++- .../enumservice/EnumServiceAsyncClient.java | 53 -- .../enumservice/EnumServiceClient.java | 52 -- .../implementation/EnumServiceClientImpl.java | 88 ---- ...ntinitialization-defaultclient.properties} | 0 ...tialization-individuallyclient.properties} | 0 ...ation-individuallyparentclient.properties} | 0 .../generated/HeaderParamClientTestBase.java | 26 +- ...ividuallyNestedWithPathClientTestBase.java | 26 +- ...llyParentNestedWithPathClientTestBase.java | 30 +- .../defaultclient/DefaultClientTests.java | 68 --- .../IndividuallyClientTests.java | 74 --- .../IndividuallyParentClientTests.java | 76 --- .../MethodSubscriptionIdTest.java | 21 - .../nonresource/NonResourceTests.java | 11 - .../encode/duration/EncodeDurationTests.java | 77 --- .../ExtensibleStringsClientTest.java | 19 - .../generated/SpecialWordsClientTestBase.java | 12 - .../PagedModelPackageTests.java | 28 - .../tsp/arm-stream-style-serialization.tsp | 33 -- .../tsp/discriminator-edge-cases.tsp | 13 + typespec-tests/tsp/enum.tsp | 8 - 185 files changed, 847 insertions(+), 4159 deletions(-) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java (94%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java (94%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java (94%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java (80%) rename typespec-tests/src/main/java/{azure/clientgenerator/core/clientinitialization/individuallyclient => _specs_/azure/clientgenerator/core/clientinitialization/defaultclient}/models/BlobProperties.java (98%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java (81%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java (82%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java (79%) rename typespec-tests/src/main/java/{azure/clientgenerator/core/clientinitialization/defaultclient => _specs_/azure/clientgenerator/core/clientinitialization/individuallyclient}/models/BlobProperties.java (98%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java (80%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java (81%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java (94%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java (94%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java (95%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java (96%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java (98%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java (99%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java (78%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java (97%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java (80%) rename typespec-tests/src/main/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java (81%) delete mode 100644 typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java delete mode 100644 typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java delete mode 100644 typespec-tests/src/main/java/specialwords/ExtensibleStringsAsyncClient.java delete mode 100644 typespec-tests/src/main/java/specialwords/ExtensibleStringsClient.java delete mode 100644 typespec-tests/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java delete mode 100644 typespec-tests/src/main/java/specialwords/extensiblestrings/models/package-info.java delete mode 100644 typespec-tests/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java delete mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java delete mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java delete mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java delete mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java delete mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java rename typespec-tests/src/main/java/{azure/clientgenerator/core/flattenproperty/models/Solution.java => tsptest/discriminatoredgecases/models/ModelWithDiscriminatorNoSubtypes.java} (53%) rename typespec-tests/src/main/resources/{azure-clientgenerator-core-clientinitialization-defaultclient.properties => _specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties} (100%) rename typespec-tests/src/main/resources/{azure-clientgenerator-core-clientinitialization-individuallyclient.properties => _specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties} (100%) rename typespec-tests/src/main/resources/{azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties => _specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties} (100%) rename typespec-tests/src/test/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java (80%) rename typespec-tests/src/test/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java (80%) rename typespec-tests/src/test/java/{ => _specs_}/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java (78%) delete mode 100644 typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java delete mode 100644 typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java delete mode 100644 typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java delete mode 100644 typespec-tests/src/test/java/specialwords/ExtensibleStringsClientTest.java delete mode 100644 typespec-tests/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java index d8b5cb4bfd..199262de6a 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java similarity index 94% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java index 15970b4e19..89f1ea9ee4 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java index 9814ad550b..5f08efc49c 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class HeaderParamClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java index af1808087a..bd7a724adc 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java similarity index 94% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java index d67b25cee4..f0ec7dbdac 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java index fc1da88f18..74619a2b58 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class MixedParamsClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java index 675066ddd6..87e4489609 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java similarity index 94% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java index 6957056c7e..3135bfd196 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java index 81f14de1ff..6f4fe5840f 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class MultipleParamsClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java index d7c603cfce..15dc398995 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java index 444287dcb9..fb4db9e8c8 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java index cccfce5755..e458847dc1 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class ParamAliasClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java index fffdd32a35..a306c54dea 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java index 0b44c5793a..cb9a456624 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java index acc4851dbd..6293f96269 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class PathParamClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java index c80b04f8fc..5612353885 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java index 79de18b60a..f37d717bc1 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java index 87f5155eaa..88e06209f2 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; -import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class QueryParamClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java index 9d71938ee8..77e8bce8fa 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java index cc215cba91..271682bc70 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java index 5adf51cb5e..5481937e75 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java index ac9e42b8f1..4ac7c32b57 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java index 1498d32b3b..3da147ba50 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java index 87fd2cb592..98e28569e3 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java similarity index 80% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java index 146f7a467e..95c5a22793 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java similarity index 98% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java index 110e907c82..d89c3c1bb2 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient.models; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java index 3ce2d74c95..850a0a709a 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.models; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java index f884b7ea4e..f90a86e77a 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.models; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java similarity index 81% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java index 1135d1c1bc..029a6aa22c 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.defaultclient.models; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java similarity index 82% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java index e65528b6e7..59ca2121be 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.defaultclient; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java index 2779ce6195..db261f11fb 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java index 4ba0a122bb..1c3b865584 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java index e4e1a569c5..409a296c73 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -52,8 +52,8 @@ public final class IndividuallyNestedWithHeaderClientBuilder implements private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES = CoreUtils + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java index b7da75aac0..53c3cee677 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java index 653331dd8e..ef09cdbfc1 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java index 9d3eb0b41f..33cef9e20a 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -52,8 +52,8 @@ public final class IndividuallyNestedWithMixedClientBuilder implements private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES = CoreUtils + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java index 1bd3bee141..2a6bc41f29 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java index f41ef644dd..87001b2643 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java index 6fa0ff162e..903427389f 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -53,8 +53,8 @@ public final class IndividuallyNestedWithMultipleClientBuilder private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES = CoreUtils + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java index 8b571536b3..3af980f242 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java index 5b1c79b4cf..2ca0e3612a 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java index 08bbf80e0c..f79386da36 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -55,8 +55,8 @@ public final class IndividuallyNestedWithParamAliasClientBuilder private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES = CoreUtils + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java index 2395fb1d54..de5fabcb75 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; -import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java index 1a628e3512..164c42056a 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; -import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java index a6e6ecf693..717cfd3c82 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -52,8 +52,8 @@ public final class IndividuallyNestedWithPathClientBuilder implements private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES = CoreUtils + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java index 4687e43da9..411ab4f040 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; -import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java index 386620bb3f..f70932d97c 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; -import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java index b9bf96e40a..d6fb4e21a3 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -52,8 +52,8 @@ public final class IndividuallyNestedWithQueryClientBuilder implements private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES = CoreUtils + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java index a066012e6a..5e3f94b1cf 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java index bfd2b9633e..dfba5ce457 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java index 73f3a63e34..f310a4e56c 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java index b8b596731d..6d43e49794 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java index f94075e66e..c82909a98c 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java index 64794f5a5c..5704371b6f 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java similarity index 79% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java index eeeb569ccc..5e9e3e0121 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java similarity index 98% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java index 4c721e41d6..74ff6516b8 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.models; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java similarity index 80% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java index 251083ae64..34507e7f5a 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.individuallyclient.models; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java similarity index 81% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java index 9a5bb32001..59b682bced 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.individuallyclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java similarity index 94% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java index fb6bcc5835..2d98f37074 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java similarity index 94% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java index 29d74a5138..d9cc367647 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java index 295021efe0..05527a9fa9 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class IndividuallyParentClientBuilder implements HttpTrait PROPERTIES = CoreUtils - .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java index 903abb7c7b..a40dc2c42e 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java index 67beeb628e..9d4b1b5726 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java index 01c34b1003..79ca34e701 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithHeaderClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java index acde1bf254..4a58ed6c18 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java index 5525e0d8ab..a3937047c2 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java index 79ecfc6729..32ea151be2 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithMixedClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java index ea28f37e70..56f0f11ec2 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java index bcd04988ad..0d5ea371b8 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java index c2b35f4aec..d20811188c 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithMultipleClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java index 09fd5b1b47..94679aa600 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java index fc8456077d..d4e8214339 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java index ed2cd85cb0..4a6bd194a0 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithParamAliasClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java index 87addaf2ba..fcdab9bed8 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java index 7fb9a31426..3d91bcd3a7 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java index e151bacc10..0619b12c4e 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithPathClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java index d08a228542..e3cae797d8 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java similarity index 95% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java index c61919c1f1..5069a7cd00 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java index 264cc7722e..2534362896 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithQueryClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java similarity index 98% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java index 9fc555c894..e5ac51fd7f 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java index ce080a8c39..c974907925 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java index 89a2c072df..efb36a71a1 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java index 576ef3cbc0..3127e122df 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java index e17cf89873..c45bcc7fe6 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java index 15231ef67c..bcf99fe609 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java index 402c7697d7..c66818ef39 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java similarity index 78% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java index 33101bf578..38e4e189db 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java similarity index 97% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java index a63457c798..9896d015b2 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java similarity index 80% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java index 2c1566b44f..0cfc765fd3 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java similarity index 81% rename from typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java rename to typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java index 1009faef5b..d7088f0d78 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java +++ b/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java index 7170464917..e4dd5e633d 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java @@ -6,9 +6,7 @@ import azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl; import azure.clientgenerator.core.flattenproperty.models.FlattenModel; -import azure.clientgenerator.core.flattenproperty.models.FlattenUnknownModel; import azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel; -import azure.clientgenerator.core.flattenproperty.models.Solution; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; @@ -138,94 +136,6 @@ public Mono> putNestedFlattenModelWithResponse(BinaryData i return this.serviceClient.putNestedFlattenModelWithResponseAsync(input, requestOptions); } - /** - * The putFlattenUnknownModel operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties: BinaryData (Optional)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties: BinaryData (Optional)
-     * }
-     * }
-     *
- * - * @param input The input parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful - * completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putFlattenUnknownModelWithResponse(BinaryData input, - RequestOptions requestOptions) { - return this.serviceClient.putFlattenUnknownModelWithResponseAsync(input, requestOptions); - } - - /** - * The putFlattenReadOnlyModel operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties (Optional): {
-     *         solutionId: String (Optional)
-     *         title: String (Optional)
-     *         content: String (Optional)
-     *     }
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties (Optional): {
-     *         solutionId: String (Optional)
-     *         title: String (Optional)
-     *         content: String (Optional)
-     *     }
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return this is the model with flattened properties that are all read-only along with {@link Response} on - * successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putFlattenReadOnlyModelWithResponse(BinaryData body, - RequestOptions requestOptions) { - return this.serviceClient.putFlattenReadOnlyModelWithResponseAsync(body, requestOptions); - } - /** * The putFlattenModel operation. * @@ -267,49 +177,4 @@ public Mono putNestedFlattenModel(NestedFlattenModel input) return putNestedFlattenModelWithResponse(BinaryData.fromObject(input), requestOptions).flatMap(FluxUtil::toMono) .map(protocolMethodData -> protocolMethodData.toObject(NestedFlattenModel.class)); } - - /** - * The putFlattenUnknownModel operation. - * - * @param input The input parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return this is the model with unknown type properties to be flattened on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono putFlattenUnknownModel(FlattenUnknownModel input) { - // Generated convenience method for putFlattenUnknownModelWithResponse - RequestOptions requestOptions = new RequestOptions(); - return putFlattenUnknownModelWithResponse(BinaryData.fromObject(input), requestOptions) - .flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(FlattenUnknownModel.class)); - } - - /** - * The putFlattenReadOnlyModel operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return this is the model with flattened properties that are all read-only on successful completion of - * {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono putFlattenReadOnlyModel(Solution body) { - // Generated convenience method for putFlattenReadOnlyModelWithResponse - RequestOptions requestOptions = new RequestOptions(); - return putFlattenReadOnlyModelWithResponse(BinaryData.fromObject(body), requestOptions) - .flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(Solution.class)); - } } diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java index 9188f468a6..6df185bf86 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java @@ -6,9 +6,7 @@ import azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl; import azure.clientgenerator.core.flattenproperty.models.FlattenModel; -import azure.clientgenerator.core.flattenproperty.models.FlattenUnknownModel; import azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel; -import azure.clientgenerator.core.flattenproperty.models.Solution; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; @@ -133,90 +131,6 @@ public Response putNestedFlattenModelWithResponse(BinaryData input, return this.serviceClient.putNestedFlattenModelWithResponse(input, requestOptions); } - /** - * The putFlattenUnknownModel operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties: BinaryData (Optional)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties: BinaryData (Optional)
-     * }
-     * }
-     *
- * - * @param input The input parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return this is the model with unknown type properties to be flattened along with {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response putFlattenUnknownModelWithResponse(BinaryData input, RequestOptions requestOptions) { - return this.serviceClient.putFlattenUnknownModelWithResponse(input, requestOptions); - } - - /** - * The putFlattenReadOnlyModel operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties (Optional): {
-     *         solutionId: String (Optional)
-     *         title: String (Optional)
-     *         content: String (Optional)
-     *     }
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties (Optional): {
-     *         solutionId: String (Optional)
-     *         title: String (Optional)
-     *         content: String (Optional)
-     *     }
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return this is the model with flattened properties that are all read-only along with {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response putFlattenReadOnlyModelWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.putFlattenReadOnlyModelWithResponse(body, requestOptions); - } - /** * The putFlattenModel operation. * @@ -258,46 +172,4 @@ public NestedFlattenModel putNestedFlattenModel(NestedFlattenModel input) { return putNestedFlattenModelWithResponse(BinaryData.fromObject(input), requestOptions).getValue() .toObject(NestedFlattenModel.class); } - - /** - * The putFlattenUnknownModel operation. - * - * @param input The input parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return this is the model with unknown type properties to be flattened. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public FlattenUnknownModel putFlattenUnknownModel(FlattenUnknownModel input) { - // Generated convenience method for putFlattenUnknownModelWithResponse - RequestOptions requestOptions = new RequestOptions(); - return putFlattenUnknownModelWithResponse(BinaryData.fromObject(input), requestOptions).getValue() - .toObject(FlattenUnknownModel.class); - } - - /** - * The putFlattenReadOnlyModel operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return this is the model with flattened properties that are all read-only. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Solution putFlattenReadOnlyModel(Solution body) { - // Generated convenience method for putFlattenReadOnlyModelWithResponse - RequestOptions requestOptions = new RequestOptions(); - return putFlattenReadOnlyModelWithResponse(BinaryData.fromObject(body), requestOptions).getValue() - .toObject(Solution.class); - } } diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java index c204dea4b6..b15d7fb3eb 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java @@ -164,46 +164,6 @@ Mono> putNestedFlattenModel(@HostParam("endpoint") String e Response putNestedFlattenModelSync(@HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); - - @Put("/azure/client-generator-core/flatten-property/flattenUnknownModel") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> putFlattenUnknownModel(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); - - @Put("/azure/client-generator-core/flatten-property/flattenUnknownModel") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response putFlattenUnknownModelSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); - - @Put("/azure/client-generator-core/flatten-property/flattenReadOnlyModel") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> putFlattenReadOnlyModel(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - - @Put("/azure/client-generator-core/flatten-property/flattenReadOnlyModel") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response putFlattenReadOnlyModelSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } /** @@ -405,184 +365,4 @@ public Response putNestedFlattenModelWithResponse(BinaryData input, return service.putNestedFlattenModelSync(this.getEndpoint(), contentType, accept, input, requestOptions, Context.NONE); } - - /** - * The putFlattenUnknownModel operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties: BinaryData (Optional)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties: BinaryData (Optional)
-     * }
-     * }
-     *
- * - * @param input The input parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful - * completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putFlattenUnknownModelWithResponseAsync(BinaryData input, - RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.putFlattenUnknownModel(this.getEndpoint(), contentType, accept, - input, requestOptions, context)); - } - - /** - * The putFlattenUnknownModel operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties: BinaryData (Optional)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties: BinaryData (Optional)
-     * }
-     * }
-     *
- * - * @param input The input parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return this is the model with unknown type properties to be flattened along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response putFlattenUnknownModelWithResponse(BinaryData input, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.putFlattenUnknownModelSync(this.getEndpoint(), contentType, accept, input, requestOptions, - Context.NONE); - } - - /** - * The putFlattenReadOnlyModel operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties (Optional): {
-     *         solutionId: String (Optional)
-     *         title: String (Optional)
-     *         content: String (Optional)
-     *     }
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties (Optional): {
-     *         solutionId: String (Optional)
-     *         title: String (Optional)
-     *         content: String (Optional)
-     *     }
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return this is the model with flattened properties that are all read-only along with {@link Response} on - * successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putFlattenReadOnlyModelWithResponseAsync(BinaryData body, - RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.putFlattenReadOnlyModel(this.getEndpoint(), contentType, accept, - body, requestOptions, context)); - } - - /** - * The putFlattenReadOnlyModel operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties (Optional): {
-     *         solutionId: String (Optional)
-     *         title: String (Optional)
-     *         content: String (Optional)
-     *     }
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     properties (Optional): {
-     *         solutionId: String (Optional)
-     *         title: String (Optional)
-     *         content: String (Optional)
-     *     }
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return this is the model with flattened properties that are all read-only along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response putFlattenReadOnlyModelWithResponse(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.putFlattenReadOnlyModelSync(this.getEndpoint(), contentType, accept, body, requestOptions, - Context.NONE); - } } diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java deleted file mode 100644 index 66bd1f48f4..0000000000 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java +++ /dev/null @@ -1,123 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.flattenproperty.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.annotation.Generated; -import com.azure.core.util.BinaryData; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; - -/** - * This is the model with unknown type properties to be flattened. - */ -@Fluent -public final class FlattenUnknownModel implements JsonSerializable { - /* - * The name property. - */ - @Generated - private final String name; - - /* - * The properties property. - */ - @Generated - private BinaryData properties; - - /** - * Creates an instance of FlattenUnknownModel class. - * - * @param name the name value to set. - */ - @Generated - public FlattenUnknownModel(String name) { - this.name = name; - } - - /** - * Get the name property: The name property. - * - * @return the name value. - */ - @Generated - public String getName() { - return this.name; - } - - /** - * Get the properties property: The properties property. - * - * @return the properties value. - */ - @Generated - public BinaryData getProperties() { - return this.properties; - } - - /** - * Set the properties property: The properties property. - * - * @param properties the properties value to set. - * @return the FlattenUnknownModel object itself. - */ - @Generated - public FlattenUnknownModel setProperties(BinaryData properties) { - this.properties = properties; - return this; - } - - /** - * {@inheritDoc} - */ - @Generated - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", this.name); - if (this.properties != null) { - jsonWriter.writeFieldName("properties"); - this.properties.writeTo(jsonWriter); - } - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of FlattenUnknownModel from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of FlattenUnknownModel if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the FlattenUnknownModel. - */ - @Generated - public static FlattenUnknownModel fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - String name = null; - BinaryData properties = null; - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("name".equals(fieldName)) { - name = reader.getString(); - } else if ("properties".equals(fieldName)) { - properties - = reader.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())); - } else { - reader.skipChildren(); - } - } - FlattenUnknownModel deserializedFlattenUnknownModel = new FlattenUnknownModel(name); - deserializedFlattenUnknownModel.properties = properties; - - return deserializedFlattenUnknownModel; - }); - } -} diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java deleted file mode 100644 index d69aa8bacf..0000000000 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.clientgenerator.core.flattenproperty.models; - -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.Immutable; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; - -/** - * This is the model with all read-only properties to be flattened. - */ -@Immutable -public final class SolutionProperties implements JsonSerializable { - /* - * The solutionId property. - */ - @Generated - private String solutionId; - - /* - * The title property. - */ - @Generated - private String title; - - /* - * The content property. - */ - @Generated - private String content; - - /** - * Creates an instance of SolutionProperties class. - */ - @Generated - public SolutionProperties() { - } - - /** - * Get the solutionId property: The solutionId property. - * - * @return the solutionId value. - */ - @Generated - public String getSolutionId() { - return this.solutionId; - } - - /** - * Get the title property: The title property. - * - * @return the title value. - */ - @Generated - public String getTitle() { - return this.title; - } - - /** - * Get the content property: The content property. - * - * @return the content value. - */ - @Generated - public String getContent() { - return this.content; - } - - /** - * {@inheritDoc} - */ - @Generated - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of SolutionProperties from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of SolutionProperties if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IOException If an error occurs while reading the SolutionProperties. - */ - @Generated - public static SolutionProperties fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - SolutionProperties deserializedSolutionProperties = new SolutionProperties(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("solutionId".equals(fieldName)) { - deserializedSolutionProperties.solutionId = reader.getString(); - } else if ("title".equals(fieldName)) { - deserializedSolutionProperties.title = reader.getString(); - } else if ("content".equals(fieldName)) { - deserializedSolutionProperties.content = reader.getString(); - } else { - reader.skipChildren(); - } - } - - return deserializedSolutionProperties; - }); - } -} diff --git a/typespec-tests/src/main/java/azure/core/page/PageAsyncClient.java b/typespec-tests/src/main/java/azure/core/page/PageAsyncClient.java index 00da9c19a6..ccd87439af 100644 --- a/typespec-tests/src/main/java/azure/core/page/PageAsyncClient.java +++ b/typespec-tests/src/main/java/azure/core/page/PageAsyncClient.java @@ -205,40 +205,6 @@ public PagedFlux withParameterizedNextLink(String select, RequestOpt return this.serviceClient.withParameterizedNextLinkAsync(select, requestOptions); } - /** - * List with relative nextLink URL that requires endpoint resolution. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     *     orders (Optional): [
-     *          (Optional){
-     *             id: int (Required)
-     *             userId: int (Required)
-     *             detail: String (Required)
-     *         }
-     *     ]
-     *     etag: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return paged collection of User items as paginated response with {@link PagedFlux}. - */ - @Generated - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux withRelativeNextLink(RequestOptions requestOptions) { - return this.serviceClient.withRelativeNextLinkAsync(requestOptions); - } - /** * List with Azure.Core.Page<>. * @@ -434,34 +400,4 @@ public PagedFlux withParameterizedNextLink(String select) { pagedResponse.getContinuationToken(), null)); }); } - - /** - * List with relative nextLink URL that requires endpoint resolution. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paged collection of User items as paginated response with {@link PagedFlux}. - */ - @Generated - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux withRelativeNextLink() { - // Generated convenience method for withRelativeNextLink - RequestOptions requestOptions = new RequestOptions(); - PagedFlux pagedFluxResponse = withRelativeNextLink(requestOptions); - return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> { - Flux> flux = (continuationTokenParam == null) - ? pagedFluxResponse.byPage().take(1) - : pagedFluxResponse.byPage(continuationTokenParam).take(1); - return flux.map(pagedResponse -> new PagedResponseBase(pagedResponse.getRequest(), - pagedResponse.getStatusCode(), pagedResponse.getHeaders(), - pagedResponse.getValue() - .stream() - .map(protocolMethodData -> protocolMethodData.toObject(User.class)) - .collect(Collectors.toList()), - pagedResponse.getContinuationToken(), null)); - }); - } } diff --git a/typespec-tests/src/main/java/azure/core/page/PageClient.java b/typespec-tests/src/main/java/azure/core/page/PageClient.java index 788f6272b2..d92d2dc455 100644 --- a/typespec-tests/src/main/java/azure/core/page/PageClient.java +++ b/typespec-tests/src/main/java/azure/core/page/PageClient.java @@ -201,40 +201,6 @@ public PagedIterable withParameterizedNextLink(String select, Reques return this.serviceClient.withParameterizedNextLink(select, requestOptions); } - /** - * List with relative nextLink URL that requires endpoint resolution. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     *     orders (Optional): [
-     *          (Optional){
-     *             id: int (Required)
-     *             userId: int (Required)
-     *             detail: String (Required)
-     *         }
-     *     ]
-     *     etag: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return paged collection of User items as paginated response with {@link PagedIterable}. - */ - @Generated - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable withRelativeNextLink(RequestOptions requestOptions) { - return this.serviceClient.withRelativeNextLink(requestOptions); - } - /** * List with Azure.Core.Page<>. * @@ -363,23 +329,4 @@ public PagedIterable withParameterizedNextLink(String select) { return serviceClient.withParameterizedNextLink(select, requestOptions) .mapPage(bodyItemValue -> bodyItemValue.toObject(User.class)); } - - /** - * List with relative nextLink URL that requires endpoint resolution. - * - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paged collection of User items as paginated response with {@link PagedIterable}. - */ - @Generated - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable withRelativeNextLink() { - // Generated convenience method for withRelativeNextLink - RequestOptions requestOptions = new RequestOptions(); - return serviceClient.withRelativeNextLink(requestOptions) - .mapPage(bodyItemValue -> bodyItemValue.toObject(User.class)); - } } diff --git a/typespec-tests/src/main/java/azure/core/page/implementation/PageClientImpl.java b/typespec-tests/src/main/java/azure/core/page/implementation/PageClientImpl.java index acf4498146..c870206103 100644 --- a/typespec-tests/src/main/java/azure/core/page/implementation/PageClientImpl.java +++ b/typespec-tests/src/main/java/azure/core/page/implementation/PageClientImpl.java @@ -249,24 +249,6 @@ Response withParameterizedNextLinkSync(@HostParam("endpoint") String @QueryParam("select") String select, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); - @Get("/azure/core/page/with-relative-next-link") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> withRelativeNextLink(@HostParam("endpoint") String endpoint, - @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); - - @Get("/azure/core/page/with-relative-next-link") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response withRelativeNextLinkSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); - @Get("{nextLink}") @ExpectedResponses({ 200 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @@ -346,26 +328,6 @@ Mono> withParameterizedNextLinkNext( Response withParameterizedNextLinkNextSync( @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); - - @Get("{nextLink}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> withRelativeNextLinkNext( - @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, - @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); - - @Get("{nextLink}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response withRelativeNextLinkNextSync( - @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, - @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); } /** @@ -1093,154 +1055,6 @@ public PagedIterable withParameterizedNextLink(String select, Reques nextLink -> withParameterizedNextLinkNextSinglePage(nextLink, requestOptionsForNextPage)); } - /** - * List with relative nextLink URL that requires endpoint resolution. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     *     orders (Optional): [
-     *          (Optional){
-     *             id: int (Required)
-     *             userId: int (Required)
-     *             detail: String (Required)
-     *         }
-     *     ]
-     *     etag: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return paged collection of User items along with {@link PagedResponse} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> withRelativeNextLinkSinglePageAsync(RequestOptions requestOptions) { - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.withRelativeNextLink(this.getEndpoint(), accept, requestOptions, context)) - .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), - getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null)); - } - - /** - * List with relative nextLink URL that requires endpoint resolution. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     *     orders (Optional): [
-     *          (Optional){
-     *             id: int (Required)
-     *             userId: int (Required)
-     *             detail: String (Required)
-     *         }
-     *     ]
-     *     etag: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return paged collection of User items as paginated response with {@link PagedFlux}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux withRelativeNextLinkAsync(RequestOptions requestOptions) { - RequestOptions requestOptionsForNextPage = new RequestOptions(); - requestOptionsForNextPage.setContext( - requestOptions != null && requestOptions.getContext() != null ? requestOptions.getContext() : Context.NONE); - return new PagedFlux<>(() -> withRelativeNextLinkSinglePageAsync(requestOptions), - nextLink -> withRelativeNextLinkNextSinglePageAsync(nextLink, requestOptionsForNextPage)); - } - - /** - * List with relative nextLink URL that requires endpoint resolution. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     *     orders (Optional): [
-     *          (Optional){
-     *             id: int (Required)
-     *             userId: int (Required)
-     *             detail: String (Required)
-     *         }
-     *     ]
-     *     etag: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return paged collection of User items along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse withRelativeNextLinkSinglePage(RequestOptions requestOptions) { - final String accept = "application/json"; - Response res - = service.withRelativeNextLinkSync(this.getEndpoint(), accept, requestOptions, Context.NONE); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), - getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null); - } - - /** - * List with relative nextLink URL that requires endpoint resolution. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     *     orders (Optional): [
-     *          (Optional){
-     *             id: int (Required)
-     *             userId: int (Required)
-     *             detail: String (Required)
-     *         }
-     *     ]
-     *     etag: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return paged collection of User items as paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable withRelativeNextLink(RequestOptions requestOptions) { - RequestOptions requestOptionsForNextPage = new RequestOptions(); - requestOptionsForNextPage.setContext( - requestOptions != null && requestOptions.getContext() != null ? requestOptions.getContext() : Context.NONE); - return new PagedIterable<>(() -> withRelativeNextLinkSinglePage(requestOptions), - nextLink -> withRelativeNextLinkNextSinglePage(nextLink, requestOptionsForNextPage)); - } - /** * Get the next page of items. *

Response Body Schema

@@ -1554,84 +1368,6 @@ private PagedResponse withParameterizedNextLinkNextSinglePage(String getValues(res.getValue(), "values"), getNextLink(res.getValue(), "nextLink"), null); } - /** - * Get the next page of items. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     *     orders (Optional): [
-     *          (Optional){
-     *             id: int (Required)
-     *             userId: int (Required)
-     *             detail: String (Required)
-     *         }
-     *     ]
-     *     etag: String (Required)
-     * }
-     * }
-     *
- * - * @param nextLink The URL to get the next list of items. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return paged collection of User items along with {@link PagedResponse} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> withRelativeNextLinkNextSinglePageAsync(String nextLink, - RequestOptions requestOptions) { - final String accept = "application/json"; - return FluxUtil.withContext( - context -> service.withRelativeNextLinkNext(nextLink, this.getEndpoint(), accept, requestOptions, context)) - .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), - getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null)); - } - - /** - * Get the next page of items. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     *     orders (Optional): [
-     *          (Optional){
-     *             id: int (Required)
-     *             userId: int (Required)
-     *             detail: String (Required)
-     *         }
-     *     ]
-     *     etag: String (Required)
-     * }
-     * }
-     *
- * - * @param nextLink The URL to get the next list of items. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return paged collection of User items along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse withRelativeNextLinkNextSinglePage(String nextLink, - RequestOptions requestOptions) { - final String accept = "application/json"; - Response res - = service.withRelativeNextLinkNextSync(nextLink, this.getEndpoint(), accept, requestOptions, Context.NONE); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), - getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null); - } - private List getValues(BinaryData binaryData, String path) { try { Map obj = binaryData.toObject(Map.class); diff --git a/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java index 13e12a887f..13fa33d72d 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java @@ -30,8 +30,12 @@ public Response getByResourceGroupWithResponse(String reso String confidentialResourceName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, confidentialResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ConfidentialResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ConfidentialResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ConfidentialResource getByResourceGroup(String resourceGroupName, String confidentialResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java index 12360ed7a3..9627240bd3 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java @@ -30,8 +30,12 @@ public Response getByResourceGroupWithResponse(S String managedIdentityTrackedResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, managedIdentityTrackedResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ManagedIdentityTrackedResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ManagedIdentityTrackedResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ManagedIdentityTrackedResource getByResourceGroup(String resourceGroupName, diff --git a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java index b66f919f2c..e4c7ef18e1 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java @@ -33,8 +33,12 @@ public Response getByResourceGroupWithResponse(String res String resourceGroupResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, resourceGroupResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ResourceGroupResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ResourceGroupResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ResourceGroupResource getByResourceGroup(String resourceGroupName, String resourceGroupResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java index d513c4050c..d16d4186af 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java @@ -33,8 +33,12 @@ public Response getWithResponse(String subscriptionId, Str Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public SubscriptionResource get(String subscriptionId, String subscriptionResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java index b69219f118..86e2607d92 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java @@ -33,8 +33,12 @@ public Response getWithResponse(String subscriptionId, St Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResource1Name, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResource1Impl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResource1Impl(inner.getValue(), this.manager())); + } else { + return null; + } } public SubscriptionResource1 get(String subscriptionId, String subscriptionResource1Name) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java index 17da1f964e..5340739290 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java @@ -33,8 +33,12 @@ public Response getWithResponse(String subscriptionId, St Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResource2Name, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResource2Impl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResource2Impl(inner.getValue(), this.manager())); + } else { + return null; + } } public SubscriptionResource2 get(String subscriptionId, String subscriptionResource2Name) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java index 9d36143be8..dc239f5146 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java @@ -29,8 +29,12 @@ public DisksImpl(DisksClient innerClient, public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, diskName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DiskImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new DiskImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public Disk getByResourceGroup(String resourceGroupName, String diskName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java index b8993a4d3a..05f4cd048c 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java @@ -30,8 +30,12 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VirtualMachineImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java index aa536e533b..82dc82cdd5 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java @@ -29,8 +29,12 @@ public DisksImpl(DisksClient innerClient, public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, diskName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DiskImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new DiskImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public Disk getByResourceGroup(String resourceGroupName, String diskName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java index c9e67bd5e9..f72d70052e 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java @@ -30,8 +30,12 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VirtualMachineImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java index 50fcaab7b7..bbf7e7bf70 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java @@ -30,8 +30,12 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, accountName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new StorageAccountImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new StorageAccountImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public StorageAccount getByResourceGroup(String resourceGroupName, String accountName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java index 8210e4243c..617de063fc 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java @@ -30,8 +30,12 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VirtualMachineImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java index 8908ba7e35..53db37891f 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java @@ -28,8 +28,12 @@ public NonResourceOperationsImpl(NonResourceOperationsClient innerClient, public Response getWithResponse(String location, String parameter, Context context) { Response inner = this.serviceClient().getWithResponse(location, parameter, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new NonResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new NonResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public NonResource get(String location, String parameter) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java index 51f4026516..bba72824e0 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java @@ -31,8 +31,12 @@ public Response checkGlobalWithResponse(CheckName Context context) { Response inner = this.serviceClient().checkGlobalWithResponse(body, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public CheckNameAvailabilityResponse checkGlobal(CheckNameAvailabilityRequest body) { @@ -48,8 +52,12 @@ public Response checkLocalWithResponse(String loc CheckNameAvailabilityRequest body, Context context) { Response inner = this.serviceClient().checkLocalWithResponse(location, body, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public CheckNameAvailabilityResponse checkLocal(String location, CheckNameAvailabilityRequest body) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java index 42685e107a..1395adf37a 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java @@ -36,8 +36,12 @@ public Response getByResourceGroupWithResponse(String resourceGroupName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, widgetName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new WidgetImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new WidgetImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public Widget getByResourceGroup(String resourceGroupName, String widgetName) { @@ -53,8 +57,12 @@ public Response patchWithResponse(String resourceGroupName, String widge Context context) { Response inner = this.serviceClient().patchWithResponse(resourceGroupName, widgetName, properties, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new WidgetImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new WidgetImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public Widget patch(String resourceGroupName, String widgetName) { @@ -70,8 +78,12 @@ public Response postWithResponse(String resourceGroupName, String Context context) { Response inner = this.serviceClient().postWithResponse(resourceGroupName, widgetName, body, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ActionResultImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ActionResultImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ActionResult post(String resourceGroupName, String widgetName) { @@ -85,8 +97,12 @@ public ActionResult post(String resourceGroupName, String widgetName) { public Response providerPostWithResponse(ChangeAllowanceRequest body, Context context) { Response inner = this.serviceClient().providerPostWithResponse(body, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChangeAllowanceResultImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChangeAllowanceResultImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ChangeAllowanceResult providerPost() { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java index 12271658b5..aa268931b3 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java @@ -31,8 +31,12 @@ public Response getWithResponse(String resourceUri, String e Context context) { Response inner = this.serviceClient().getWithResponse(resourceUri, extensionsResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ExtensionsResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ExtensionsResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ExtensionsResource get(String resourceUri, String extensionsResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java index 812ba6dadc..59faad49dd 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java @@ -30,8 +30,12 @@ public LocationResourcesImpl(LocationResourcesClient innerClient, public Response getWithResponse(String location, String locationResourceName, Context context) { Response inner = this.serviceClient().getWithResponse(location, locationResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new LocationResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new LocationResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public LocationResource get(String location, String locationResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java index adb72d20f2..dd4d8747aa 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java @@ -30,8 +30,12 @@ public Response getWithResponse(String resourceGroupName, S String nextedProxyResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new NestedProxyResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new NestedProxyResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public NestedProxyResource get(String resourceGroupName, String topLevelTrackedResourceName, diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java index 44c0808719..17d498c93d 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java @@ -31,8 +31,12 @@ public Response getByResourceGroupWithResponse(String Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public SingletonTrackedResource getByResourceGroup(String resourceGroupName) { @@ -67,8 +71,12 @@ public Response updateWithResponse(String resourceGrou SingletonTrackedResourceInner properties, Context context) { Response inner = this.serviceClient().updateWithResponse(resourceGroupName, properties, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public SingletonTrackedResource update(String resourceGroupName, SingletonTrackedResourceInner properties) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java index 97a4030b78..ef143a2f10 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java @@ -31,8 +31,12 @@ public Response getByResourceGroupWithResponse(String r String topLevelTrackedResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelTrackedResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelTrackedResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelTrackedResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public TopLevelTrackedResource getByResourceGroup(String resourceGroupName, String topLevelTrackedResourceName) { diff --git a/typespec-tests/src/main/java/encode/duration/HeaderAsyncClient.java b/typespec-tests/src/main/java/encode/duration/HeaderAsyncClient.java index 08346f6dc9..6d626edacb 100644 --- a/typespec-tests/src/main/java/encode/duration/HeaderAsyncClient.java +++ b/typespec-tests/src/main/java/encode/duration/HeaderAsyncClient.java @@ -187,7 +187,7 @@ public Mono> float64SecondsWithResponse(Duration duration, Reques */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + public Mono> int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponseAsync(duration, requestOptions); } @@ -204,8 +204,7 @@ public Mono> int32MillisecondsWithResponse(Duration duration, Req */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponse(Duration duration, - RequestOptions requestOptions) { + public Mono> int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponseAsync(duration, requestOptions); } @@ -222,7 +221,7 @@ public Mono> int32MillisecondsLargerUnitWithResponse(Duration dur */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + public Mono> floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponseAsync(duration, requestOptions); } @@ -239,7 +238,7 @@ public Mono> floatMillisecondsWithResponse(Duration duration, Req */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponse(Duration duration, + public Mono> floatMillisecondsLargerUnitWithResponse(double duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponseAsync(duration, requestOptions); } @@ -257,7 +256,7 @@ public Mono> floatMillisecondsLargerUnitWithResponse(Duration dur */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + public Mono> float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponseAsync(duration, requestOptions); } @@ -274,7 +273,7 @@ public Mono> float64MillisecondsWithResponse(Duration duration, R */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponse(List duration, + public Mono> int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponseAsync(duration, requestOptions); } @@ -453,7 +452,7 @@ public Mono float64Seconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32Milliseconds(Duration duration) { + public Mono int32Milliseconds(int duration) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -473,7 +472,7 @@ public Mono int32Milliseconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsLargerUnit(Duration duration) { + public Mono int32MillisecondsLargerUnit(int duration) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsLargerUnitWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -493,7 +492,7 @@ public Mono int32MillisecondsLargerUnit(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMilliseconds(Duration duration) { + public Mono floatMilliseconds(double duration) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -513,7 +512,7 @@ public Mono floatMilliseconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMillisecondsLargerUnit(Duration duration) { + public Mono floatMillisecondsLargerUnit(double duration) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsLargerUnitWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -533,7 +532,7 @@ public Mono floatMillisecondsLargerUnit(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono float64Milliseconds(Duration duration) { + public Mono float64Milliseconds(double duration) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return float64MillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -553,7 +552,7 @@ public Mono float64Milliseconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsArray(List duration) { + public Mono int32MillisecondsArray(List duration) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsArrayWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); diff --git a/typespec-tests/src/main/java/encode/duration/HeaderClient.java b/typespec-tests/src/main/java/encode/duration/HeaderClient.java index 41941b1c5b..710d085edc 100644 --- a/typespec-tests/src/main/java/encode/duration/HeaderClient.java +++ b/typespec-tests/src/main/java/encode/duration/HeaderClient.java @@ -185,7 +185,7 @@ public Response float64SecondsWithResponse(Duration duration, RequestOptio */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + public Response int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponse(duration, requestOptions); } @@ -202,7 +202,7 @@ public Response int32MillisecondsWithResponse(Duration duration, RequestOp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { + public Response int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponse(duration, requestOptions); } @@ -219,7 +219,7 @@ public Response int32MillisecondsLargerUnitWithResponse(Duration duration, */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + public Response floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponse(duration, requestOptions); } @@ -236,7 +236,7 @@ public Response floatMillisecondsWithResponse(Duration duration, RequestOp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { + public Response floatMillisecondsLargerUnitWithResponse(double duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponse(duration, requestOptions); } @@ -253,7 +253,7 @@ public Response floatMillisecondsLargerUnitWithResponse(Duration duration, */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + public Response float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponse(duration, requestOptions); } @@ -270,7 +270,7 @@ public Response float64MillisecondsWithResponse(Duration duration, Request */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { + public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponse(duration, requestOptions); } @@ -439,7 +439,7 @@ public void float64Seconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32Milliseconds(Duration duration) { + public void int32Milliseconds(int duration) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsWithResponse(duration, requestOptions).getValue(); @@ -458,7 +458,7 @@ public void int32Milliseconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsLargerUnit(Duration duration) { + public void int32MillisecondsLargerUnit(int duration) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsLargerUnitWithResponse(duration, requestOptions).getValue(); @@ -477,7 +477,7 @@ public void int32MillisecondsLargerUnit(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMilliseconds(Duration duration) { + public void floatMilliseconds(double duration) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsWithResponse(duration, requestOptions).getValue(); @@ -496,7 +496,7 @@ public void floatMilliseconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMillisecondsLargerUnit(Duration duration) { + public void floatMillisecondsLargerUnit(double duration) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsLargerUnitWithResponse(duration, requestOptions).getValue(); @@ -515,7 +515,7 @@ public void floatMillisecondsLargerUnit(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void float64Milliseconds(Duration duration) { + public void float64Milliseconds(double duration) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); float64MillisecondsWithResponse(duration, requestOptions).getValue(); @@ -534,7 +534,7 @@ public void float64Milliseconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsArray(List duration) { + public void int32MillisecondsArray(List duration) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsArrayWithResponse(duration, requestOptions).getValue(); diff --git a/typespec-tests/src/main/java/encode/duration/PropertyAsyncClient.java b/typespec-tests/src/main/java/encode/duration/PropertyAsyncClient.java index 17f4a7180e..ddebcb7d99 100644 --- a/typespec-tests/src/main/java/encode/duration/PropertyAsyncClient.java +++ b/typespec-tests/src/main/java/encode/duration/PropertyAsyncClient.java @@ -238,7 +238,7 @@ public Mono> float64SecondsWithResponse(BinaryData body, Re * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -248,7 +248,7 @@ public Mono> float64SecondsWithResponse(BinaryData body, Re * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -501,7 +501,7 @@ public Mono> floatSecondsLargerUnitWithResponse(BinaryData * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -511,7 +511,7 @@ public Mono> floatSecondsLargerUnitWithResponse(BinaryData * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
diff --git a/typespec-tests/src/main/java/encode/duration/PropertyClient.java b/typespec-tests/src/main/java/encode/duration/PropertyClient.java index 39eadae545..c175283374 100644 --- a/typespec-tests/src/main/java/encode/duration/PropertyClient.java +++ b/typespec-tests/src/main/java/encode/duration/PropertyClient.java @@ -236,7 +236,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -246,7 +246,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -496,7 +496,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -506,7 +506,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
diff --git a/typespec-tests/src/main/java/encode/duration/QueryAsyncClient.java b/typespec-tests/src/main/java/encode/duration/QueryAsyncClient.java index 02b1ee49de..c376be68fe 100644 --- a/typespec-tests/src/main/java/encode/duration/QueryAsyncClient.java +++ b/typespec-tests/src/main/java/encode/duration/QueryAsyncClient.java @@ -170,7 +170,7 @@ public Mono> float64SecondsWithResponse(Duration input, RequestOp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + public Mono> int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponseAsync(input, requestOptions); } @@ -187,7 +187,7 @@ public Mono> int32MillisecondsWithResponse(Duration input, Reques */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { + public Mono> int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponseAsync(input, requestOptions); } @@ -204,7 +204,7 @@ public Mono> int32MillisecondsLargerUnitWithResponse(Duration inp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + public Mono> floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponseAsync(input, requestOptions); } @@ -221,7 +221,7 @@ public Mono> floatMillisecondsWithResponse(Duration input, Reques */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { + public Mono> floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponseAsync(input, requestOptions); } @@ -238,7 +238,7 @@ public Mono> floatMillisecondsLargerUnitWithResponse(Duration inp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + public Mono> float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponseAsync(input, requestOptions); } @@ -272,8 +272,7 @@ public Mono> int32SecondsArrayWithResponse(List input, */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponse(List input, - RequestOptions requestOptions) { + public Mono> int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponseAsync(input, requestOptions); } @@ -431,7 +430,7 @@ public Mono float64Seconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32Milliseconds(Duration input) { + public Mono int32Milliseconds(int input) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -451,7 +450,7 @@ public Mono int32Milliseconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsLargerUnit(Duration input) { + public Mono int32MillisecondsLargerUnit(int input) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsLargerUnitWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -471,7 +470,7 @@ public Mono int32MillisecondsLargerUnit(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMilliseconds(Duration input) { + public Mono floatMilliseconds(double input) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -491,7 +490,7 @@ public Mono floatMilliseconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMillisecondsLargerUnit(Duration input) { + public Mono floatMillisecondsLargerUnit(double input) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsLargerUnitWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -511,7 +510,7 @@ public Mono floatMillisecondsLargerUnit(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono float64Milliseconds(Duration input) { + public Mono float64Milliseconds(double input) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return float64MillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -551,7 +550,7 @@ public Mono int32SecondsArray(List input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsArray(List input) { + public Mono int32MillisecondsArray(List input) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsArrayWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); diff --git a/typespec-tests/src/main/java/encode/duration/QueryClient.java b/typespec-tests/src/main/java/encode/duration/QueryClient.java index 1a2f5812a4..1c68bee8ba 100644 --- a/typespec-tests/src/main/java/encode/duration/QueryClient.java +++ b/typespec-tests/src/main/java/encode/duration/QueryClient.java @@ -168,7 +168,7 @@ public Response float64SecondsWithResponse(Duration input, RequestOptions */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + public Response int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponse(input, requestOptions); } @@ -185,7 +185,7 @@ public Response int32MillisecondsWithResponse(Duration input, RequestOptio */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { + public Response int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponse(input, requestOptions); } @@ -202,7 +202,7 @@ public Response int32MillisecondsLargerUnitWithResponse(Duration input, Re */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + public Response floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponse(input, requestOptions); } @@ -219,7 +219,7 @@ public Response floatMillisecondsWithResponse(Duration input, RequestOptio */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { + public Response floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponse(input, requestOptions); } @@ -236,7 +236,7 @@ public Response floatMillisecondsLargerUnitWithResponse(Duration input, Re */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + public Response float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponse(input, requestOptions); } @@ -270,7 +270,7 @@ public Response int32SecondsArrayWithResponse(List input, Reques */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { + public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponse(input, requestOptions); } @@ -420,7 +420,7 @@ public void float64Seconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32Milliseconds(Duration input) { + public void int32Milliseconds(int input) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsWithResponse(input, requestOptions).getValue(); @@ -439,7 +439,7 @@ public void int32Milliseconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsLargerUnit(Duration input) { + public void int32MillisecondsLargerUnit(int input) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsLargerUnitWithResponse(input, requestOptions).getValue(); @@ -458,7 +458,7 @@ public void int32MillisecondsLargerUnit(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMilliseconds(Duration input) { + public void floatMilliseconds(double input) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsWithResponse(input, requestOptions).getValue(); @@ -477,7 +477,7 @@ public void floatMilliseconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMillisecondsLargerUnit(Duration input) { + public void floatMillisecondsLargerUnit(double input) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsLargerUnitWithResponse(input, requestOptions).getValue(); @@ -496,7 +496,7 @@ public void floatMillisecondsLargerUnit(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void float64Milliseconds(Duration input) { + public void float64Milliseconds(double input) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); float64MillisecondsWithResponse(input, requestOptions).getValue(); @@ -534,7 +534,7 @@ public void int32SecondsArray(List input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsArray(List input) { + public void int32MillisecondsArray(List input) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsArrayWithResponse(input, requestOptions).getValue(); diff --git a/typespec-tests/src/main/java/encode/duration/implementation/HeadersImpl.java b/typespec-tests/src/main/java/encode/duration/implementation/HeadersImpl.java index 86581183ea..78fc0f39e9 100644 --- a/typespec-tests/src/main/java/encode/duration/implementation/HeadersImpl.java +++ b/typespec-tests/src/main/java/encode/duration/implementation/HeadersImpl.java @@ -26,7 +26,6 @@ import com.azure.core.util.serializer.JacksonAdapter; import java.time.Duration; import java.util.List; -import java.util.stream.Collectors; import reactor.core.publisher.Mono; /** @@ -211,7 +210,7 @@ Response float64SecondsSync(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds") @ExpectedResponses({ 204 }) @@ -220,7 +219,7 @@ Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -229,7 +228,7 @@ Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -238,7 +237,7 @@ Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String e @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsLargerUnitSync(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/float-milliseconds") @ExpectedResponses({ 204 }) @@ -607,10 +606,9 @@ public Response float64SecondsWithResponse(Duration duration, RequestOptio * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { - long durationConverted = duration.toMillis(); - return FluxUtil.withContext(context -> service.int32Milliseconds(this.client.getEndpoint(), durationConverted, - requestOptions, context)); + public Mono> int32MillisecondsWithResponseAsync(int duration, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.int32Milliseconds(this.client.getEndpoint(), duration, requestOptions, context)); } /** @@ -625,10 +623,8 @@ public Mono> int32MillisecondsWithResponseAsync(Duration duration * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { - long durationConverted = duration.toMillis(); - return service.int32MillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, - Context.NONE); + public Response int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { + return service.int32MillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); } /** @@ -643,11 +639,10 @@ public Response int32MillisecondsWithResponse(Duration duration, RequestOp * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponseAsync(Duration duration, + public Mono> int32MillisecondsLargerUnitWithResponseAsync(int duration, RequestOptions requestOptions) { - long durationConverted = duration.toMillis(); - return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), - durationConverted, requestOptions, context)); + return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), duration, + requestOptions, context)); } /** @@ -662,9 +657,8 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(Duratio * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { - long durationConverted = duration.toMillis(); - return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), durationConverted, requestOptions, + public Response int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { + return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); } @@ -680,10 +674,9 @@ public Response int32MillisecondsLargerUnitWithResponse(Duration duration, * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { - double durationConverted = (double) duration.toNanos() / 1000_000L; - return FluxUtil.withContext(context -> service.floatMilliseconds(this.client.getEndpoint(), durationConverted, - requestOptions, context)); + public Mono> floatMillisecondsWithResponseAsync(double duration, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.floatMilliseconds(this.client.getEndpoint(), duration, requestOptions, context)); } /** @@ -698,10 +691,8 @@ public Mono> floatMillisecondsWithResponseAsync(Duration duration * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { - double durationConverted = (double) duration.toNanos() / 1000_000L; - return service.floatMillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, - Context.NONE); + public Response floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { + return service.floatMillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); } /** @@ -716,11 +707,10 @@ public Response floatMillisecondsWithResponse(Duration duration, RequestOp * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponseAsync(Duration duration, + public Mono> floatMillisecondsLargerUnitWithResponseAsync(double duration, RequestOptions requestOptions) { - double durationConverted = (double) duration.toNanos() / 1000_000L; - return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), - durationConverted, requestOptions, context)); + return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), duration, + requestOptions, context)); } /** @@ -735,9 +725,8 @@ public Mono> floatMillisecondsLargerUnitWithResponseAsync(Duratio * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { - double durationConverted = (double) duration.toNanos() / 1000_000L; - return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), durationConverted, requestOptions, + public Response floatMillisecondsLargerUnitWithResponse(double duration, RequestOptions requestOptions) { + return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); } @@ -753,10 +742,9 @@ public Response floatMillisecondsLargerUnitWithResponse(Duration duration, * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { - double durationConverted = (double) duration.toNanos() / 1000_000L; - return FluxUtil.withContext(context -> service.float64Milliseconds(this.client.getEndpoint(), durationConverted, - requestOptions, context)); + public Mono> float64MillisecondsWithResponseAsync(double duration, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.float64Milliseconds(this.client.getEndpoint(), duration, requestOptions, context)); } /** @@ -771,10 +759,8 @@ public Mono> float64MillisecondsWithResponseAsync(Duration durati * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { - double durationConverted = (double) duration.toNanos() / 1000_000L; - return service.float64MillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, - Context.NONE); + public Response float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { + return service.float64MillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); } /** @@ -789,12 +775,10 @@ public Response float64MillisecondsWithResponse(Duration duration, Request * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponseAsync(List duration, + public Mono> int32MillisecondsArrayWithResponseAsync(List duration, RequestOptions requestOptions) { - String durationConverted = JacksonAdapter.createDefaultSerializerAdapter() - .serializeIterable( - duration.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), - CollectionFormat.CSV); + String durationConverted + = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(duration, CollectionFormat.CSV); return FluxUtil.withContext(context -> service.int32MillisecondsArray(this.client.getEndpoint(), durationConverted, requestOptions, context)); } @@ -811,11 +795,9 @@ public Mono> int32MillisecondsArrayWithResponseAsync(List int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { - String durationConverted = JacksonAdapter.createDefaultSerializerAdapter() - .serializeIterable( - duration.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), - CollectionFormat.CSV); + public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { + String durationConverted + = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(duration, CollectionFormat.CSV); return service.int32MillisecondsArraySync(this.client.getEndpoint(), durationConverted, requestOptions, Context.NONE); } diff --git a/typespec-tests/src/main/java/encode/duration/implementation/PropertiesImpl.java b/typespec-tests/src/main/java/encode/duration/implementation/PropertiesImpl.java index 0733e08920..b727b536a7 100644 --- a/typespec-tests/src/main/java/encode/duration/implementation/PropertiesImpl.java +++ b/typespec-tests/src/main/java/encode/duration/implementation/PropertiesImpl.java @@ -725,7 +725,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -735,7 +735,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -764,7 +764,7 @@ public Mono> int32MillisecondsWithResponseAsync(BinaryData * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -774,7 +774,7 @@ public Mono> int32MillisecondsWithResponseAsync(BinaryData * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -1280,7 +1280,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -1290,7 +1290,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -1319,7 +1319,7 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(B * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
@@ -1329,7 +1329,7 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(B * 
      * {@code
      * {
-     *     value: long (Required)
+     *     value: int (Required)
      * }
      * }
      *
diff --git a/typespec-tests/src/main/java/encode/duration/implementation/QueriesImpl.java b/typespec-tests/src/main/java/encode/duration/implementation/QueriesImpl.java index 476f3f5bb7..3a46e23b7a 100644 --- a/typespec-tests/src/main/java/encode/duration/implementation/QueriesImpl.java +++ b/typespec-tests/src/main/java/encode/duration/implementation/QueriesImpl.java @@ -192,7 +192,7 @@ Response float64SecondsSync(@HostParam("endpoint") String endpoint, @Query @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryParam("input") long input, + Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryParam("input") int input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds") @@ -201,7 +201,7 @@ Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @ @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @QueryParam("input") long input, + Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @QueryParam("input") int input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds-larger-unit") @@ -211,7 +211,7 @@ Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @Qu @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String endpoint, - @QueryParam("input") long input, RequestOptions requestOptions, Context context); + @QueryParam("input") int input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -220,7 +220,7 @@ Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String e @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsLargerUnitSync(@HostParam("endpoint") String endpoint, - @QueryParam("input") long input, RequestOptions requestOptions, Context context); + @QueryParam("input") int input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/float-milliseconds") @ExpectedResponses({ 204 }) @@ -568,10 +568,9 @@ public Response float64SecondsWithResponse(Duration input, RequestOptions * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { - long inputConverted = input.toMillis(); + public Mono> int32MillisecondsWithResponseAsync(int input, RequestOptions requestOptions) { return FluxUtil.withContext( - context -> service.int32Milliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); + context -> service.int32Milliseconds(this.client.getEndpoint(), input, requestOptions, context)); } /** @@ -586,9 +585,8 @@ public Mono> int32MillisecondsWithResponseAsync(Duration input, R * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { - long inputConverted = input.toMillis(); - return service.int32MillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); + public Response int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { + return service.int32MillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); } /** @@ -603,11 +601,9 @@ public Response int32MillisecondsWithResponse(Duration input, RequestOptio * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponseAsync(Duration input, - RequestOptions requestOptions) { - long inputConverted = input.toMillis(); - return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), - inputConverted, requestOptions, context)); + public Mono> int32MillisecondsLargerUnitWithResponseAsync(int input, RequestOptions requestOptions) { + return FluxUtil.withContext( + context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), input, requestOptions, context)); } /** @@ -622,10 +618,8 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(Duratio * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { - long inputConverted = input.toMillis(); - return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), inputConverted, requestOptions, - Context.NONE); + public Response int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { + return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); } /** @@ -640,10 +634,9 @@ public Response int32MillisecondsLargerUnitWithResponse(Duration input, Re * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { - double inputConverted = (double) input.toNanos() / 1000_000L; + public Mono> floatMillisecondsWithResponseAsync(double input, RequestOptions requestOptions) { return FluxUtil.withContext( - context -> service.floatMilliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); + context -> service.floatMilliseconds(this.client.getEndpoint(), input, requestOptions, context)); } /** @@ -658,9 +651,8 @@ public Mono> floatMillisecondsWithResponseAsync(Duration input, R * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { - double inputConverted = (double) input.toNanos() / 1000_000L; - return service.floatMillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); + public Response floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { + return service.floatMillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); } /** @@ -675,11 +667,10 @@ public Response floatMillisecondsWithResponse(Duration input, RequestOptio * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponseAsync(Duration input, + public Mono> floatMillisecondsLargerUnitWithResponseAsync(double input, RequestOptions requestOptions) { - double inputConverted = (double) input.toNanos() / 1000_000L; - return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), - inputConverted, requestOptions, context)); + return FluxUtil.withContext( + context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), input, requestOptions, context)); } /** @@ -694,10 +685,8 @@ public Mono> floatMillisecondsLargerUnitWithResponseAsync(Duratio * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { - double inputConverted = (double) input.toNanos() / 1000_000L; - return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), inputConverted, requestOptions, - Context.NONE); + public Response floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { + return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); } /** @@ -712,10 +701,9 @@ public Response floatMillisecondsLargerUnitWithResponse(Duration input, Re * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { - double inputConverted = (double) input.toNanos() / 1000_000L; + public Mono> float64MillisecondsWithResponseAsync(double input, RequestOptions requestOptions) { return FluxUtil.withContext( - context -> service.float64Milliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); + context -> service.float64Milliseconds(this.client.getEndpoint(), input, requestOptions, context)); } /** @@ -730,9 +718,8 @@ public Mono> float64MillisecondsWithResponseAsync(Duration input, * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { - double inputConverted = (double) input.toNanos() / 1000_000L; - return service.float64MillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); + public Response float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { + return service.float64MillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); } /** @@ -789,12 +776,10 @@ public Response int32SecondsArrayWithResponse(List input, Reques * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponseAsync(List input, + public Mono> int32MillisecondsArrayWithResponseAsync(List input, RequestOptions requestOptions) { - String inputConverted = JacksonAdapter.createDefaultSerializerAdapter() - .serializeIterable( - input.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), - CollectionFormat.CSV); + String inputConverted + = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(input, CollectionFormat.CSV); return FluxUtil.withContext(context -> service.int32MillisecondsArray(this.client.getEndpoint(), inputConverted, requestOptions, context)); } @@ -811,11 +796,9 @@ public Mono> int32MillisecondsArrayWithResponseAsync(List int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { - String inputConverted = JacksonAdapter.createDefaultSerializerAdapter() - .serializeIterable( - input.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), - CollectionFormat.CSV); + public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { + String inputConverted + = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(input, CollectionFormat.CSV); return service.int32MillisecondsArraySync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java index b72035fa61..5a6aa75879 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java @@ -11,7 +11,6 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; -import java.time.Duration; /** * The Float64MillisecondsDurationProperty model. @@ -31,12 +30,8 @@ public final class Float64MillisecondsDurationProperty * @param value the value value to set. */ @Generated - public Float64MillisecondsDurationProperty(Duration value) { - if (value == null) { - this.value = 0.0; - } else { - this.value = (double) value.toNanos() / 1000_000L; - } + public Float64MillisecondsDurationProperty(double value) { + this.value = value; } /** @@ -45,8 +40,8 @@ public Float64MillisecondsDurationProperty(Duration value) { * @return the value value. */ @Generated - public Duration getValue() { - return Duration.ofNanos((long) (this.value * 1000_000L)); + public double getValue() { + return this.value; } /** @@ -72,13 +67,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Float64MillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Duration value = null; + double value = 0.0; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); + value = reader.getDouble(); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java index 1341181dfc..aa77fd209a 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java @@ -11,7 +11,6 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; -import java.time.Duration; import java.util.List; /** @@ -32,14 +31,8 @@ public final class FloatMillisecondsDurationArrayProperty * @param value the value value to set. */ @Generated - public FloatMillisecondsDurationArrayProperty(List value) { - if (value == null) { - this.value = null; - } else { - this.value = value.stream() - .map(el -> (double) el.toNanos() / 1000_000L) - .collect(java.util.stream.Collectors.toList()); - } + public FloatMillisecondsDurationArrayProperty(List value) { + this.value = value; } /** @@ -48,13 +41,8 @@ public FloatMillisecondsDurationArrayProperty(List value) { * @return the value value. */ @Generated - public List getValue() { - if (this.value == null) { - return null; - } - return this.value.stream() - .map(el -> Duration.ofNanos((long) (el * 1000_000L))) - .collect(java.util.stream.Collectors.toList()); + public List getValue() { + return this.value; } /** @@ -80,13 +68,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsDurationArrayProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - List value = null; + List value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.readArray(reader1 -> Duration.ofNanos((long) (reader1.getDouble() * 1000_000L))); + value = reader.readArray(reader1 -> reader1.getDouble()); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java index cb4eac0de8..d40fbf62e9 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java @@ -11,7 +11,6 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; -import java.time.Duration; /** * The FloatMillisecondsDurationProperty model. @@ -30,12 +29,8 @@ public final class FloatMillisecondsDurationProperty implements JsonSerializable * @param value the value value to set. */ @Generated - public FloatMillisecondsDurationProperty(Duration value) { - if (value == null) { - this.value = 0.0; - } else { - this.value = (double) value.toNanos() / 1000_000L; - } + public FloatMillisecondsDurationProperty(double value) { + this.value = value; } /** @@ -44,8 +39,8 @@ public FloatMillisecondsDurationProperty(Duration value) { * @return the value value. */ @Generated - public Duration getValue() { - return Duration.ofNanos((long) (this.value * 1000_000L)); + public double getValue() { + return this.value; } /** @@ -71,13 +66,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Duration value = null; + double value = 0.0; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); + value = reader.getDouble(); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java index 13d8ffb22d..e98cf4026c 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java @@ -11,7 +11,6 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; -import java.time.Duration; /** * The FloatMillisecondsLargerUnitDurationProperty model. @@ -31,12 +30,8 @@ public final class FloatMillisecondsLargerUnitDurationProperty * @param value the value value to set. */ @Generated - public FloatMillisecondsLargerUnitDurationProperty(Duration value) { - if (value == null) { - this.value = 0.0; - } else { - this.value = (double) value.toNanos() / 1000_000L; - } + public FloatMillisecondsLargerUnitDurationProperty(double value) { + this.value = value; } /** @@ -45,8 +40,8 @@ public FloatMillisecondsLargerUnitDurationProperty(Duration value) { * @return the value value. */ @Generated - public Duration getValue() { - return Duration.ofNanos((long) (this.value * 1000_000L)); + public double getValue() { + return this.value; } /** @@ -72,13 +67,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsLargerUnitDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Duration value = null; + double value = 0.0; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); + value = reader.getDouble(); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java index 8c7d34072b..d8130c569a 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java @@ -11,7 +11,6 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; -import java.time.Duration; /** * The Int32MillisecondsDurationProperty model. @@ -22,7 +21,7 @@ public final class Int32MillisecondsDurationProperty implements JsonSerializable * The value property. */ @Generated - private final long value; + private final int value; /** * Creates an instance of Int32MillisecondsDurationProperty class. @@ -30,12 +29,8 @@ public final class Int32MillisecondsDurationProperty implements JsonSerializable * @param value the value value to set. */ @Generated - public Int32MillisecondsDurationProperty(Duration value) { - if (value == null) { - this.value = 0L; - } else { - this.value = value.toMillis(); - } + public Int32MillisecondsDurationProperty(int value) { + this.value = value; } /** @@ -44,8 +39,8 @@ public Int32MillisecondsDurationProperty(Duration value) { * @return the value value. */ @Generated - public Duration getValue() { - return Duration.ofMillis(this.value); + public int getValue() { + return this.value; } /** @@ -55,7 +50,7 @@ public Duration getValue() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeLongField("value", this.value); + jsonWriter.writeIntField("value", this.value); return jsonWriter.writeEndObject(); } @@ -71,13 +66,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Int32MillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Duration value = null; + int value = 0; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = Duration.ofMillis(reader.getLong()); + value = reader.getInt(); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java index 7f74132a55..9be4f62447 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java @@ -11,7 +11,6 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; -import java.time.Duration; /** * The Int32MillisecondsLargerUnitDurationProperty model. @@ -23,7 +22,7 @@ public final class Int32MillisecondsLargerUnitDurationProperty * The value property. */ @Generated - private final long value; + private final int value; /** * Creates an instance of Int32MillisecondsLargerUnitDurationProperty class. @@ -31,12 +30,8 @@ public final class Int32MillisecondsLargerUnitDurationProperty * @param value the value value to set. */ @Generated - public Int32MillisecondsLargerUnitDurationProperty(Duration value) { - if (value == null) { - this.value = 0L; - } else { - this.value = value.toMillis(); - } + public Int32MillisecondsLargerUnitDurationProperty(int value) { + this.value = value; } /** @@ -45,8 +40,8 @@ public Int32MillisecondsLargerUnitDurationProperty(Duration value) { * @return the value value. */ @Generated - public Duration getValue() { - return Duration.ofMillis(this.value); + public int getValue() { + return this.value; } /** @@ -56,7 +51,7 @@ public Duration getValue() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeLongField("value", this.value); + jsonWriter.writeIntField("value", this.value); return jsonWriter.writeEndObject(); } @@ -72,13 +67,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Int32MillisecondsLargerUnitDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - Duration value = null; + int value = 0; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = Duration.ofMillis(reader.getLong()); + value = reader.getInt(); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/specialwords/ExtensibleStringsAsyncClient.java b/typespec-tests/src/main/java/specialwords/ExtensibleStringsAsyncClient.java deleted file mode 100644 index aeeab3d03f..0000000000 --- a/typespec-tests/src/main/java/specialwords/ExtensibleStringsAsyncClient.java +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package specialwords; - -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceClient; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.util.BinaryData; -import com.azure.core.util.FluxUtil; -import reactor.core.publisher.Mono; -import specialwords.extensiblestrings.models.ExtensibleString; -import specialwords.implementation.ExtensibleStringsImpl; - -/** - * Initializes a new instance of the asynchronous SpecialWordsClient type. - */ -@ServiceClient(builder = SpecialWordsClientBuilder.class, isAsync = true) -public final class ExtensibleStringsAsyncClient { - @Generated - private final ExtensibleStringsImpl serviceClient; - - /** - * Initializes an instance of ExtensibleStringsAsyncClient class. - * - * @param serviceClient the service client implementation. - */ - @Generated - ExtensibleStringsAsyncClient(ExtensibleStringsImpl serviceClient) { - this.serviceClient = serviceClient; - } - - /** - * The putExtensibleStringValue operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return verify enum member names that are special words using extensible enum (union) along with {@link Response} - * on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putExtensibleStringValueWithResponse(BinaryData body, - RequestOptions requestOptions) { - return this.serviceClient.putExtensibleStringValueWithResponseAsync(body, requestOptions); - } - - /** - * The putExtensibleStringValue operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return verify enum member names that are special words using extensible enum (union) on successful completion of - * {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono putExtensibleStringValue(ExtensibleString body) { - // Generated convenience method for putExtensibleStringValueWithResponse - RequestOptions requestOptions = new RequestOptions(); - return putExtensibleStringValueWithResponse(BinaryData.fromObject(body == null ? null : body.toString()), - requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> ExtensibleString.fromString(protocolMethodData.toObject(String.class))); - } -} diff --git a/typespec-tests/src/main/java/specialwords/ExtensibleStringsClient.java b/typespec-tests/src/main/java/specialwords/ExtensibleStringsClient.java deleted file mode 100644 index 05656c704d..0000000000 --- a/typespec-tests/src/main/java/specialwords/ExtensibleStringsClient.java +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package specialwords; - -import com.azure.core.annotation.Generated; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceClient; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.util.BinaryData; -import specialwords.extensiblestrings.models.ExtensibleString; -import specialwords.implementation.ExtensibleStringsImpl; - -/** - * Initializes a new instance of the synchronous SpecialWordsClient type. - */ -@ServiceClient(builder = SpecialWordsClientBuilder.class) -public final class ExtensibleStringsClient { - @Generated - private final ExtensibleStringsImpl serviceClient; - - /** - * Initializes an instance of ExtensibleStringsClient class. - * - * @param serviceClient the service client implementation. - */ - @Generated - ExtensibleStringsClient(ExtensibleStringsImpl serviceClient) { - this.serviceClient = serviceClient; - } - - /** - * The putExtensibleStringValue operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return verify enum member names that are special words using extensible enum (union) along with - * {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response putExtensibleStringValueWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.putExtensibleStringValueWithResponse(body, requestOptions); - } - - /** - * The putExtensibleStringValue operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return verify enum member names that are special words using extensible enum (union). - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public ExtensibleString putExtensibleStringValue(ExtensibleString body) { - // Generated convenience method for putExtensibleStringValueWithResponse - RequestOptions requestOptions = new RequestOptions(); - return ExtensibleString.fromString( - putExtensibleStringValueWithResponse(BinaryData.fromObject(body == null ? null : body.toString()), - requestOptions).getValue().toObject(String.class)); - } -} diff --git a/typespec-tests/src/main/java/specialwords/SpecialWordsClientBuilder.java b/typespec-tests/src/main/java/specialwords/SpecialWordsClientBuilder.java index 66786237ef..ea87d109d8 100644 --- a/typespec-tests/src/main/java/specialwords/SpecialWordsClientBuilder.java +++ b/typespec-tests/src/main/java/specialwords/SpecialWordsClientBuilder.java @@ -44,12 +44,10 @@ serviceClients = { ModelsClient.class, ModelPropertiesClient.class, - ExtensibleStringsClient.class, OperationsClient.class, ParametersClient.class, ModelsAsyncClient.class, ModelPropertiesAsyncClient.class, - ExtensibleStringsAsyncClient.class, OperationsAsyncClient.class, ParametersAsyncClient.class }) public final class SpecialWordsClientBuilder implements HttpTrait, @@ -294,16 +292,6 @@ public ModelPropertiesAsyncClient buildModelPropertiesAsyncClient() { return new ModelPropertiesAsyncClient(buildInnerClient().getModelProperties()); } - /** - * Builds an instance of ExtensibleStringsAsyncClient class. - * - * @return an instance of ExtensibleStringsAsyncClient. - */ - @Generated - public ExtensibleStringsAsyncClient buildExtensibleStringsAsyncClient() { - return new ExtensibleStringsAsyncClient(buildInnerClient().getExtensibleStrings()); - } - /** * Builds an instance of OperationsAsyncClient class. * @@ -344,16 +332,6 @@ public ModelPropertiesClient buildModelPropertiesClient() { return new ModelPropertiesClient(buildInnerClient().getModelProperties()); } - /** - * Builds an instance of ExtensibleStringsClient class. - * - * @return an instance of ExtensibleStringsClient. - */ - @Generated - public ExtensibleStringsClient buildExtensibleStringsClient() { - return new ExtensibleStringsClient(buildInnerClient().getExtensibleStrings()); - } - /** * Builds an instance of OperationsClient class. * diff --git a/typespec-tests/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java b/typespec-tests/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java deleted file mode 100644 index 52fdb2469c..0000000000 --- a/typespec-tests/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java +++ /dev/null @@ -1,243 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package specialwords.extensiblestrings.models; - -import com.azure.core.annotation.Generated; -import com.azure.core.util.ExpandableStringEnum; -import java.util.Collection; - -/** - * Verify enum member names that are special words using extensible enum (union). - */ -public final class ExtensibleString extends ExpandableStringEnum { - /** - * Static value and for ExtensibleString. - */ - @Generated - public static final ExtensibleString AND = fromString("and"); - - /** - * Static value as for ExtensibleString. - */ - @Generated - public static final ExtensibleString AS = fromString("as"); - - /** - * Static value assert for ExtensibleString. - */ - @Generated - public static final ExtensibleString ASSERT = fromString("assert"); - - /** - * Static value async for ExtensibleString. - */ - @Generated - public static final ExtensibleString ASYNC = fromString("async"); - - /** - * Static value await for ExtensibleString. - */ - @Generated - public static final ExtensibleString AWAIT = fromString("await"); - - /** - * Static value break for ExtensibleString. - */ - @Generated - public static final ExtensibleString BREAK = fromString("break"); - - /** - * Static value class for ExtensibleString. - */ - @Generated - public static final ExtensibleString CLASS = fromString("class"); - - /** - * Static value constructor for ExtensibleString. - */ - @Generated - public static final ExtensibleString CONSTRUCTOR = fromString("constructor"); - - /** - * Static value continue for ExtensibleString. - */ - @Generated - public static final ExtensibleString CONTINUE = fromString("continue"); - - /** - * Static value def for ExtensibleString. - */ - @Generated - public static final ExtensibleString DEF = fromString("def"); - - /** - * Static value del for ExtensibleString. - */ - @Generated - public static final ExtensibleString DEL = fromString("del"); - - /** - * Static value elif for ExtensibleString. - */ - @Generated - public static final ExtensibleString ELIF = fromString("elif"); - - /** - * Static value else for ExtensibleString. - */ - @Generated - public static final ExtensibleString ELSE = fromString("else"); - - /** - * Static value except for ExtensibleString. - */ - @Generated - public static final ExtensibleString EXCEPT = fromString("except"); - - /** - * Static value exec for ExtensibleString. - */ - @Generated - public static final ExtensibleString EXEC = fromString("exec"); - - /** - * Static value finally for ExtensibleString. - */ - @Generated - public static final ExtensibleString FINALLY = fromString("finally"); - - /** - * Static value for for ExtensibleString. - */ - @Generated - public static final ExtensibleString FOR = fromString("for"); - - /** - * Static value from for ExtensibleString. - */ - @Generated - public static final ExtensibleString FROM = fromString("from"); - - /** - * Static value global for ExtensibleString. - */ - @Generated - public static final ExtensibleString GLOBAL = fromString("global"); - - /** - * Static value if for ExtensibleString. - */ - @Generated - public static final ExtensibleString IF = fromString("if"); - - /** - * Static value import for ExtensibleString. - */ - @Generated - public static final ExtensibleString IMPORT = fromString("import"); - - /** - * Static value in for ExtensibleString. - */ - @Generated - public static final ExtensibleString IN = fromString("in"); - - /** - * Static value is for ExtensibleString. - */ - @Generated - public static final ExtensibleString IS = fromString("is"); - - /** - * Static value lambda for ExtensibleString. - */ - @Generated - public static final ExtensibleString LAMBDA = fromString("lambda"); - - /** - * Static value not for ExtensibleString. - */ - @Generated - public static final ExtensibleString NOT = fromString("not"); - - /** - * Static value or for ExtensibleString. - */ - @Generated - public static final ExtensibleString OR = fromString("or"); - - /** - * Static value pass for ExtensibleString. - */ - @Generated - public static final ExtensibleString PASS = fromString("pass"); - - /** - * Static value raise for ExtensibleString. - */ - @Generated - public static final ExtensibleString RAISE = fromString("raise"); - - /** - * Static value return for ExtensibleString. - */ - @Generated - public static final ExtensibleString RETURN = fromString("return"); - - /** - * Static value try for ExtensibleString. - */ - @Generated - public static final ExtensibleString TRY = fromString("try"); - - /** - * Static value while for ExtensibleString. - */ - @Generated - public static final ExtensibleString WHILE = fromString("while"); - - /** - * Static value with for ExtensibleString. - */ - @Generated - public static final ExtensibleString WITH = fromString("with"); - - /** - * Static value yield for ExtensibleString. - */ - @Generated - public static final ExtensibleString YIELD = fromString("yield"); - - /** - * Creates a new instance of ExtensibleString value. - * - * @deprecated Use the {@link #fromString(String)} factory method. - */ - @Generated - @Deprecated - public ExtensibleString() { - } - - /** - * Creates or finds a ExtensibleString from its string representation. - * - * @param name a name to look for. - * @return the corresponding ExtensibleString. - */ - @Generated - public static ExtensibleString fromString(String name) { - return fromString(name, ExtensibleString.class); - } - - /** - * Gets known ExtensibleString values. - * - * @return known ExtensibleString values. - */ - @Generated - public static Collection values() { - return values(ExtensibleString.class); - } -} diff --git a/typespec-tests/src/main/java/specialwords/extensiblestrings/models/package-info.java b/typespec-tests/src/main/java/specialwords/extensiblestrings/models/package-info.java deleted file mode 100644 index 521c13ab8f..0000000000 --- a/typespec-tests/src/main/java/specialwords/extensiblestrings/models/package-info.java +++ /dev/null @@ -1,49 +0,0 @@ -// 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 SpecialWords. - * Scenarios to verify that reserved words can be used in service and generators will handle it appropriately. - * - * Current list of special words - * ```txt - * and - * as - * assert - * async - * await - * break - * class - * constructor - * continue - * def - * del - * elif - * else - * except - * exec - * finally - * for - * from - * global - * if - * import - * in - * is - * lambda - * list - * not - * or - * pass - * raise - * return - * try - * while - * with - * yield - * ```. - * - */ -package specialwords.extensiblestrings.models; diff --git a/typespec-tests/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java b/typespec-tests/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java deleted file mode 100644 index bfc14dc240..0000000000 --- a/typespec-tests/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java +++ /dev/null @@ -1,152 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package specialwords.implementation; - -import com.azure.core.annotation.BodyParam; -import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.HeaderParam; -import com.azure.core.annotation.Host; -import com.azure.core.annotation.HostParam; -import com.azure.core.annotation.Put; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceInterface; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.annotation.UnexpectedResponseExceptionType; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.RestProxy; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.FluxUtil; -import reactor.core.publisher.Mono; - -/** - * An instance of this class provides access to all the operations defined in ExtensibleStrings. - */ -public final class ExtensibleStringsImpl { - /** - * The proxy service used to perform REST calls. - */ - private final ExtensibleStringsService service; - - /** - * The service client containing this operation class. - */ - private final SpecialWordsClientImpl client; - - /** - * Initializes an instance of ExtensibleStringsImpl. - * - * @param client the instance of the service client containing this operation class. - */ - ExtensibleStringsImpl(SpecialWordsClientImpl client) { - this.service - = RestProxy.create(ExtensibleStringsService.class, client.getHttpPipeline(), client.getSerializerAdapter()); - this.client = client; - } - - /** - * The interface defining all the services for SpecialWordsClientExtensibleStrings to be used by the proxy service - * to perform REST calls. - */ - @Host("{endpoint}") - @ServiceInterface(name = "SpecialWordsClientExtensibleStrings") - public interface ExtensibleStringsService { - @Put("/special-words/extensible-strings/string") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> putExtensibleStringValue(@HostParam("endpoint") String endpoint, - @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - - @Put("/special-words/extensible-strings/string") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response putExtensibleStringValueSync(@HostParam("endpoint") String endpoint, - @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - } - - /** - * The putExtensibleStringValue operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return verify enum member names that are special words using extensible enum (union) along with {@link Response} - * on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putExtensibleStringValueWithResponseAsync(BinaryData body, - RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.putExtensibleStringValue(this.client.getEndpoint(), contentType, - accept, body, requestOptions, context)); - } - - /** - * The putExtensibleStringValue operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return verify enum member names that are special words using extensible enum (union) along with - * {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response putExtensibleStringValueWithResponse(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.putExtensibleStringValueSync(this.client.getEndpoint(), contentType, accept, body, - requestOptions, Context.NONE); - } -} diff --git a/typespec-tests/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java b/typespec-tests/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java index 5ff3f977f5..0228a3a8ef 100644 --- a/typespec-tests/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java +++ b/typespec-tests/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java @@ -85,20 +85,6 @@ public ModelPropertiesImpl getModelProperties() { return this.modelProperties; } - /** - * The ExtensibleStringsImpl object to access its operations. - */ - private final ExtensibleStringsImpl extensibleStrings; - - /** - * Gets the ExtensibleStringsImpl object to access its operations. - * - * @return the ExtensibleStringsImpl object. - */ - public ExtensibleStringsImpl getExtensibleStrings() { - return this.extensibleStrings; - } - /** * The OperationsImpl object to access its operations. */ @@ -160,7 +146,6 @@ public SpecialWordsClientImpl(HttpPipeline httpPipeline, SerializerAdapter seria this.endpoint = endpoint; this.models = new ModelsImpl(this); this.modelProperties = new ModelPropertiesImpl(this); - this.extensibleStrings = new ExtensibleStringsImpl(this); this.operations = new OperationsImpl(this); this.parameters = new ParametersImpl(this); } diff --git a/typespec-tests/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java b/typespec-tests/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java index 6b7bc67d76..7f656c6cab 100644 --- a/typespec-tests/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java +++ b/typespec-tests/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java @@ -28,8 +28,12 @@ public VaultsImpl(VaultsClient innerClient, tsptest.armcustomization.ArmCustomiz public Response getByResourceGroupWithResponse(String resourceGroupName, String vaultName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vaultName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VaultImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VaultImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public Vault getByResourceGroup(String resourceGroupName, String vaultName) { diff --git a/typespec-tests/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java b/typespec-tests/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java index cc8e43cdf3..99a246c7ae 100644 --- a/typespec-tests/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java +++ b/typespec-tests/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java @@ -29,8 +29,12 @@ public Response getNestedWithResponse(String providerNamespace, Str String nestedResourceTypeFirst, String sku, Context context) { Response inner = this.serviceClient() .getNestedWithResponse(providerNamespace, resourceType, nestedResourceTypeFirst, sku, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public SkuResource getNested(String providerNamespace, String resourceType, String nestedResourceTypeFirst, @@ -48,8 +52,12 @@ public Response createNestedWithResponse(String providerNamespace, String nestedResourceTypeFirst, String sku, SkuResourceInner resource, Context context) { Response inner = this.serviceClient() .createNestedWithResponse(providerNamespace, resourceType, nestedResourceTypeFirst, sku, resource, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public SkuResource createNested(String providerNamespace, String resourceType, String nestedResourceTypeFirst, @@ -78,8 +86,12 @@ public Response getRootWithResponse(String providerNamespace, Strin Context context) { Response inner = this.serviceClient().getRootWithResponse(providerNamespace, resourceType, sku, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public SkuResource getRoot(String providerNamespace, String resourceType, String sku) { diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java index f8f997455b..51e14bb9a4 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java @@ -31,8 +31,12 @@ public Response getWithResponse(String resourceUri, Stri String childExtensionResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceUri, topLevelArmResourceName, childExtensionResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChildExtensionResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChildExtensionResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ChildExtensionResource get(String resourceUri, String topLevelArmResourceName, diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java index ef2b3f5052..2301426197 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java @@ -31,8 +31,12 @@ public Response getWithResponse(String resourceGroupName, String String childResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceGroupName, topLevelArmResourceName, childResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChildResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChildResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ChildResource get(String resourceGroupName, String topLevelArmResourceName, String childResourceName) { diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java index b003d07a24..cb64f8316c 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java @@ -30,8 +30,12 @@ public Response getByResourceGroupWithResponse(S String managedMaintenanceWindowStatusContentName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, managedMaintenanceWindowStatusContentName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ManagedMaintenanceWindowStatusImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ManagedMaintenanceWindowStatusImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ManagedMaintenanceWindowStatus getByResourceGroup(String resourceGroupName, diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java index ed9fb5cf73..3cbcc629c0 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java @@ -30,8 +30,12 @@ public Response getByResourceGroupWithResponse(String re String modelInterfaceDifferentNameName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, modelInterfaceDifferentNameName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ModelInterfaceSameNameImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ModelInterfaceSameNameImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public ModelInterfaceSameName getByResourceGroup(String resourceGroupName, String modelInterfaceDifferentNameName) { diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java index 2e198ed797..85ac6caf84 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java @@ -34,8 +34,12 @@ public Response getByResourceGroupWithResponse(String resou String topLevelArmResourceName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourceName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public TopLevelArmResource getByResourceGroup(String resourceGroupName, String topLevelArmResourceName) { diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java index 7241457923..b12428994a 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java @@ -7,9 +7,7 @@ import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceMethod; import com.azure.core.http.rest.PagedIterable; -import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.models.Result; /** @@ -37,70 +35,4 @@ public interface ItemsClient { */ @ServiceMethod(returns = ReturnType.COLLECTION) PagedIterable list(Context context); - - /** - * The summary operation. - * - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable summary(); - - /** - * The summary operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable summary(Context context); - - /** - * The list2 operation. - * - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list2(); - - /** - * The list2 operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list2(Context context); - - /** - * The summary2 operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - Response summary2WithResponse(Context context); - - /** - * The summary2 operation. - * - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - ListResultSummary2Inner summary2(); } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java deleted file mode 100644 index 98b509fdb1..0000000000 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java +++ /dev/null @@ -1,132 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.armstreamstyleserialization.fluent.models; - -import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; -import com.azure.json.JsonReader; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.List; -import tsptest.armstreamstyleserialization.models.ListResult2; -import tsptest.armstreamstyleserialization.models.Result; - -/** - * The ListResultSummary2 model. - */ -@Immutable -public final class ListResultSummary2Inner extends ListResult2 { - /* - * The summary property. - */ - private String summary; - - /* - * The nextLink property. - */ - private String nextLink; - - /* - * The items property. - */ - private List items; - - /** - * Creates an instance of ListResultSummary2Inner class. - */ - private ListResultSummary2Inner() { - } - - /** - * Get the summary property: The summary property. - * - * @return the summary value. - */ - public String summary() { - return this.summary; - } - - /** - * Get the nextLink property: The nextLink property. - * - * @return the nextLink value. - */ - @Override - public String nextLink() { - return this.nextLink; - } - - /** - * Get the items property: The items property. - * - * @return the items value. - */ - @Override - public List items() { - return this.items; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - if (items() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException("Missing required property items in model ListResultSummary2Inner")); - } else { - items().forEach(e -> e.validate()); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ListResultSummary2Inner.class); - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("items", items(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("nextLink", nextLink()); - jsonWriter.writeStringField("summary", this.summary); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of ListResultSummary2Inner from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of ListResultSummary2Inner if the JsonReader was pointing to an instance of it, or null if it - * was pointing to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the ListResultSummary2Inner. - */ - public static ListResultSummary2Inner fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - ListResultSummary2Inner deserializedListResultSummary2Inner = new ListResultSummary2Inner(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("items".equals(fieldName)) { - List items = reader.readArray(reader1 -> Result.fromJson(reader1)); - deserializedListResultSummary2Inner.items = items; - } else if ("nextLink".equals(fieldName)) { - deserializedListResultSummary2Inner.nextLink = reader.getString(); - } else if ("summary".equals(fieldName)) { - deserializedListResultSummary2Inner.summary = reader.getString(); - } else { - reader.skipChildren(); - } - } - - return deserializedListResultSummary2Inner; - }); - } -} diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java index 0a636c9e94..99a767143f 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java @@ -30,8 +30,12 @@ public FishesImpl(FishesClient innerClient, public Response getModelWithResponse(Context context) { Response inner = this.serviceClient().getModelWithResponse(context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new FishImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new FishImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public Fish getModel() { @@ -45,8 +49,12 @@ public Fish getModel() { public Response putModelWithResponse(FishInner fish, Context context) { Response inner = this.serviceClient().putModelWithResponse(fish, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new FishImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new FishImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public Fish putModel(FishInner fish) { @@ -60,8 +68,12 @@ public Fish putModel(FishInner fish) { public Response getOutputOnlyModelWithResponse(Context context) { Response inner = this.serviceClient().getOutputOnlyModelWithResponse(context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new OutputOnlyModelImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new OutputOnlyModelImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public OutputOnlyModel getOutputOnlyModel() { diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java index 1422e8b2dc..70d6dc0ac4 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java @@ -30,10 +30,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import tsptest.armstreamstyleserialization.fluent.ItemsClient; -import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.implementation.models.ListResult; -import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; -import tsptest.armstreamstyleserialization.models.ListResult2; import tsptest.armstreamstyleserialization.models.Result; /** @@ -81,48 +78,6 @@ Mono>> list(@HostParam("endpoint") String endpoint, Response listSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); - @Headers({ "Content-Type: application/json" }) - @Get("/items/summary") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> summary(@HostParam("endpoint") String endpoint, - @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/items/summary") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response summarySync(@HostParam("endpoint") String endpoint, - @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/items/list2") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list2(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, - Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/items/list2") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response list2Sync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, - Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/items/summary2") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> summary2(@HostParam("endpoint") String endpoint, - @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/items/summary2") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response summary2Sync(@HostParam("endpoint") String endpoint, - @HeaderParam("Accept") String accept, Context context); - @Headers({ "Content-Type: application/json" }) @Get("{nextLink}") @ExpectedResponses({ 200 }) @@ -136,34 +91,6 @@ Mono> listNext(@PathParam(value = "nextLink", encoded = tru @UnexpectedResponseExceptionType(ManagementException.class) Response listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("{nextLink}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> summaryNext(@PathParam(value = "nextLink", encoded = true) String nextLink, - @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("{nextLink}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response summaryNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, - @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("{nextLink}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list2Next(@PathParam(value = "nextLink", encoded = true) String nextLink, - @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("{nextLink}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response list2NextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, - @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); } /** @@ -281,269 +208,6 @@ public PagedIterable list(Context context) { return new PagedIterable<>(() -> listSinglePage(context), nextLink -> listNextSinglePage(nextLink, context)); } - /** - * The summary operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> summarySinglePageAsync() { - if (this.client.getEndpoint() == null) { - return Mono.error( - new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.summary(this.client.getEndpoint(), accept, context)) - .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), - res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * The summary operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedFlux}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux summaryAsync() { - return new PagedFlux<>(() -> summarySinglePageAsync(), nextLink -> summaryNextSinglePageAsync(nextLink)); - } - - /** - * The summary operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse summarySinglePage() { - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - Response res = service.summarySync(this.client.getEndpoint(), accept, Context.NONE); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), - res.getValue().nextLink(), null); - } - - /** - * The summary operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse summarySinglePage(Context context) { - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - Response res = service.summarySync(this.client.getEndpoint(), accept, context); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), - res.getValue().nextLink(), null); - } - - /** - * The summary operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable summary() { - return new PagedIterable<>(() -> summarySinglePage(), nextLink -> summaryNextSinglePage(nextLink)); - } - - /** - * The summary operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable summary(Context context) { - return new PagedIterable<>(() -> summarySinglePage(context), - nextLink -> summaryNextSinglePage(nextLink, context)); - } - - /** - * The list2 operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> list2SinglePageAsync() { - if (this.client.getEndpoint() == null) { - return Mono.error( - new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.list2(this.client.getEndpoint(), accept, context)) - .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), - res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * The list2 operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedFlux}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux list2Async() { - return new PagedFlux<>(() -> list2SinglePageAsync(), nextLink -> list2NextSinglePageAsync(nextLink)); - } - - /** - * The list2 operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse list2SinglePage() { - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - Response res = service.list2Sync(this.client.getEndpoint(), accept, Context.NONE); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), - res.getValue().nextLink(), null); - } - - /** - * The list2 operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse list2SinglePage(Context context) { - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - Response res = service.list2Sync(this.client.getEndpoint(), accept, context); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), - res.getValue().nextLink(), null); - } - - /** - * The list2 operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list2() { - return new PagedIterable<>(() -> list2SinglePage(), nextLink -> list2NextSinglePage(nextLink)); - } - - /** - * The list2 operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list2(Context context) { - return new PagedIterable<>(() -> list2SinglePage(context), nextLink -> list2NextSinglePage(nextLink, context)); - } - - /** - * The summary2 operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> summary2WithResponseAsync() { - if (this.client.getEndpoint() == null) { - return Mono.error( - new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.summary2(this.client.getEndpoint(), accept, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * The summary2 operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono summary2Async() { - return summary2WithResponseAsync().flatMap(res -> Mono.justOrEmpty(res.getValue())); - } - - /** - * The summary2 operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response summary2WithResponse(Context context) { - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - return service.summary2Sync(this.client.getEndpoint(), accept, context); - } - - /** - * The summary2 operation. - * - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public ListResultSummary2Inner summary2() { - return summary2WithResponse(Context.NONE).getValue(); - } - /** * Get the next page of items. * @@ -622,163 +286,5 @@ private PagedResponse listNextSinglePage(String nextLink, Context contex res.getValue().nextLink(), null); } - /** - * Get the next page of items. - * - * @param nextLink The URL to get the next list of items. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> summaryNextSinglePageAsync(String nextLink) { - if (nextLink == null) { - return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); - } - if (this.client.getEndpoint() == null) { - return Mono.error( - new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.summaryNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), - res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * Get the next page of items. - * - * @param nextLink The URL to get the next list of items. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse summaryNextSinglePage(String nextLink) { - if (nextLink == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); - } - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - Response res - = service.summaryNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), - res.getValue().nextLink(), null); - } - - /** - * Get the next page of items. - * - * @param nextLink The URL to get the next list of items. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse summaryNextSinglePage(String nextLink, Context context) { - if (nextLink == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); - } - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - Response res = service.summaryNextSync(nextLink, this.client.getEndpoint(), accept, context); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), - res.getValue().nextLink(), null); - } - - /** - * Get the next page of items. - * - * @param nextLink The URL to get the next list of items. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> list2NextSinglePageAsync(String nextLink) { - if (nextLink == null) { - return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); - } - if (this.client.getEndpoint() == null) { - return Mono.error( - new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.list2Next(nextLink, this.client.getEndpoint(), accept, context)) - .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), - res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * Get the next page of items. - * - * @param nextLink The URL to get the next list of items. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse list2NextSinglePage(String nextLink) { - if (nextLink == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); - } - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - Response res = service.list2NextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), - res.getValue().nextLink(), null); - } - - /** - * Get the next page of items. - * - * @param nextLink The URL to get the next list of items. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link PagedResponse}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private PagedResponse list2NextSinglePage(String nextLink, Context context) { - if (nextLink == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); - } - if (this.client.getEndpoint() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException( - "Parameter this.client.getEndpoint() is required and cannot be null.")); - } - final String accept = "application/json"; - Response res = service.list2NextSync(nextLink, this.client.getEndpoint(), accept, context); - return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), - res.getValue().nextLink(), null); - } - private static final ClientLogger LOGGER = new ClientLogger(ItemsClientImpl.class); } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java index cf6522d43c..37ad164854 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java @@ -5,14 +5,10 @@ package tsptest.armstreamstyleserialization.implementation; import com.azure.core.http.rest.PagedIterable; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import tsptest.armstreamstyleserialization.fluent.ItemsClient; -import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.models.Items; -import tsptest.armstreamstyleserialization.models.ListResultSummary2; import tsptest.armstreamstyleserialization.models.Result; public final class ItemsImpl implements Items { @@ -36,37 +32,6 @@ public PagedIterable list(Context context) { return this.serviceClient().list(context); } - public PagedIterable summary() { - return this.serviceClient().summary(); - } - - public PagedIterable summary(Context context) { - return this.serviceClient().summary(context); - } - - public PagedIterable list2() { - return this.serviceClient().list2(); - } - - public PagedIterable list2(Context context) { - return this.serviceClient().list2(context); - } - - public Response summary2WithResponse(Context context) { - Response inner = this.serviceClient().summary2WithResponse(context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ListResultSummary2Impl(inner.getValue(), this.manager())); - } - - public ListResultSummary2 summary2() { - ListResultSummary2Inner inner = this.serviceClient().summary2(); - if (inner != null) { - return new ListResultSummary2Impl(inner, this.manager()); - } else { - return null; - } - } - private ItemsClient serviceClient() { return this.innerClient; } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java deleted file mode 100644 index c5fe07fbb5..0000000000 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.armstreamstyleserialization.implementation; - -import java.util.Collections; -import java.util.List; -import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; -import tsptest.armstreamstyleserialization.models.ListResultSummary2; -import tsptest.armstreamstyleserialization.models.Result; - -public final class ListResultSummary2Impl implements ListResultSummary2 { - private ListResultSummary2Inner innerObject; - - private final tsptest.armstreamstyleserialization.ArmResourceProviderManager serviceManager; - - ListResultSummary2Impl(ListResultSummary2Inner innerObject, - tsptest.armstreamstyleserialization.ArmResourceProviderManager serviceManager) { - this.innerObject = innerObject; - this.serviceManager = serviceManager; - } - - public List items() { - List inner = this.innerModel().items(); - if (inner != null) { - return Collections.unmodifiableList(inner); - } else { - return Collections.emptyList(); - } - } - - public String nextLink() { - return this.innerModel().nextLink(); - } - - public String summary() { - return this.innerModel().summary(); - } - - public ListResultSummary2Inner innerModel() { - return this.innerObject; - } - - private tsptest.armstreamstyleserialization.ArmResourceProviderManager manager() { - return this.serviceManager; - } -} diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java index e7f67aafc2..4556468423 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java @@ -90,7 +90,7 @@ private Mono> setPriorityWithResponseAsync(Priority priority) if (priority == null) { return Mono.error(new IllegalArgumentException("Parameter priority is required and cannot be null.")); } - final String accept = "application/json"; + final String accept = "text/plain"; return FluxUtil .withContext(context -> service.setPriority(this.client.getEndpoint(), priority, accept, context)) .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); @@ -131,7 +131,7 @@ public Response setPriorityWithResponse(Priority priority, Context con throw LOGGER.atError() .log(new IllegalArgumentException("Parameter priority is required and cannot be null.")); } - final String accept = "application/json"; + final String accept = "text/plain"; return service.setPrioritySync(this.client.getEndpoint(), priority, accept, context); } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java index 0d612e3c14..af772cd80e 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java @@ -18,7 +18,7 @@ * The ListResult model. */ @Immutable -public class ListResult implements JsonSerializable { +public final class ListResult implements JsonSerializable { /* * The items property. */ @@ -32,7 +32,7 @@ public class ListResult implements JsonSerializable { /** * Creates an instance of ListResult class. */ - protected ListResult() { + private ListResult() { } /** @@ -44,17 +44,6 @@ public List items() { return this.items; } - /** - * Set the items property: The items property. - * - * @param items the items value to set. - * @return the ListResult object itself. - */ - ListResult withItems(List items) { - this.items = items; - return this; - } - /** * Get the nextLink property: The nextLink property. * @@ -64,17 +53,6 @@ public String nextLink() { return this.nextLink; } - /** - * Set the nextLink property: The nextLink property. - * - * @param nextLink the nextLink value to set. - * @return the ListResult object itself. - */ - ListResult withNextLink(String nextLink) { - this.nextLink = nextLink; - return this; - } - /** * Validates the instance. * diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java deleted file mode 100644 index 04710cf983..0000000000 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.armstreamstyleserialization.implementation.models; - -import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; -import com.azure.json.JsonReader; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.List; -import tsptest.armstreamstyleserialization.models.Result; - -/** - * The ListResultSummary model. - */ -@Immutable -public final class ListResultSummary extends ListResult { - /* - * The summary property. - */ - private String summary; - - /* - * The nextLink property. - */ - private String nextLink; - - /* - * The items property. - */ - private List items; - - /** - * Creates an instance of ListResultSummary class. - */ - private ListResultSummary() { - } - - /** - * Get the summary property: The summary property. - * - * @return the summary value. - */ - public String summary() { - return this.summary; - } - - /** - * Get the nextLink property: The nextLink property. - * - * @return the nextLink value. - */ - @Override - public String nextLink() { - return this.nextLink; - } - - /** - * Get the items property: The items property. - * - * @return the items value. - */ - @Override - public List items() { - return this.items; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - if (items() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException("Missing required property items in model ListResultSummary")); - } else { - items().forEach(e -> e.validate()); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ListResultSummary.class); - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("items", items(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("nextLink", nextLink()); - jsonWriter.writeStringField("summary", this.summary); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of ListResultSummary from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of ListResultSummary if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the ListResultSummary. - */ - public static ListResultSummary fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - ListResultSummary deserializedListResultSummary = new ListResultSummary(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("items".equals(fieldName)) { - List items = reader.readArray(reader1 -> Result.fromJson(reader1)); - deserializedListResultSummary.items = items; - } else if ("nextLink".equals(fieldName)) { - deserializedListResultSummary.nextLink = reader.getString(); - } else if ("summary".equals(fieldName)) { - deserializedListResultSummary.summary = reader.getString(); - } else { - reader.skipChildren(); - } - } - - return deserializedListResultSummary; - }); - } -} diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Items.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Items.java index e6a0925190..819aef6f3a 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Items.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Items.java @@ -5,7 +5,6 @@ package tsptest.armstreamstyleserialization.models; import com.azure.core.http.rest.PagedIterable; -import com.azure.core.http.rest.Response; import com.azure.core.util.Context; /** @@ -31,64 +30,4 @@ public interface Items { * @return the paginated response with {@link PagedIterable}. */ PagedIterable list(Context context); - - /** - * The summary operation. - * - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - PagedIterable summary(); - - /** - * The summary operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - PagedIterable summary(Context context); - - /** - * The list2 operation. - * - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - PagedIterable list2(); - - /** - * The list2 operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the paginated response with {@link PagedIterable}. - */ - PagedIterable list2(Context context); - - /** - * The summary2 operation. - * - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response body along with {@link Response}. - */ - Response summary2WithResponse(Context context); - - /** - * The summary2 operation. - * - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. - */ - ListResultSummary2 summary2(); } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java deleted file mode 100644 index 27bdf410dd..0000000000 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.armstreamstyleserialization.models; - -import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.List; - -/** - * The ListResult2 model. - */ -@Immutable -public class ListResult2 implements JsonSerializable { - /* - * The items property. - */ - private List items; - - /* - * The nextLink property. - */ - private String nextLink; - - /** - * Creates an instance of ListResult2 class. - */ - protected ListResult2() { - } - - /** - * Get the items property: The items property. - * - * @return the items value. - */ - public List items() { - return this.items; - } - - /** - * Set the items property: The items property. - * - * @param items the items value to set. - * @return the ListResult2 object itself. - */ - ListResult2 withItems(List items) { - this.items = items; - return this; - } - - /** - * Get the nextLink property: The nextLink property. - * - * @return the nextLink value. - */ - public String nextLink() { - return this.nextLink; - } - - /** - * Set the nextLink property: The nextLink property. - * - * @param nextLink the nextLink value to set. - * @return the ListResult2 object itself. - */ - ListResult2 withNextLink(String nextLink) { - this.nextLink = nextLink; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (items() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException("Missing required property items in model ListResult2")); - } else { - items().forEach(e -> e.validate()); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ListResult2.class); - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("items", this.items, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("nextLink", this.nextLink); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of ListResult2 from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of ListResult2 if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the ListResult2. - */ - public static ListResult2 fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - ListResult2 deserializedListResult2 = new ListResult2(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("items".equals(fieldName)) { - List items = reader.readArray(reader1 -> Result.fromJson(reader1)); - deserializedListResult2.items = items; - } else if ("nextLink".equals(fieldName)) { - deserializedListResult2.nextLink = reader.getString(); - } else { - reader.skipChildren(); - } - } - - return deserializedListResult2; - }); - } -} diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java deleted file mode 100644 index 5bd683003c..0000000000 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.armstreamstyleserialization.models; - -import java.util.List; -import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; - -/** - * An immutable client-side representation of ListResultSummary2. - */ -public interface ListResultSummary2 { - /** - * Gets the items property: The items property. - * - * @return the items value. - */ - List items(); - - /** - * Gets the nextLink property: The nextLink property. - * - * @return the nextLink value. - */ - String nextLink(); - - /** - * Gets the summary property: The summary property. - * - * @return the summary value. - */ - String summary(); - - /** - * Gets the inner tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner object. - * - * @return the inner object. - */ - ListResultSummary2Inner innerModel(); -} diff --git a/typespec-tests/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java b/typespec-tests/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java index f38b566286..a0b31f30db 100644 --- a/typespec-tests/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java @@ -66,16 +66,24 @@ public Response getByResourceGroupWithResponse(String resou Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourcePropertiesName, parameter, newParameter, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public Response getByResourceGroupWithResponse(String resourceGroupName, String topLevelArmResourcePropertiesName, String parameter, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourcePropertiesName, parameter, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); + if (inner != null) { + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); + } else { + return null; + } } public TopLevelArmResource getByResourceGroup(String resourceGroupName, String topLevelArmResourcePropertiesName) { diff --git a/typespec-tests/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java b/typespec-tests/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java index e73463da42..615aa6128a 100644 --- a/typespec-tests/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java +++ b/typespec-tests/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java @@ -20,6 +20,7 @@ import tsptest.discriminatoredgecases.implementation.DiscriminatorEdgeCasesClientImpl; import tsptest.discriminatoredgecases.models.ChildWithAnotherDiscriminator; import tsptest.discriminatoredgecases.models.ChildWithRequiredPropertyAsDiscriminator; +import tsptest.discriminatoredgecases.models.ModelWithDiscriminatorNoSubtypes; /** * Initializes a new instance of the asynchronous DiscriminatorEdgeCasesClient type. @@ -94,6 +95,32 @@ public Mono> getChildNewDiscrimWithResponse(RequestOptions return this.serviceClient.getChildNewDiscrimWithResponseAsync(requestOptions); } + /** + * The getNoSubtypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     kind: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return model with along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getNoSubtypesWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getNoSubtypesWithResponseAsync(requestOptions); + } + /** * The getChildRequiredDiscrim operation. * @@ -131,4 +158,23 @@ public Mono getChildNewDiscrim() { return getChildNewDiscrimWithResponse(requestOptions).flatMap(FluxUtil::toMono) .map(protocolMethodData -> protocolMethodData.toObject(ChildWithAnotherDiscriminator.class)); } + + /** + * The getNoSubtypes operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return model with on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getNoSubtypes() { + // Generated convenience method for getNoSubtypesWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getNoSubtypesWithResponse(requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(ModelWithDiscriminatorNoSubtypes.class)); + } } diff --git a/typespec-tests/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java b/typespec-tests/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java index 1ffb3e582e..81006ef04e 100644 --- a/typespec-tests/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java +++ b/typespec-tests/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java @@ -18,6 +18,7 @@ import tsptest.discriminatoredgecases.implementation.DiscriminatorEdgeCasesClientImpl; import tsptest.discriminatoredgecases.models.ChildWithAnotherDiscriminator; import tsptest.discriminatoredgecases.models.ChildWithRequiredPropertyAsDiscriminator; +import tsptest.discriminatoredgecases.models.ModelWithDiscriminatorNoSubtypes; /** * Initializes a new instance of the synchronous DiscriminatorEdgeCasesClient type. @@ -92,6 +93,32 @@ public Response getChildNewDiscrimWithResponse(RequestOptions reques return this.serviceClient.getChildNewDiscrimWithResponse(requestOptions); } + /** + * The getNoSubtypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     kind: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return model with along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getNoSubtypesWithResponse(RequestOptions requestOptions) { + return this.serviceClient.getNoSubtypesWithResponse(requestOptions); + } + /** * The getChildRequiredDiscrim operation. * @@ -128,4 +155,22 @@ public ChildWithAnotherDiscriminator getChildNewDiscrim() { RequestOptions requestOptions = new RequestOptions(); return getChildNewDiscrimWithResponse(requestOptions).getValue().toObject(ChildWithAnotherDiscriminator.class); } + + /** + * The getNoSubtypes operation. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return model with. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithDiscriminatorNoSubtypes getNoSubtypes() { + // Generated convenience method for getNoSubtypesWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getNoSubtypesWithResponse(requestOptions).getValue().toObject(ModelWithDiscriminatorNoSubtypes.class); + } } diff --git a/typespec-tests/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java b/typespec-tests/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java index 9ac447b851..f76c06ec6c 100644 --- a/typespec-tests/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java +++ b/typespec-tests/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java @@ -160,6 +160,24 @@ Mono> getChildNewDiscrim(@HostParam("endpoint") String endp @UnexpectedResponseExceptionType(HttpResponseException.class) Response getChildNewDiscrimSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/model/nosubtypes") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getNoSubtypes(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/model/nosubtypes") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getNoSubtypesSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); } /** @@ -273,4 +291,57 @@ public Response getChildNewDiscrimWithResponse(RequestOptions reques final String accept = "application/json"; return service.getChildNewDiscrimSync(this.getEndpoint(), accept, requestOptions, Context.NONE); } + + /** + * The getNoSubtypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     kind: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return model with along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getNoSubtypesWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.getNoSubtypes(this.getEndpoint(), accept, requestOptions, context)); + } + + /** + * The getNoSubtypes operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     kind: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return model with along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getNoSubtypesWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getNoSubtypesSync(this.getEndpoint(), accept, requestOptions, Context.NONE); + } } diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java b/typespec-tests/src/main/java/tsptest/discriminatoredgecases/models/ModelWithDiscriminatorNoSubtypes.java similarity index 53% rename from typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java rename to typespec-tests/src/main/java/tsptest/discriminatoredgecases/models/ModelWithDiscriminatorNoSubtypes.java index 5eda5a1882..59c1737d62 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java +++ b/typespec-tests/src/main/java/tsptest/discriminatoredgecases/models/ModelWithDiscriminatorNoSubtypes.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.flattenproperty.models; +package tsptest.discriminatoredgecases.models; -import com.azure.core.annotation.Fluent; import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; import com.azure.json.JsonReader; import com.azure.json.JsonSerializable; import com.azure.json.JsonToken; @@ -13,62 +13,50 @@ import java.io.IOException; /** - * This is the model with flattened properties that are all read-only. + * Model with. */ -@Fluent -public final class Solution implements JsonSerializable { +@Immutable +public final class ModelWithDiscriminatorNoSubtypes implements JsonSerializable { /* - * The name property. + * The kind property. */ @Generated - private final String name; + private String kind = "ModelWithDiscriminatorNoSubtypes"; /* - * The properties property. + * The name property. */ @Generated - private SolutionProperties properties; + private final String name; /** - * Creates an instance of Solution class. + * Creates an instance of ModelWithDiscriminatorNoSubtypes class. * * @param name the name value to set. */ @Generated - public Solution(String name) { + private ModelWithDiscriminatorNoSubtypes(String name) { this.name = name; } /** - * Get the name property: The name property. - * - * @return the name value. - */ - @Generated - public String getName() { - return this.name; - } - - /** - * Get the properties property: The properties property. + * Get the kind property: The kind property. * - * @return the properties value. + * @return the kind value. */ @Generated - public SolutionProperties getProperties() { - return this.properties; + public String getKind() { + return this.kind; } /** - * Set the properties property: The properties property. + * Get the name property: The name property. * - * @param properties the properties value to set. - * @return the Solution object itself. + * @return the name value. */ @Generated - public Solution setProperties(SolutionProperties properties) { - this.properties = properties; - return this; + public String getName() { + return this.name; } /** @@ -79,40 +67,41 @@ public Solution setProperties(SolutionProperties properties) { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("name", this.name); - jsonWriter.writeJsonField("properties", this.properties); + jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } /** - * Reads an instance of Solution from the JsonReader. + * Reads an instance of ModelWithDiscriminatorNoSubtypes from the JsonReader. * * @param jsonReader The JsonReader being read. - * @return An instance of Solution if the JsonReader was pointing to an instance of it, or null if it was pointing - * to JSON null. + * @return An instance of ModelWithDiscriminatorNoSubtypes if the JsonReader was pointing to an instance of it, or + * null if it was pointing to JSON null. * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the Solution. + * @throws IOException If an error occurs while reading the ModelWithDiscriminatorNoSubtypes. */ @Generated - public static Solution fromJson(JsonReader jsonReader) throws IOException { + public static ModelWithDiscriminatorNoSubtypes fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { String name = null; - SolutionProperties properties = null; + String kind = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("name".equals(fieldName)) { name = reader.getString(); - } else if ("properties".equals(fieldName)) { - properties = SolutionProperties.fromJson(reader); + } else if ("kind".equals(fieldName)) { + kind = reader.getString(); } else { reader.skipChildren(); } } - Solution deserializedSolution = new Solution(name); - deserializedSolution.properties = properties; + ModelWithDiscriminatorNoSubtypes deserializedModelWithDiscriminatorNoSubtypes + = new ModelWithDiscriminatorNoSubtypes(name); + deserializedModelWithDiscriminatorNoSubtypes.kind = kind; - return deserializedSolution; + return deserializedModelWithDiscriminatorNoSubtypes; }); } } diff --git a/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java b/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java index 28fd5ff589..5eb297d5fd 100644 --- a/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java +++ b/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java @@ -474,38 +474,6 @@ public Mono> setStringEnumArrayHeaderWithResponse(List co return this.serviceClient.setStringEnumArrayHeaderWithResponseAsync(colorArray, requestOptions); } - /** - * The getWrongBody operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * String
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * String
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return simple string along with {@link Response} on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.getWrongBodyWithResponseAsync(body, requestOptions); - } - /** * The getColor operation. * @@ -1074,25 +1042,4 @@ public Mono setStringEnumArrayHeader(List colorArray) { .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), requestOptions).flatMap(FluxUtil::toMono); } - - /** - * The getWrongBody operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return simple string on successful completion of {@link Mono}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getWrongBody(String body) { - // Generated convenience method for getWrongBodyWithResponse - RequestOptions requestOptions = new RequestOptions(); - return getWrongBodyWithResponse(BinaryData.fromString(body), requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toString()); - } } diff --git a/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceClient.java b/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceClient.java index 05e4be7cc2..802a27c880 100644 --- a/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceClient.java +++ b/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceClient.java @@ -470,38 +470,6 @@ public Response setStringEnumArrayHeaderWithResponse(List colorArr return this.serviceClient.setStringEnumArrayHeaderWithResponse(colorArray, requestOptions); } - /** - * The getWrongBody operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * String
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * String
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return simple string along with {@link Response}. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { - return this.serviceClient.getWrongBodyWithResponse(body, requestOptions); - } - /** * The getColor operation. * @@ -1047,24 +1015,4 @@ public void setStringEnumArrayHeader(List colorArray) { .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), requestOptions).getValue(); } - - /** - * The getWrongBody operation. - * - * @param body The body parameter. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return simple string. - */ - @Generated - @ServiceMethod(returns = ReturnType.SINGLE) - public String getWrongBody(String body) { - // Generated convenience method for getWrongBodyWithResponse - RequestOptions requestOptions = new RequestOptions(); - return getWrongBodyWithResponse(BinaryData.fromString(body), requestOptions).getValue().toString(); - } } diff --git a/typespec-tests/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java b/typespec-tests/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java index 14c8d1c04e..fce35a37c7 100644 --- a/typespec-tests/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java +++ b/typespec-tests/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java @@ -4,7 +4,6 @@ package tsptest.enumservice.implementation; -import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; import com.azure.core.annotation.HeaderParam; @@ -416,26 +415,6 @@ Mono> setStringEnumArrayHeader(@HostParam("endpoint") String endp @UnexpectedResponseExceptionType(HttpResponseException.class) Response setStringEnumArrayHeaderSync(@HostParam("endpoint") String endpoint, @HeaderParam("color-array") String colorArray, RequestOptions requestOptions, Context context); - - @Post("/enum/operation/wrong-body") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> getWrongBody(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("text/plain") BinaryData body, RequestOptions requestOptions, Context context); - - @Post("/enum/operation/wrong-body") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response getWrongBodySync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("text/plain") BinaryData body, RequestOptions requestOptions, Context context); } /** @@ -1338,71 +1317,4 @@ public Response setStringEnumArrayHeaderWithResponse(List colorArr return service.setStringEnumArrayHeaderSync(this.getEndpoint(), colorArrayConverted, requestOptions, Context.NONE); } - - /** - * The getWrongBody operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * String
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * String
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return simple string along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWrongBodyWithResponseAsync(BinaryData body, RequestOptions requestOptions) { - final String contentType = "text/plain"; - final String accept = "text/plain"; - return FluxUtil.withContext( - context -> service.getWrongBody(this.getEndpoint(), contentType, accept, body, requestOptions, context)); - } - - /** - * The getWrongBody operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * String
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * String
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return simple string along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { - final String contentType = "text/plain"; - final String accept = "text/plain"; - return service.getWrongBodySync(this.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE); - } } diff --git a/typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-defaultclient.properties b/typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties similarity index 100% rename from typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-defaultclient.properties rename to typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties diff --git a/typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyclient.properties b/typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties similarity index 100% rename from typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyclient.properties rename to typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties diff --git a/typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties b/typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties similarity index 100% rename from typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties rename to typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java b/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java similarity index 80% rename from typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java rename to typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java index 7200a132b6..4b0f55cce3 100644 --- a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java +++ b/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java @@ -2,24 +2,24 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.defaultclient.generated; +package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.generated; // The Java test files under 'generated' package are generated for your reference. // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient; -import azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClientBuilder; -import azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient; -import azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClientBuilder; -import azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient; -import azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClientBuilder; -import azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient; -import azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClientBuilder; -import azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient; -import azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClientBuilder; -import azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient; -import azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient; +import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClientBuilder; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java b/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java similarity index 80% rename from typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java rename to typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java index 995a5c1423..c5add06432 100644 --- a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java +++ b/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java @@ -2,24 +2,24 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyclient.generated; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.generated; // The Java test files under 'generated' package are generated for your reference. // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient; -import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClientBuilder; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java b/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java similarity index 78% rename from typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java rename to typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java index 255296ba8a..79eb17cdd8 100644 --- a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java +++ b/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java @@ -2,26 +2,26 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package azure.clientgenerator.core.clientinitialization.individuallyparentclient.generated; +package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.generated; // The Java test files under 'generated' package are generated for your reference. // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClientBuilder; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient; -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClientBuilder; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient; +import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClientBuilder; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java deleted file mode 100644 index 80caba42b5..0000000000 --- a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package azure.clientgenerator.core.clientinitialization.defaultclient; - -import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; -import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class DefaultClientTests { - - @Test - public void testHeaderParam() { - HeaderParamClient headerParamClient = new HeaderParamClientBuilder().name("test-name-value").buildClient(); - - headerParamClient.withQuery("test-id"); - headerParamClient.withBody(new Input("test-name")); - } - - @Test - public void testMultipleParams() { - MultipleParamsClient multipleParamsClient - = new MultipleParamsClientBuilder().name("test-name-value").region("us-west").buildClient(); - - multipleParamsClient.withQuery("test-id"); - multipleParamsClient.withBody(new Input("test-name")); - } - - @Test - public void testMixedParams() { - MixedParamsClient mixedParamsClient = new MixedParamsClientBuilder().name("test-name-value").buildClient(); - - mixedParamsClient.withQuery("us-west", "test-id"); - mixedParamsClient.withBody("us-west", new WithBodyRequest("test-name")); - } - - @Test - public void testPathParam() { - PathParamClient pathParamClient = new PathParamClientBuilder().blobName("sample-blob").buildClient(); - - pathParamClient.withQuery("text"); - BlobProperties blobProperties = pathParamClient.getStandalone(); - Assertions.assertNotNull(blobProperties); - Assertions.assertEquals("sample-blob", blobProperties.getName()); - pathParamClient.deleteStandalone(); - } - - @Test - public void testParamAlias() { - ParamAliasClient paramAliasClient = new ParamAliasClientBuilder().blobName("sample-blob").buildClient(); - - paramAliasClient.withAliasedName(); - paramAliasClient.withOriginalName(); - } - - @Test - public void testQueryParam() { - QueryParamClient queryParamClient = new QueryParamClientBuilder().blobName("test-blob").buildClient(); - - queryParamClient.withQuery("text"); - BlobProperties blobProperties = queryParamClient.getStandalone(); - Assertions.assertNotNull(blobProperties); - Assertions.assertEquals("test-blob", blobProperties.getName()); - queryParamClient.deleteStandalone(); - } -} diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java deleted file mode 100644 index 02b30166f3..0000000000 --- a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package azure.clientgenerator.core.clientinitialization.individuallyclient; - -import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class IndividuallyClientTests { - - @Test - public void testIndividuallyNestedWithPath() { - IndividuallyNestedWithPathClient client - = new IndividuallyNestedWithPathClientBuilder().blobName("test-blob").buildClient(); - - client.withQuery("text"); - BlobProperties blobProperties = client.getStandalone(); - Assertions.assertNotNull(blobProperties); - Assertions.assertEquals("test-blob", blobProperties.getName()); - client.deleteStandalone(); - } - - @Test - public void testIndividuallyNestedWithQuery() { - IndividuallyNestedWithQueryClient client - = new IndividuallyNestedWithQueryClientBuilder().blobName("test-blob").buildClient(); - - client.withQuery("text"); - BlobProperties blobProperties = client.getStandalone(); - Assertions.assertNotNull(blobProperties); - Assertions.assertEquals("test-blob", blobProperties.getName()); - client.deleteStandalone(); - } - - @Test - public void testIndividuallyNestedWithHeader() { - IndividuallyNestedWithHeaderClient client - = new IndividuallyNestedWithHeaderClientBuilder().name("test-name-value").buildClient(); - - client.withQuery("text"); - client.getStandalone(); - client.deleteStandalone(); - } - - @Test - public void testIndividuallyNestedWithMultiple() { - IndividuallyNestedWithMultipleClient client - = new IndividuallyNestedWithMultipleClientBuilder().name("test-name-value").region("us-west").buildClient(); - - client.withQuery("text"); - client.getStandalone(); - client.deleteStandalone(); - } - - @Test - public void testIndividuallyNestedWithMixed() { - IndividuallyNestedWithMixedClient client - = new IndividuallyNestedWithMixedClientBuilder().name("test-name-value").buildClient(); - - client.withQuery("us-west", "text"); - client.getStandalone("us-west"); - client.deleteStandalone("us-west"); - } - - @Test - public void testIndividuallyNestedWithParamAlias() { - IndividuallyNestedWithParamAliasClient client - = new IndividuallyNestedWithParamAliasClientBuilder().blobName("sample-blob").buildClient(); - - client.withAliasedName(); - client.withOriginalName(); - } -} diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java deleted file mode 100644 index 18feb0c542..0000000000 --- a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package azure.clientgenerator.core.clientinitialization.individuallyparentclient; - -import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class IndividuallyParentClientTests { - - private final IndividuallyParentClient parentClient = new IndividuallyParentClientBuilder().buildClient(); - - @Test - public void testIndividuallyParentNestedWithPath() { - IndividuallyParentNestedWithPathClient client - = parentClient.getIndividuallyParentNestedWithPathClient("test-blob"); - - client.withQuery("text"); - BlobProperties blobProperties = client.getStandalone(); - Assertions.assertNotNull(blobProperties); - Assertions.assertEquals("test-blob", blobProperties.getName()); - client.deleteStandalone(); - } - - @Test - public void testIndividuallyParentNestedWithQuery() { - IndividuallyParentNestedWithQueryClient client - = parentClient.getIndividuallyParentNestedWithQueryClient("test-blob"); - - client.withQuery("text"); - BlobProperties blobProperties = client.getStandalone(); - Assertions.assertNotNull(blobProperties); - Assertions.assertEquals("test-blob", blobProperties.getName()); - client.deleteStandalone(); - } - - @Test - public void testIndividuallyParentNestedWithHeader() { - IndividuallyParentNestedWithHeaderClient client - = parentClient.getIndividuallyParentNestedWithHeaderClient("test-name-value"); - - client.withQuery("text"); - client.getStandalone(); - client.deleteStandalone(); - } - - @Test - public void testIndividuallyParentNestedWithMultiple() { - IndividuallyParentNestedWithMultipleClient client - = parentClient.getIndividuallyParentNestedWithMultipleClient("test-name-value", "us-west"); - - client.withQuery("text"); - client.getStandalone(); - client.deleteStandalone(); - } - - @Test - public void testIndividuallyParentNestedWithMixed() { - IndividuallyParentNestedWithMixedClient client - = parentClient.getIndividuallyParentNestedWithMixedClient("test-name-value"); - - client.withQuery("us-west", "text"); - client.getStandalone("us-west"); - client.deleteStandalone("us-west"); - } - - @Test - public void testIndividuallyParentNestedWithParamAlias() { - IndividuallyParentNestedWithParamAliasClient client - = parentClient.getIndividuallyParentNestedWithParamAliasClient("sample-blob"); - - client.withAliasedName(); - client.withOriginalName(); - } -} diff --git a/typespec-tests/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java b/typespec-tests/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java index b9b6ec4329..af8b611d49 100644 --- a/typespec-tests/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java +++ b/typespec-tests/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java @@ -6,8 +6,6 @@ import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource1Inner; import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource2Inner; import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResourceInner; -import azure.resourcemanager.methodsubscriptionid.models.Operation; -import azure.resourcemanager.methodsubscriptionid.models.OperationDisplay; import azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResource; import azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResourceProperties; import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource; @@ -17,8 +15,6 @@ import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource2Properties; import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResourceProperties; import com.azure.core.management.Region; -import java.util.List; -import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.utils.ArmUtils; @@ -48,23 +44,6 @@ public class MethodSubscriptionIdTest { private final MethodSubscriptionIdManager manager = MethodSubscriptionIdManager.authenticate(ArmUtils.createTestHttpPipeline(), ArmUtils.getAzureProfile()); - @Test - public void testOperationsList() { - List operationList = manager.operations().list().stream().collect(Collectors.toList()); - Assertions.assertFalse(operationList.isEmpty()); - Assertions.assertEquals(1, operationList.size()); - Operation operation = operationList.get(0); - Assertions.assertNotNull(operation); - Assertions.assertEquals("Azure.ResourceManager.MethodSubscriptionId/services/read", operation.name()); - Assertions.assertFalse(operation.isDataAction()); - OperationDisplay display = operation.display(); - Assertions.assertNotNull(display); - Assertions.assertEquals("Azure.ResourceManager.MethodSubscriptionId", display.provider()); - Assertions.assertEquals("services", display.resource()); - Assertions.assertEquals("Lists services", display.operation()); - Assertions.assertEquals("Lists registered services", display.description()); - } - @Test public void testTwoSubscriptionResourcesMethodLevelSubscriptionResource1Operations() { // Test Scenario 1: Two subscription resources with method-level subscriptionId diff --git a/typespec-tests/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java b/typespec-tests/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java index be9de58af4..e2bd7fd5a2 100644 --- a/typespec-tests/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java +++ b/typespec-tests/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java @@ -3,8 +3,6 @@ package azure.resourcemanager.nonresource; -import azure.resourcemanager.nonresource.fluent.models.NonResourceInner; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.utils.ArmUtils; @@ -19,15 +17,6 @@ public void testNonResourceGet() { manager.nonResourceOperations().get("eastus", "hello"); } - @Test - public void testNonResourceCreate() { - NonResourceInner body = new NonResourceInner().withId("id").withName("hello").withType("nonResource"); - NonResourceInner result = manager.serviceClient().getNonResourceOperations().create("eastus", "hello", body); - Assertions.assertEquals("id", result.id()); - Assertions.assertEquals("hello", result.name()); - Assertions.assertEquals("nonResource", result.type()); - } - @Disabled("It is mistakenly treated as a resource") @Test public void testNonResourcePut() { diff --git a/typespec-tests/src/test/java/encode/duration/EncodeDurationTests.java b/typespec-tests/src/test/java/encode/duration/EncodeDurationTests.java index 9313e9e9b6..ff829e46ea 100644 --- a/typespec-tests/src/test/java/encode/duration/EncodeDurationTests.java +++ b/typespec-tests/src/test/java/encode/duration/EncodeDurationTests.java @@ -4,19 +4,11 @@ package encode.duration; import encode.duration.property.models.DefaultDurationProperty; -import encode.duration.property.models.Float64MillisecondsDurationProperty; import encode.duration.property.models.Float64SecondsDurationProperty; -import encode.duration.property.models.FloatMillisecondsDurationArrayProperty; -import encode.duration.property.models.FloatMillisecondsDurationProperty; -import encode.duration.property.models.FloatMillisecondsLargerUnitDurationProperty; import encode.duration.property.models.FloatSecondsDurationArrayProperty; import encode.duration.property.models.FloatSecondsDurationProperty; -import encode.duration.property.models.FloatSecondsLargerUnitDurationProperty; import encode.duration.property.models.ISO8601DurationProperty; -import encode.duration.property.models.Int32MillisecondsDurationProperty; -import encode.duration.property.models.Int32MillisecondsLargerUnitDurationProperty; import encode.duration.property.models.Int32SecondsDurationProperty; -import encode.duration.property.models.Int32SecondsLargerUnitDurationProperty; import java.time.Duration; import java.util.Arrays; import java.util.List; @@ -32,8 +24,6 @@ public class EncodeDurationTests { private static final Duration DAY40 = Duration.ofDays(40); private static final Duration SECOND35 = Duration.ofSeconds(35, 625_000_000); private static final Duration SECOND36 = Duration.ofSeconds(36); - private static final Duration MILLIS35625 = Duration.ofMillis(35625); - private static final Duration MILLIS36000 = Duration.ofMillis(36000); @Test public void testQuery() { @@ -45,25 +35,9 @@ public void testQuery() { queryClient.int32Seconds(SECOND36); - queryClient.int32SecondsLargerUnit(Duration.ofMinutes(2)); - - queryClient.floatSecondsLargerUnit(Duration.ofMinutes(2).plusSeconds(30)); - queryClient.iso8601(DAY40); queryClient.int32SecondsArray(Arrays.asList(SECOND36, Duration.ofSeconds(47))); - - queryClient.int32Milliseconds(MILLIS36000); - - queryClient.int32MillisecondsLargerUnit(Duration.ofMinutes(3)); - - queryClient.floatMilliseconds(MILLIS35625); - - queryClient.floatMillisecondsLargerUnit(Duration.ofMinutes(3).plusSeconds(30)); - - queryClient.float64Milliseconds(MILLIS35625); - - queryClient.int32MillisecondsArray(Arrays.asList(MILLIS36000, Duration.ofMillis(47000))); } @Test @@ -76,25 +50,9 @@ public void testHeader() { headerClient.int32Seconds(SECOND36); - headerClient.int32SecondsLargerUnit(Duration.ofMinutes(2)); - - headerClient.floatSecondsLargerUnit(Duration.ofMinutes(2).plusSeconds(30)); - headerClient.iso8601(DAY40); headerClient.iso8601Array(Arrays.asList(DAY40, Duration.ofDays(50))); - - headerClient.int32Milliseconds(MILLIS36000); - - headerClient.int32MillisecondsLargerUnit(Duration.ofMinutes(3)); - - headerClient.floatMilliseconds(MILLIS35625); - - headerClient.floatMillisecondsLargerUnit(Duration.ofMinutes(3).plusSeconds(30)); - - headerClient.float64Milliseconds(MILLIS35625); - - headerClient.int32MillisecondsArray(Arrays.asList(MILLIS36000, Duration.ofMillis(47000))); } @Test @@ -110,46 +68,11 @@ public void testProperty() { Assertions.assertEquals(SECOND36, propertyClient.int32Seconds(new Int32SecondsDurationProperty(SECOND36)).getValue()); - Assertions.assertEquals(Duration.ofMinutes(2), - propertyClient.int32SecondsLargerUnit(new Int32SecondsLargerUnitDurationProperty(Duration.ofMinutes(2))) - .getValue()); - - Assertions.assertEquals(Duration.ofMinutes(2).plusSeconds(30), - propertyClient - .floatSecondsLargerUnit( - new FloatSecondsLargerUnitDurationProperty(Duration.ofMinutes(2).plusSeconds(30))) - .getValue()); - propertyClient.iso8601(new ISO8601DurationProperty(DAY40)); List array = Arrays.asList(SECOND35, Duration.ofSeconds(46, 750_000_000)); FloatSecondsDurationArrayProperty ret = propertyClient.floatSecondsArray(new FloatSecondsDurationArrayProperty(array)); Assertions.assertEquals(array, ret.getValue()); - - Assertions.assertEquals(MILLIS36000, - propertyClient.int32Milliseconds(new Int32MillisecondsDurationProperty(MILLIS36000)).getValue()); - - Assertions.assertEquals(MILLIS35625, - propertyClient.floatMilliseconds(new FloatMillisecondsDurationProperty(MILLIS35625)).getValue()); - - Assertions.assertEquals(MILLIS35625, - propertyClient.float64Milliseconds(new Float64MillisecondsDurationProperty(MILLIS35625)).getValue()); - - Assertions.assertEquals(Duration.ofMinutes(3), - propertyClient - .int32MillisecondsLargerUnit(new Int32MillisecondsLargerUnitDurationProperty(Duration.ofMinutes(3))) - .getValue()); - - Assertions.assertEquals(Duration.ofMinutes(3).plusSeconds(30), - propertyClient - .floatMillisecondsLargerUnit( - new FloatMillisecondsLargerUnitDurationProperty(Duration.ofMinutes(3).plusSeconds(30))) - .getValue()); - - List millisArray = Arrays.asList(Duration.ofMillis(35625), Duration.ofMillis(46750)); - FloatMillisecondsDurationArrayProperty millisArrayRet - = propertyClient.floatMillisecondsArray(new FloatMillisecondsDurationArrayProperty(millisArray)); - Assertions.assertEquals(millisArray, millisArrayRet.getValue()); } } diff --git a/typespec-tests/src/test/java/specialwords/ExtensibleStringsClientTest.java b/typespec-tests/src/test/java/specialwords/ExtensibleStringsClientTest.java deleted file mode 100644 index 633147c06f..0000000000 --- a/typespec-tests/src/test/java/specialwords/ExtensibleStringsClientTest.java +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package specialwords; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import specialwords.extensiblestrings.models.ExtensibleString; - -public class ExtensibleStringsClientTest { - - private final ExtensibleStringsClient client = new SpecialWordsClientBuilder().buildExtensibleStringsClient(); - - @Test - public void testPutExtensibleStringValue() { - ExtensibleString result = client.putExtensibleStringValue(ExtensibleString.CLASS); - Assertions.assertEquals(ExtensibleString.CLASS, result); - } -} diff --git a/typespec-tests/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java b/typespec-tests/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java index 04ff1266c8..20be242ec4 100644 --- a/typespec-tests/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java +++ b/typespec-tests/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java @@ -13,7 +13,6 @@ import com.azure.core.test.TestMode; import com.azure.core.test.TestProxyTestBase; import com.azure.core.util.Configuration; -import specialwords.ExtensibleStringsClient; import specialwords.ModelPropertiesClient; import specialwords.ModelsClient; import specialwords.OperationsClient; @@ -25,8 +24,6 @@ class SpecialWordsClientTestBase extends TestProxyTestBase { protected ModelPropertiesClient modelPropertiesClient; - protected ExtensibleStringsClient extensibleStringsClient; - protected OperationsClient operationsClient; protected ParametersClient parametersClient; @@ -51,15 +48,6 @@ protected void beforeTest() { } modelPropertiesClient = modelPropertiesClientbuilder.buildModelPropertiesClient(); - SpecialWordsClientBuilder extensibleStringsClientbuilder = new SpecialWordsClientBuilder() - .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - extensibleStringsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - extensibleStringsClient = extensibleStringsClientbuilder.buildExtensibleStringsClient(); - SpecialWordsClientBuilder operationsClientbuilder = new SpecialWordsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) diff --git a/typespec-tests/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java b/typespec-tests/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java deleted file mode 100644 index 2be886de28..0000000000 --- a/typespec-tests/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package tsptest.armstreamstyleserialization; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; -import tsptest.armstreamstyleserialization.implementation.models.ListResult; -import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; -import tsptest.armstreamstyleserialization.models.ListResult2; - -public class PagedModelPackageTests { - - @Test - public void testPagedModelPackage() { - Assertions.assertTrue(isInImplementationModels(ListResult.class)); - Assertions.assertTrue(isInImplementationModels(ListResultSummary.class)); - - // ListResult2 not in implementation, because its child ListResultSummary2(Inner) is PUBLIC - Assertions.assertFalse(isInImplementationModels(ListResult2.class)); - Assertions.assertFalse(isInImplementationModels(ListResultSummary2Inner.class)); - } - - private static boolean isInImplementationModels(Class clazz) { - return clazz.getPackage().getName().endsWith(".implementation.models"); - } -} diff --git a/typespec-tests/tsp/arm-stream-style-serialization.tsp b/typespec-tests/tsp/arm-stream-style-serialization.tsp index a240bd8ee1..d26c8cf9f3 100644 --- a/typespec-tests/tsp/arm-stream-style-serialization.tsp +++ b/typespec-tests/tsp/arm-stream-style-serialization.tsp @@ -253,7 +253,6 @@ interface Functions { interface Priorities { @post setPriority(@query priority: Priority): { - @header("Content-Type") contentType: "application/json"; @body body: Priority; }; } @@ -264,25 +263,6 @@ interface Items { @get @list list(): ListResult & ArmLroLocationHeader; - - @get - @list - @route("summary") - summary(): ListResultSummary; - - @get - @list - @route("list2") - list2(): ListResult2; - - @get - @route("summary2") - summary2(): ListResultSummary2; -} - -// model does not contain `@pageItems` property, but inherit them from parent -model ListResultSummary extends ListResult { - summary?: string; } model ListResult { @@ -293,19 +273,6 @@ model ListResult { nextLink?: string; } -// This paged model need to be public (instead of in "implementation" package), as its child ListResultSummary2 is public -model ListResult2 { - @pageItems - items: Result[]; - - @nextLink - nextLink?: string; -} - -model ListResultSummary2 extends ListResult2 { - summary?: string; -} - model Result { name: string; diff --git a/typespec-tests/tsp/discriminator-edge-cases.tsp b/typespec-tests/tsp/discriminator-edge-cases.tsp index b3cfb94ed8..bb8982abd9 100644 --- a/typespec-tests/tsp/discriminator-edge-cases.tsp +++ b/typespec-tests/tsp/discriminator-edge-cases.tsp @@ -32,6 +32,13 @@ model GrandChildWithAnotherDiscriminator extends ChildWithAnotherDiscriminator { differentDiscriminator: "anotherValue"; } +/** Model with @discriminator but no known subtypes. */ +@discriminator("kind") +model ModelWithDiscriminatorNoSubtypes { + kind: string; + name: string; +} + @client({ service: TspTest.DiscriminatorEdgeCases, name: "DiscriminatorEdgeCasesClient", @@ -49,4 +56,10 @@ interface DiscriminatorEdgeCasesOp { getChildNewDiscrim(): { @body body: ChildWithAnotherDiscriminator; }; + + @get + @route("/nosubtypes") + getNoSubtypes(): { + @body body: ModelWithDiscriminatorNoSubtypes; + }; } diff --git a/typespec-tests/tsp/enum.tsp b/typespec-tests/tsp/enum.tsp index 8545bfbc2b..989388c862 100644 --- a/typespec-tests/tsp/enum.tsp +++ b/typespec-tests/tsp/enum.tsp @@ -202,12 +202,4 @@ interface EnumOp { @header colorArrayOpt?: ColorModel[], ): void; - - // The request and response should be `@header contentType: "application/json", @body body: ColorModel` - // The test here is to make sure the generated code still compile pass, even if it is not the expected operation definition. - @post - @route("operation/wrong-body") - getWrongBody(@body body: ColorModelBase): { - @body body: ColorModelBase; - }; } From dd23ab662c82c145d480f4bdf5a716a2f01d0f0d Mon Sep 17 00:00:00 2001 From: "Xiaofei Cao (from Dev Box)" Date: Thu, 19 Mar 2026 11:38:38 +0800 Subject: [PATCH 3/7] sync core --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index f1931a7b29..c970fe81eb 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f1931a7b2978edc39bd58a0ca3fdf4fdb834eb7a +Subproject commit c970fe81eb27cc4a7a8e60440e43863c41daaa78 From 6ff2e2d9d91e9f9a0fb751af6f5b1c47d9cfc1a4 Mon Sep 17 00:00:00 2001 From: "Xiaofei Cao (from Dev Box)" Date: Thu, 19 Mar 2026 11:42:08 +0800 Subject: [PATCH 4/7] sync tests --- .../defaultclient/HeaderParamAsyncClient.java | 6 +- .../defaultclient/HeaderParamClient.java | 6 +- .../HeaderParamClientBuilder.java | 6 +- .../defaultclient/MixedParamsAsyncClient.java | 6 +- .../defaultclient/MixedParamsClient.java | 6 +- .../MixedParamsClientBuilder.java | 6 +- .../MultipleParamsAsyncClient.java | 6 +- .../defaultclient/MultipleParamsClient.java | 6 +- .../MultipleParamsClientBuilder.java | 6 +- .../defaultclient/ParamAliasAsyncClient.java | 4 +- .../defaultclient/ParamAliasClient.java | 4 +- .../ParamAliasClientBuilder.java | 6 +- .../defaultclient/PathParamAsyncClient.java | 6 +- .../defaultclient/PathParamClient.java | 6 +- .../defaultclient/PathParamClientBuilder.java | 6 +- .../defaultclient/QueryParamAsyncClient.java | 6 +- .../defaultclient/QueryParamClient.java | 6 +- .../QueryParamClientBuilder.java | 6 +- .../implementation/HeaderParamClientImpl.java | 2 +- .../implementation/MixedParamsClientImpl.java | 2 +- .../MultipleParamsClientImpl.java | 2 +- .../implementation/ParamAliasClientImpl.java | 2 +- .../implementation/PathParamClientImpl.java | 2 +- .../implementation/QueryParamClientImpl.java | 2 +- .../implementation/package-info.java | 2 +- .../defaultclient/models/BlobProperties.java | 2 +- .../defaultclient/models/Input.java | 2 +- .../defaultclient/models/WithBodyRequest.java | 2 +- .../defaultclient/models/package-info.java | 2 +- .../defaultclient/package-info.java | 2 +- ...dividuallyNestedWithHeaderAsyncClient.java | 4 +- .../IndividuallyNestedWithHeaderClient.java | 4 +- ...viduallyNestedWithHeaderClientBuilder.java | 8 +- ...ndividuallyNestedWithMixedAsyncClient.java | 4 +- .../IndividuallyNestedWithMixedClient.java | 4 +- ...ividuallyNestedWithMixedClientBuilder.java | 8 +- ...viduallyNestedWithMultipleAsyncClient.java | 4 +- .../IndividuallyNestedWithMultipleClient.java | 4 +- ...duallyNestedWithMultipleClientBuilder.java | 8 +- ...duallyNestedWithParamAliasAsyncClient.java | 4 +- ...ndividuallyNestedWithParamAliasClient.java | 4 +- ...allyNestedWithParamAliasClientBuilder.java | 8 +- ...IndividuallyNestedWithPathAsyncClient.java | 6 +- .../IndividuallyNestedWithPathClient.java | 6 +- ...dividuallyNestedWithPathClientBuilder.java | 8 +- ...ndividuallyNestedWithQueryAsyncClient.java | 6 +- .../IndividuallyNestedWithQueryClient.java | 6 +- ...ividuallyNestedWithQueryClientBuilder.java | 8 +- ...ndividuallyNestedWithHeaderClientImpl.java | 2 +- ...IndividuallyNestedWithMixedClientImpl.java | 2 +- ...ividuallyNestedWithMultipleClientImpl.java | 2 +- ...iduallyNestedWithParamAliasClientImpl.java | 2 +- .../IndividuallyNestedWithPathClientImpl.java | 2 +- ...IndividuallyNestedWithQueryClientImpl.java | 2 +- .../implementation/package-info.java | 2 +- .../models/BlobProperties.java | 2 +- .../models/package-info.java | 2 +- .../individuallyclient/package-info.java | 2 +- .../IndividuallyParentAsyncClient.java | 4 +- .../IndividuallyParentClient.java | 4 +- .../IndividuallyParentClientBuilder.java | 6 +- ...allyParentNestedWithHeaderAsyncClient.java | 4 +- ...ividuallyParentNestedWithHeaderClient.java | 4 +- ...lyParentNestedWithHeaderClientBuilder.java | 6 +- ...uallyParentNestedWithMixedAsyncClient.java | 4 +- ...dividuallyParentNestedWithMixedClient.java | 4 +- ...llyParentNestedWithMixedClientBuilder.java | 6 +- ...lyParentNestedWithMultipleAsyncClient.java | 4 +- ...iduallyParentNestedWithMultipleClient.java | 4 +- ...ParentNestedWithMultipleClientBuilder.java | 6 +- ...ParentNestedWithParamAliasAsyncClient.java | 4 +- ...uallyParentNestedWithParamAliasClient.java | 4 +- ...rentNestedWithParamAliasClientBuilder.java | 6 +- ...duallyParentNestedWithPathAsyncClient.java | 6 +- ...ndividuallyParentNestedWithPathClient.java | 6 +- ...allyParentNestedWithPathClientBuilder.java | 6 +- ...uallyParentNestedWithQueryAsyncClient.java | 6 +- ...dividuallyParentNestedWithQueryClient.java | 6 +- ...llyParentNestedWithQueryClientBuilder.java | 6 +- .../IndividuallyParentClientImpl.java | 2 +- ...uallyParentNestedWithHeaderClientImpl.java | 2 +- ...duallyParentNestedWithMixedClientImpl.java | 2 +- ...llyParentNestedWithMultipleClientImpl.java | 2 +- ...yParentNestedWithParamAliasClientImpl.java | 2 +- ...iduallyParentNestedWithPathClientImpl.java | 2 +- ...duallyParentNestedWithQueryClientImpl.java | 2 +- .../implementation/package-info.java | 2 +- .../models/BlobProperties.java | 2 +- .../models/package-info.java | 2 +- .../package-info.java | 2 +- .../FlattenPropertyAsyncClient.java | 135 +++++ .../FlattenPropertyClient.java | 128 +++++ .../FlattenPropertyClientImpl.java | 220 ++++++++ .../models/FlattenUnknownModel.java | 123 +++++ .../core/flattenproperty/models/Solution.java | 118 +++++ .../models/SolutionProperties.java | 115 ++++ .../java/azure/core/page/PageAsyncClient.java | 64 +++ .../main/java/azure/core/page/PageClient.java | 53 ++ .../page/implementation/PageClientImpl.java | 264 ++++++++++ .../implementation/ErrorsImpl.java | 8 +- .../implementation/ManagedIdentitiesImpl.java | 8 +- ...ntResourceGroupResourceOperationsImpl.java | 8 +- ...entSubscriptionResourceOperationsImpl.java | 8 +- ...elSubscriptionResource1OperationsImpl.java | 8 +- ...elSubscriptionResource2OperationsImpl.java | 8 +- .../combined/implementation/DisksImpl.java | 8 +- .../implementation/VirtualMachinesImpl.java | 8 +- .../combined/implementation/DisksImpl.java | 8 +- .../implementation/VirtualMachinesImpl.java | 8 +- .../implementation/StorageAccountsImpl.java | 8 +- .../implementation/VirtualMachinesImpl.java | 8 +- .../NonResourceOperationsImpl.java | 8 +- .../CheckNameAvailabilitiesImpl.java | 16 +- .../implementation/OptionalBodiesImpl.java | 32 +- .../ExtensionsResourcesImpl.java | 8 +- .../implementation/LocationResourcesImpl.java | 8 +- .../resources/implementation/NestedsImpl.java | 8 +- .../implementation/SingletonsImpl.java | 16 +- .../implementation/TopLevelsImpl.java | 8 +- .../encode/duration/HeaderAsyncClient.java | 25 +- .../java/encode/duration/HeaderClient.java | 24 +- .../encode/duration/PropertyAsyncClient.java | 8 +- .../java/encode/duration/PropertyClient.java | 8 +- .../encode/duration/QueryAsyncClient.java | 25 +- .../java/encode/duration/QueryClient.java | 24 +- .../duration/implementation/HeadersImpl.java | 88 ++-- .../implementation/PropertiesImpl.java | 16 +- .../duration/implementation/QueriesImpl.java | 81 +-- .../Float64MillisecondsDurationProperty.java | 17 +- ...loatMillisecondsDurationArrayProperty.java | 24 +- .../FloatMillisecondsDurationProperty.java | 17 +- ...illisecondsLargerUnitDurationProperty.java | 17 +- .../Int32MillisecondsDurationProperty.java | 21 +- ...illisecondsLargerUnitDurationProperty.java | 21 +- .../ExtensibleStringsAsyncClient.java | 97 ++++ .../specialwords/ExtensibleStringsClient.java | 93 ++++ .../SpecialWordsClientBuilder.java | 22 + .../models/ExtensibleString.java | 243 +++++++++ .../models/package-info.java | 49 ++ .../implementation/ExtensibleStringsImpl.java | 152 ++++++ .../SpecialWordsClientImpl.java | 15 + .../implementation/VaultsImpl.java | 8 +- .../armlegacy/implementation/SkusImpl.java | 24 +- .../ChildExtensionResourceInterfacesImpl.java | 8 +- .../ChildResourcesInterfacesImpl.java | 8 +- ...MaintenanceWindowStatusOperationsImpl.java | 8 +- .../ModelInterfaceSameNamesImpl.java | 8 +- .../TopLevelArmResourceInterfacesImpl.java | 8 +- .../fluent/ItemsClient.java | 68 +++ .../models/ListResultSummary2Inner.java | 132 +++++ .../implementation/FishesImpl.java | 24 +- .../implementation/ItemsClientImpl.java | 494 ++++++++++++++++++ .../implementation/ItemsImpl.java | 35 ++ .../ListResultSummary2Impl.java | 48 ++ .../implementation/PrioritiesClientImpl.java | 4 +- .../implementation/models/ListResult.java | 26 +- .../models/ListResultSummary.java | 131 +++++ .../models/Items.java | 61 +++ .../models/ListResult2.java | 133 +++++ .../models/ListResultSummary2.java | 41 ++ .../TopLevelArmResourcesImpl.java | 16 +- .../enumservice/EnumServiceAsyncClient.java | 53 ++ .../enumservice/EnumServiceClient.java | 52 ++ .../implementation/EnumServiceClientImpl.java | 88 ++++ ...ntinitialization-defaultclient.properties} | 0 ...tialization-individuallyclient.properties} | 0 ...ation-individuallyparentclient.properties} | 0 .../defaultclient/DefaultClientTests.java | 68 +++ .../generated/HeaderParamClientTestBase.java | 26 +- .../IndividuallyClientTests.java | 74 +++ ...ividuallyNestedWithPathClientTestBase.java | 26 +- .../IndividuallyParentClientTests.java | 76 +++ ...llyParentNestedWithPathClientTestBase.java | 30 +- .../MethodSubscriptionIdTest.java | 21 + .../nonresource/NonResourceTests.java | 11 + .../encode/duration/EncodeDurationTests.java | 77 +++ .../ExtensibleStringsClientTest.java | 19 + .../generated/SpecialWordsClientTestBase.java | 12 + .../PagedModelPackageTests.java | 28 + .../tsp/arm-stream-style-serialization.tsp | 33 ++ typespec-tests/tsp/enum.tsp | 8 + 181 files changed, 4234 insertions(+), 640 deletions(-) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java (94%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java (94%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java (94%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java (80%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java (98%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java (81%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java (82%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java (79%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java (98%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java (80%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java (81%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java (94%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java (94%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java (95%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java (96%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java (98%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java (99%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java (78%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java (97%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java (80%) rename typespec-tests/src/main/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java (81%) create mode 100644 typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java create mode 100644 typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java create mode 100644 typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java create mode 100644 typespec-tests/src/main/java/specialwords/ExtensibleStringsAsyncClient.java create mode 100644 typespec-tests/src/main/java/specialwords/ExtensibleStringsClient.java create mode 100644 typespec-tests/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java create mode 100644 typespec-tests/src/main/java/specialwords/extensiblestrings/models/package-info.java create mode 100644 typespec-tests/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java create mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java create mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java create mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java create mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java create mode 100644 typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java rename typespec-tests/src/main/resources/{_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties => azure-clientgenerator-core-clientinitialization-defaultclient.properties} (100%) rename typespec-tests/src/main/resources/{_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties => azure-clientgenerator-core-clientinitialization-individuallyclient.properties} (100%) rename typespec-tests/src/main/resources/{_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties => azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties} (100%) create mode 100644 typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java rename typespec-tests/src/test/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java (80%) create mode 100644 typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java rename typespec-tests/src/test/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java (80%) create mode 100644 typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java rename typespec-tests/src/test/java/{_specs_ => }/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java (78%) create mode 100644 typespec-tests/src/test/java/specialwords/ExtensibleStringsClientTest.java create mode 100644 typespec-tests/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java index 199262de6a..d8b5cb4bfd 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java similarity index 94% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java index 89f1ea9ee4..15970b4e19 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java index 5f08efc49c..9814ad550b 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.HeaderParamClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class HeaderParamClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java index bd7a724adc..af1808087a 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java similarity index 94% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java index f0ec7dbdac..d67b25cee4 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java index 74619a2b58..fc1da88f18 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MixedParamsClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class MixedParamsClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java index 87e4489609..675066ddd6 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java similarity index 94% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java index 3135bfd196..6957056c7e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java index 6f4fe5840f..81f14de1ff 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.MultipleParamsClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class MultipleParamsClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java index 15dc398995..d7c603cfce 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java index fb4db9e8c8..444287dcb9 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java index e458847dc1..cccfce5755 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/ParamAliasClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.ParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class ParamAliasClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java index a306c54dea..fffdd32a35 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java index cb9a456624..0b44c5793a 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java index 6293f96269..acc4851dbd 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.PathParamClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class PathParamClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java index 5612353885..c80b04f8fc 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java index f37d717bc1..79de18b60a 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java index 88e06209f2..87f5155eaa 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; +import azure.clientgenerator.core.clientinitialization.defaultclient.implementation.QueryParamClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class QueryParamClientBuilder implements HttpTrait PROPERTIES - = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties"); + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-defaultclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java index 77e8bce8fa..9d71938ee8 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java index 271682bc70..cc215cba91 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java index 5481937e75..5adf51cb5e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java index 4ac7c32b57..ac9e42b8f1 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/ParamAliasClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java index 3da147ba50..1498d32b3b 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java index 98e28569e3..87fd2cb592 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java similarity index 80% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java index 95c5a22793..146f7a467e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.implementation; +package azure.clientgenerator.core.clientinitialization.defaultclient.implementation; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java similarity index 98% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java index d89c3c1bb2..4c721e41d6 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/BlobProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models; +package azure.clientgenerator.core.clientinitialization.defaultclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java index 850a0a709a..3ce2d74c95 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/Input.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models; +package azure.clientgenerator.core.clientinitialization.defaultclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java index f90a86e77a..f884b7ea4e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/WithBodyRequest.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models; +package azure.clientgenerator.core.clientinitialization.defaultclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java similarity index 81% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java index 029a6aa22c..1135d1c1bc 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/models/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.models; +package azure.clientgenerator.core.clientinitialization.defaultclient.models; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java similarity index 82% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java index 59ca2121be..e65528b6e7 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient; +package azure.clientgenerator.core.clientinitialization.defaultclient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java index db261f11fb..2779ce6195 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java index 1c3b865584..4ba0a122bb 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java index 409a296c73..e4e1a569c5 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithHeaderClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -52,8 +52,8 @@ public final class IndividuallyNestedWithHeaderClientBuilder implements private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java index 53c3cee677..b7da75aac0 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java index ef09cdbfc1..653331dd8e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java index 33cef9e20a..9d3eb0b41f 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMixedClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -52,8 +52,8 @@ public final class IndividuallyNestedWithMixedClientBuilder implements private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java index 2a6bc41f29..1bd3bee141 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java index 87001b2643..f41ef644dd 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java index 903427389f..6fa0ff162e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithMultipleClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -53,8 +53,8 @@ public final class IndividuallyNestedWithMultipleClientBuilder private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java index 3af980f242..8b571536b3 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java index 2ca0e3612a..5b1c79b4cf 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java index f79386da36..08bbf80e0c 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithParamAliasClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -55,8 +55,8 @@ public final class IndividuallyNestedWithParamAliasClientBuilder private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java index de5fabcb75..2395fb1d54 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java index 164c42056a..1a628e3512 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java index 717cfd3c82..a6e6ecf693 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithPathClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -52,8 +52,8 @@ public final class IndividuallyNestedWithPathClientBuilder implements private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java index 411ab4f040..4687e43da9 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java index f70932d97c..386620bb3f 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java index d6fb4e21a3..b9bf96e40a 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyclient.implementation.IndividuallyNestedWithQueryClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -52,8 +52,8 @@ public final class IndividuallyNestedWithQueryClientBuilder implements private static final String SDK_VERSION = "version"; @Generated - private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); + private static final Map PROPERTIES + = CoreUtils.getProperties("azure-clientgenerator-core-clientinitialization-individuallyclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java index 5e3f94b1cf..a066012e6a 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithHeaderClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java index dfba5ce457..bfd2b9633e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMixedClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java index f310a4e56c..73f3a63e34 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithMultipleClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java index 6d43e49794..b8b596731d 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithParamAliasClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java index c82909a98c..f94075e66e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java index 5704371b6f..64794f5a5c 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java similarity index 79% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java index 5e9e3e0121..eeeb569ccc 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyclient.implementation; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java similarity index 98% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java index 74ff6516b8..110e907c82 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/BlobProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models; +package azure.clientgenerator.core.clientinitialization.individuallyclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java similarity index 80% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java index 34507e7f5a..251083ae64 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/models/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.models; +package azure.clientgenerator.core.clientinitialization.individuallyclient.models; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java similarity index 81% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java index 59b682bced..9a5bb32001 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient; +package azure.clientgenerator.core.clientinitialization.individuallyclient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java similarity index 94% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java index 2d98f37074..fb6bcc5835 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java similarity index 94% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java index d9cc367647..29d74a5138 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java index 05527a9fa9..295021efe0 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -51,7 +51,7 @@ public final class IndividuallyParentClientBuilder implements HttpTrait PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java index a40dc2c42e..903abb7c7b 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java index 9d4b1b5726..67beeb628e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java index 79ca34e701..01c34b1003 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithHeaderClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithHeaderClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithHeaderClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java index 4a58ed6c18..acde1bf254 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java index a3937047c2..5525e0d8ab 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java index 32ea151be2..79ecfc6729 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMixedClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMixedClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithMixedClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java index 56f0f11ec2..ea28f37e70 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java index 0d5ea371b8..bcd04988ad 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java index d20811188c..c2b35f4aec 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithMultipleClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithMultipleClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithMultipleClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java index 94679aa600..09fd5b1b47 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasAsyncClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java index d4e8214339..fc8456077d 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClient.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java index 4a6bd194a0..ed2cd85cb0 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithParamAliasClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithParamAliasClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithParamAliasClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java index fcdab9bed8..87addaf2ba 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java index 3d91bcd3a7..7fb9a31426 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java index 0619b12c4e..e151bacc10 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithPathClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithPathClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java index e3cae797d8..d08a228542 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java similarity index 95% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java index 5069a7cd00..c61919c1f1 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java @@ -2,10 +2,10 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java similarity index 96% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java index 2534362896..264cc7722e 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClientBuilder.java @@ -2,9 +2,9 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation.IndividuallyParentNestedWithQueryClientImpl; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -56,7 +56,7 @@ public final class IndividuallyParentNestedWithQueryClientBuilder @Generated private static final Map PROPERTIES = CoreUtils - .getProperties("_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); + .getProperties("azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties"); @Generated private final List pipelinePolicies; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java similarity index 98% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java index e5ac51fd7f..9fc555c894 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java index c974907925..ce080a8c39 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithHeaderClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java index efb36a71a1..89a2c072df 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMixedClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java index 3127e122df..576ef3cbc0 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithMultipleClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java index c45bcc7fe6..e17cf89873 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithParamAliasClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java index bcf99fe609..15231ef67c 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java similarity index 99% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java index c66818ef39..402c7697d7 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java similarity index 78% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java index 38e4e189db..33101bf578 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.implementation; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java similarity index 97% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java index 9896d015b2..a63457c798 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/BlobProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; import com.azure.core.annotation.Generated; import com.azure.core.annotation.Immutable; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java similarity index 80% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java index 0cfc765fd3..2c1566b44f 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/models/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.models; diff --git a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java similarity index 81% rename from typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java rename to typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java index d7088f0d78..1009faef5b 100644 --- a/typespec-tests/src/main/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/package-info.java @@ -8,4 +8,4 @@ * Test for client initialization decorator - moving parameters from method to client level. * */ -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java index e4dd5e633d..7170464917 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java @@ -6,7 +6,9 @@ import azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl; import azure.clientgenerator.core.flattenproperty.models.FlattenModel; +import azure.clientgenerator.core.flattenproperty.models.FlattenUnknownModel; import azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel; +import azure.clientgenerator.core.flattenproperty.models.Solution; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; @@ -136,6 +138,94 @@ public Mono> putNestedFlattenModelWithResponse(BinaryData i return this.serviceClient.putNestedFlattenModelWithResponseAsync(input, requestOptions); } + /** + * The putFlattenUnknownModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + * @param input The input parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful + * completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putFlattenUnknownModelWithResponse(BinaryData input, + RequestOptions requestOptions) { + return this.serviceClient.putFlattenUnknownModelWithResponseAsync(input, requestOptions); + } + + /** + * The putFlattenReadOnlyModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with flattened properties that are all read-only along with {@link Response} on + * successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putFlattenReadOnlyModelWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.putFlattenReadOnlyModelWithResponseAsync(body, requestOptions); + } + /** * The putFlattenModel operation. * @@ -177,4 +267,49 @@ public Mono putNestedFlattenModel(NestedFlattenModel input) return putNestedFlattenModelWithResponse(BinaryData.fromObject(input), requestOptions).flatMap(FluxUtil::toMono) .map(protocolMethodData -> protocolMethodData.toObject(NestedFlattenModel.class)); } + + /** + * The putFlattenUnknownModel operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return this is the model with unknown type properties to be flattened on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono putFlattenUnknownModel(FlattenUnknownModel input) { + // Generated convenience method for putFlattenUnknownModelWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putFlattenUnknownModelWithResponse(BinaryData.fromObject(input), requestOptions) + .flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(FlattenUnknownModel.class)); + } + + /** + * The putFlattenReadOnlyModel operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return this is the model with flattened properties that are all read-only on successful completion of + * {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono putFlattenReadOnlyModel(Solution body) { + // Generated convenience method for putFlattenReadOnlyModelWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putFlattenReadOnlyModelWithResponse(BinaryData.fromObject(body), requestOptions) + .flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toObject(Solution.class)); + } } diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java index 6df185bf86..9188f468a6 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java @@ -6,7 +6,9 @@ import azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl; import azure.clientgenerator.core.flattenproperty.models.FlattenModel; +import azure.clientgenerator.core.flattenproperty.models.FlattenUnknownModel; import azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel; +import azure.clientgenerator.core.flattenproperty.models.Solution; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; @@ -131,6 +133,90 @@ public Response putNestedFlattenModelWithResponse(BinaryData input, return this.serviceClient.putNestedFlattenModelWithResponse(input, requestOptions); } + /** + * The putFlattenUnknownModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + * @param input The input parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with unknown type properties to be flattened along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putFlattenUnknownModelWithResponse(BinaryData input, RequestOptions requestOptions) { + return this.serviceClient.putFlattenUnknownModelWithResponse(input, requestOptions); + } + + /** + * The putFlattenReadOnlyModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with flattened properties that are all read-only along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putFlattenReadOnlyModelWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.putFlattenReadOnlyModelWithResponse(body, requestOptions); + } + /** * The putFlattenModel operation. * @@ -172,4 +258,46 @@ public NestedFlattenModel putNestedFlattenModel(NestedFlattenModel input) { return putNestedFlattenModelWithResponse(BinaryData.fromObject(input), requestOptions).getValue() .toObject(NestedFlattenModel.class); } + + /** + * The putFlattenUnknownModel operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return this is the model with unknown type properties to be flattened. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public FlattenUnknownModel putFlattenUnknownModel(FlattenUnknownModel input) { + // Generated convenience method for putFlattenUnknownModelWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putFlattenUnknownModelWithResponse(BinaryData.fromObject(input), requestOptions).getValue() + .toObject(FlattenUnknownModel.class); + } + + /** + * The putFlattenReadOnlyModel operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return this is the model with flattened properties that are all read-only. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Solution putFlattenReadOnlyModel(Solution body) { + // Generated convenience method for putFlattenReadOnlyModelWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putFlattenReadOnlyModelWithResponse(BinaryData.fromObject(body), requestOptions).getValue() + .toObject(Solution.class); + } } diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java index b15d7fb3eb..c204dea4b6 100644 --- a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java @@ -164,6 +164,46 @@ Mono> putNestedFlattenModel(@HostParam("endpoint") String e Response putNestedFlattenModelSync(@HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); + + @Put("/azure/client-generator-core/flatten-property/flattenUnknownModel") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> putFlattenUnknownModel(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); + + @Put("/azure/client-generator-core/flatten-property/flattenUnknownModel") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response putFlattenUnknownModelSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context); + + @Put("/azure/client-generator-core/flatten-property/flattenReadOnlyModel") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> putFlattenReadOnlyModel(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Put("/azure/client-generator-core/flatten-property/flattenReadOnlyModel") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response putFlattenReadOnlyModelSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } /** @@ -365,4 +405,184 @@ public Response putNestedFlattenModelWithResponse(BinaryData input, return service.putNestedFlattenModelSync(this.getEndpoint(), contentType, accept, input, requestOptions, Context.NONE); } + + /** + * The putFlattenUnknownModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + * @param input The input parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful + * completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putFlattenUnknownModelWithResponseAsync(BinaryData input, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.putFlattenUnknownModel(this.getEndpoint(), contentType, accept, + input, requestOptions, context)); + } + + /** + * The putFlattenUnknownModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties: BinaryData (Optional)
+     * }
+     * }
+     *
+ * + * @param input The input parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with unknown type properties to be flattened along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putFlattenUnknownModelWithResponse(BinaryData input, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.putFlattenUnknownModelSync(this.getEndpoint(), contentType, accept, input, requestOptions, + Context.NONE); + } + + /** + * The putFlattenReadOnlyModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with flattened properties that are all read-only along with {@link Response} on + * successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putFlattenReadOnlyModelWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.putFlattenReadOnlyModel(this.getEndpoint(), contentType, accept, + body, requestOptions, context)); + } + + /** + * The putFlattenReadOnlyModel operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     properties (Optional): {
+     *         solutionId: String (Optional)
+     *         title: String (Optional)
+     *         content: String (Optional)
+     *     }
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return this is the model with flattened properties that are all read-only along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putFlattenReadOnlyModelWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.putFlattenReadOnlyModelSync(this.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } } diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java new file mode 100644 index 0000000000..66bd1f48f4 --- /dev/null +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/FlattenUnknownModel.java @@ -0,0 +1,123 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.flattenproperty.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.core.util.BinaryData; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * This is the model with unknown type properties to be flattened. + */ +@Fluent +public final class FlattenUnknownModel implements JsonSerializable { + /* + * The name property. + */ + @Generated + private final String name; + + /* + * The properties property. + */ + @Generated + private BinaryData properties; + + /** + * Creates an instance of FlattenUnknownModel class. + * + * @param name the name value to set. + */ + @Generated + public FlattenUnknownModel(String name) { + this.name = name; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * Get the properties property: The properties property. + * + * @return the properties value. + */ + @Generated + public BinaryData getProperties() { + return this.properties; + } + + /** + * Set the properties property: The properties property. + * + * @param properties the properties value to set. + * @return the FlattenUnknownModel object itself. + */ + @Generated + public FlattenUnknownModel setProperties(BinaryData properties) { + this.properties = properties; + return this; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("name", this.name); + if (this.properties != null) { + jsonWriter.writeFieldName("properties"); + this.properties.writeTo(jsonWriter); + } + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of FlattenUnknownModel from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of FlattenUnknownModel if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the FlattenUnknownModel. + */ + @Generated + public static FlattenUnknownModel fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String name = null; + BinaryData properties = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("name".equals(fieldName)) { + name = reader.getString(); + } else if ("properties".equals(fieldName)) { + properties + = reader.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())); + } else { + reader.skipChildren(); + } + } + FlattenUnknownModel deserializedFlattenUnknownModel = new FlattenUnknownModel(name); + deserializedFlattenUnknownModel.properties = properties; + + return deserializedFlattenUnknownModel; + }); + } +} diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java new file mode 100644 index 0000000000..5eda5a1882 --- /dev/null +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/Solution.java @@ -0,0 +1,118 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.flattenproperty.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.annotation.Generated; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * This is the model with flattened properties that are all read-only. + */ +@Fluent +public final class Solution implements JsonSerializable { + /* + * The name property. + */ + @Generated + private final String name; + + /* + * The properties property. + */ + @Generated + private SolutionProperties properties; + + /** + * Creates an instance of Solution class. + * + * @param name the name value to set. + */ + @Generated + public Solution(String name) { + this.name = name; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Generated + public String getName() { + return this.name; + } + + /** + * Get the properties property: The properties property. + * + * @return the properties value. + */ + @Generated + public SolutionProperties getProperties() { + return this.properties; + } + + /** + * Set the properties property: The properties property. + * + * @param properties the properties value to set. + * @return the Solution object itself. + */ + @Generated + public Solution setProperties(SolutionProperties properties) { + this.properties = properties; + return this; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("name", this.name); + jsonWriter.writeJsonField("properties", this.properties); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of Solution from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of Solution if the JsonReader was pointing to an instance of it, or null if it was pointing + * to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the Solution. + */ + @Generated + public static Solution fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String name = null; + SolutionProperties properties = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("name".equals(fieldName)) { + name = reader.getString(); + } else if ("properties".equals(fieldName)) { + properties = SolutionProperties.fromJson(reader); + } else { + reader.skipChildren(); + } + } + Solution deserializedSolution = new Solution(name); + deserializedSolution.properties = properties; + + return deserializedSolution; + }); + } +} diff --git a/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java new file mode 100644 index 0000000000..d69aa8bacf --- /dev/null +++ b/typespec-tests/src/main/java/azure/clientgenerator/core/flattenproperty/models/SolutionProperties.java @@ -0,0 +1,115 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.clientgenerator.core.flattenproperty.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; + +/** + * This is the model with all read-only properties to be flattened. + */ +@Immutable +public final class SolutionProperties implements JsonSerializable { + /* + * The solutionId property. + */ + @Generated + private String solutionId; + + /* + * The title property. + */ + @Generated + private String title; + + /* + * The content property. + */ + @Generated + private String content; + + /** + * Creates an instance of SolutionProperties class. + */ + @Generated + public SolutionProperties() { + } + + /** + * Get the solutionId property: The solutionId property. + * + * @return the solutionId value. + */ + @Generated + public String getSolutionId() { + return this.solutionId; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Generated + public String getTitle() { + return this.title; + } + + /** + * Get the content property: The content property. + * + * @return the content value. + */ + @Generated + public String getContent() { + return this.content; + } + + /** + * {@inheritDoc} + */ + @Generated + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of SolutionProperties from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of SolutionProperties if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IOException If an error occurs while reading the SolutionProperties. + */ + @Generated + public static SolutionProperties fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + SolutionProperties deserializedSolutionProperties = new SolutionProperties(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("solutionId".equals(fieldName)) { + deserializedSolutionProperties.solutionId = reader.getString(); + } else if ("title".equals(fieldName)) { + deserializedSolutionProperties.title = reader.getString(); + } else if ("content".equals(fieldName)) { + deserializedSolutionProperties.content = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedSolutionProperties; + }); + } +} diff --git a/typespec-tests/src/main/java/azure/core/page/PageAsyncClient.java b/typespec-tests/src/main/java/azure/core/page/PageAsyncClient.java index ccd87439af..00da9c19a6 100644 --- a/typespec-tests/src/main/java/azure/core/page/PageAsyncClient.java +++ b/typespec-tests/src/main/java/azure/core/page/PageAsyncClient.java @@ -205,6 +205,40 @@ public PagedFlux withParameterizedNextLink(String select, RequestOpt return this.serviceClient.withParameterizedNextLinkAsync(select, requestOptions); } + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items as paginated response with {@link PagedFlux}. + */ + @Generated + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedFlux withRelativeNextLink(RequestOptions requestOptions) { + return this.serviceClient.withRelativeNextLinkAsync(requestOptions); + } + /** * List with Azure.Core.Page<>. * @@ -400,4 +434,34 @@ public PagedFlux withParameterizedNextLink(String select) { pagedResponse.getContinuationToken(), null)); }); } + + /** + * List with relative nextLink URL that requires endpoint resolution. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return paged collection of User items as paginated response with {@link PagedFlux}. + */ + @Generated + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedFlux withRelativeNextLink() { + // Generated convenience method for withRelativeNextLink + RequestOptions requestOptions = new RequestOptions(); + PagedFlux pagedFluxResponse = withRelativeNextLink(requestOptions); + return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> { + Flux> flux = (continuationTokenParam == null) + ? pagedFluxResponse.byPage().take(1) + : pagedFluxResponse.byPage(continuationTokenParam).take(1); + return flux.map(pagedResponse -> new PagedResponseBase(pagedResponse.getRequest(), + pagedResponse.getStatusCode(), pagedResponse.getHeaders(), + pagedResponse.getValue() + .stream() + .map(protocolMethodData -> protocolMethodData.toObject(User.class)) + .collect(Collectors.toList()), + pagedResponse.getContinuationToken(), null)); + }); + } } diff --git a/typespec-tests/src/main/java/azure/core/page/PageClient.java b/typespec-tests/src/main/java/azure/core/page/PageClient.java index d92d2dc455..788f6272b2 100644 --- a/typespec-tests/src/main/java/azure/core/page/PageClient.java +++ b/typespec-tests/src/main/java/azure/core/page/PageClient.java @@ -201,6 +201,40 @@ public PagedIterable withParameterizedNextLink(String select, Reques return this.serviceClient.withParameterizedNextLink(select, requestOptions); } + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items as paginated response with {@link PagedIterable}. + */ + @Generated + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable withRelativeNextLink(RequestOptions requestOptions) { + return this.serviceClient.withRelativeNextLink(requestOptions); + } + /** * List with Azure.Core.Page<>. * @@ -329,4 +363,23 @@ public PagedIterable withParameterizedNextLink(String select) { return serviceClient.withParameterizedNextLink(select, requestOptions) .mapPage(bodyItemValue -> bodyItemValue.toObject(User.class)); } + + /** + * List with relative nextLink URL that requires endpoint resolution. + * + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return paged collection of User items as paginated response with {@link PagedIterable}. + */ + @Generated + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable withRelativeNextLink() { + // Generated convenience method for withRelativeNextLink + RequestOptions requestOptions = new RequestOptions(); + return serviceClient.withRelativeNextLink(requestOptions) + .mapPage(bodyItemValue -> bodyItemValue.toObject(User.class)); + } } diff --git a/typespec-tests/src/main/java/azure/core/page/implementation/PageClientImpl.java b/typespec-tests/src/main/java/azure/core/page/implementation/PageClientImpl.java index c870206103..acf4498146 100644 --- a/typespec-tests/src/main/java/azure/core/page/implementation/PageClientImpl.java +++ b/typespec-tests/src/main/java/azure/core/page/implementation/PageClientImpl.java @@ -249,6 +249,24 @@ Response withParameterizedNextLinkSync(@HostParam("endpoint") String @QueryParam("select") String select, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + @Get("/azure/core/page/with-relative-next-link") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withRelativeNextLink(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/azure/core/page/with-relative-next-link") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withRelativeNextLinkSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + @Get("{nextLink}") @ExpectedResponses({ 200 }) @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) @@ -328,6 +346,26 @@ Mono> withParameterizedNextLinkNext( Response withParameterizedNextLinkNextSync( @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> withRelativeNextLinkNext( + @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response withRelativeNextLinkNextSync( + @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); } /** @@ -1055,6 +1093,154 @@ public PagedIterable withParameterizedNextLink(String select, Reques nextLink -> withParameterizedNextLinkNextSinglePage(nextLink, requestOptionsForNextPage)); } + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> withRelativeNextLinkSinglePageAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.withRelativeNextLink(this.getEndpoint(), accept, requestOptions, context)) + .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null)); + } + + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items as paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedFlux withRelativeNextLinkAsync(RequestOptions requestOptions) { + RequestOptions requestOptionsForNextPage = new RequestOptions(); + requestOptionsForNextPage.setContext( + requestOptions != null && requestOptions.getContext() != null ? requestOptions.getContext() : Context.NONE); + return new PagedFlux<>(() -> withRelativeNextLinkSinglePageAsync(requestOptions), + nextLink -> withRelativeNextLinkNextSinglePageAsync(nextLink, requestOptionsForNextPage)); + } + + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse withRelativeNextLinkSinglePage(RequestOptions requestOptions) { + final String accept = "application/json"; + Response res + = service.withRelativeNextLinkSync(this.getEndpoint(), accept, requestOptions, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null); + } + + /** + * List with relative nextLink URL that requires endpoint resolution. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items as paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable withRelativeNextLink(RequestOptions requestOptions) { + RequestOptions requestOptionsForNextPage = new RequestOptions(); + requestOptionsForNextPage.setContext( + requestOptions != null && requestOptions.getContext() != null ? requestOptions.getContext() : Context.NONE); + return new PagedIterable<>(() -> withRelativeNextLinkSinglePage(requestOptions), + nextLink -> withRelativeNextLinkNextSinglePage(nextLink, requestOptionsForNextPage)); + } + /** * Get the next page of items. *

Response Body Schema

@@ -1368,6 +1554,84 @@ private PagedResponse withParameterizedNextLinkNextSinglePage(String getValues(res.getValue(), "values"), getNextLink(res.getValue(), "nextLink"), null); } + /** + * Get the next page of items. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param nextLink The URL to get the next list of items. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> withRelativeNextLinkNextSinglePageAsync(String nextLink, + RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.withRelativeNextLinkNext(nextLink, this.getEndpoint(), accept, requestOptions, context)) + .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null)); + } + + /** + * Get the next page of items. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     *     orders (Optional): [
+     *          (Optional){
+     *             id: int (Required)
+     *             userId: int (Required)
+     *             detail: String (Required)
+     *         }
+     *     ]
+     *     etag: String (Required)
+     * }
+     * }
+     *
+ * + * @param nextLink The URL to get the next list of items. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return paged collection of User items along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse withRelativeNextLinkNextSinglePage(String nextLink, + RequestOptions requestOptions) { + final String accept = "application/json"; + Response res + = service.withRelativeNextLinkNextSync(nextLink, this.getEndpoint(), accept, requestOptions, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + getValues(res.getValue(), "value"), getNextLink(res.getValue(), "nextLink"), null); + } + private List getValues(BinaryData binaryData, String path) { try { Map obj = binaryData.toObject(Map.class); diff --git a/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java index 13fa33d72d..13e12a887f 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ErrorsImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String reso String confidentialResourceName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, confidentialResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ConfidentialResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ConfidentialResourceImpl(inner.getValue(), this.manager())); } public ConfidentialResource getByResourceGroup(String resourceGroupName, String confidentialResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java index 9627240bd3..12360ed7a3 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(S String managedIdentityTrackedResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, managedIdentityTrackedResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ManagedIdentityTrackedResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ManagedIdentityTrackedResourceImpl(inner.getValue(), this.manager())); } public ManagedIdentityTrackedResource getByResourceGroup(String resourceGroupName, diff --git a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java index e4c7ef18e1..b66f919f2c 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementResourceGroupResourceOperationsImpl.java @@ -33,12 +33,8 @@ public Response getByResourceGroupWithResponse(String res String resourceGroupResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, resourceGroupResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ResourceGroupResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ResourceGroupResourceImpl(inner.getValue(), this.manager())); } public ResourceGroupResource getByResourceGroup(String resourceGroupName, String resourceGroupResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java index d16d4186af..d513c4050c 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/MixedSubscriptionPlacementSubscriptionResourceOperationsImpl.java @@ -33,12 +33,8 @@ public Response getWithResponse(String subscriptionId, Str Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResourceImpl(inner.getValue(), this.manager())); } public SubscriptionResource get(String subscriptionId, String subscriptionResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java index 86e2607d92..b69219f118 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource1OperationsImpl.java @@ -33,12 +33,8 @@ public Response getWithResponse(String subscriptionId, St Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResource1Name, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResource1Impl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResource1Impl(inner.getValue(), this.manager())); } public SubscriptionResource1 get(String subscriptionId, String subscriptionResource1Name) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java index 5340739290..17da1f964e 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/methodsubscriptionid/implementation/TwoSubscriptionResourcesMethodLevelSubscriptionResource2OperationsImpl.java @@ -33,12 +33,8 @@ public Response getWithResponse(String subscriptionId, St Context context) { Response inner = this.serviceClient().getWithResponse(subscriptionId, subscriptionResource2Name, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SubscriptionResource2Impl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SubscriptionResource2Impl(inner.getValue(), this.manager())); } public SubscriptionResource2 get(String subscriptionId, String subscriptionResource2Name) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java index dc239f5146..9d36143be8 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/DisksImpl.java @@ -29,12 +29,8 @@ public DisksImpl(DisksClient innerClient, public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, diskName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DiskImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new DiskImpl(inner.getValue(), this.manager())); } public Disk getByResourceGroup(String resourceGroupName, String diskName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java index 05f4cd048c..b8993a4d3a 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiservice/combined/implementation/VirtualMachinesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VirtualMachineImpl(inner.getValue(), this.manager())); } public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java index 82dc82cdd5..aa536e533b 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java @@ -29,12 +29,8 @@ public DisksImpl(DisksClient innerClient, public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, diskName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DiskImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new DiskImpl(inner.getValue(), this.manager())); } public Disk getByResourceGroup(String resourceGroupName, String diskName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java index f72d70052e..c9e67bd5e9 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VirtualMachineImpl(inner.getValue(), this.manager())); } public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java index bbf7e7bf70..50fcaab7b7 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/StorageAccountsImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, accountName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new StorageAccountImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new StorageAccountImpl(inner.getValue(), this.manager())); } public StorageAccount getByResourceGroup(String resourceGroupName, String accountName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java index 617de063fc..8210e4243c 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/multiservicesharedmodels/combined/implementation/VirtualMachinesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String resourceGr Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VirtualMachineImpl(inner.getValue(), this.manager())); } public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java index 53db37891f..8908ba7e35 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/nonresource/implementation/NonResourceOperationsImpl.java @@ -28,12 +28,8 @@ public NonResourceOperationsImpl(NonResourceOperationsClient innerClient, public Response getWithResponse(String location, String parameter, Context context) { Response inner = this.serviceClient().getWithResponse(location, parameter, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new NonResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new NonResourceImpl(inner.getValue(), this.manager())); } public NonResource get(String location, String parameter) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java index bba72824e0..51f4026516 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java @@ -31,12 +31,8 @@ public Response checkGlobalWithResponse(CheckName Context context) { Response inner = this.serviceClient().checkGlobalWithResponse(body, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); } public CheckNameAvailabilityResponse checkGlobal(CheckNameAvailabilityRequest body) { @@ -52,12 +48,8 @@ public Response checkLocalWithResponse(String loc CheckNameAvailabilityRequest body, Context context) { Response inner = this.serviceClient().checkLocalWithResponse(location, body, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new CheckNameAvailabilityResponseImpl(inner.getValue(), this.manager())); } public CheckNameAvailabilityResponse checkLocal(String location, CheckNameAvailabilityRequest body) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java index 1395adf37a..42685e107a 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java @@ -36,12 +36,8 @@ public Response getByResourceGroupWithResponse(String resourceGroupName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, widgetName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new WidgetImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new WidgetImpl(inner.getValue(), this.manager())); } public Widget getByResourceGroup(String resourceGroupName, String widgetName) { @@ -57,12 +53,8 @@ public Response patchWithResponse(String resourceGroupName, String widge Context context) { Response inner = this.serviceClient().patchWithResponse(resourceGroupName, widgetName, properties, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new WidgetImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new WidgetImpl(inner.getValue(), this.manager())); } public Widget patch(String resourceGroupName, String widgetName) { @@ -78,12 +70,8 @@ public Response postWithResponse(String resourceGroupName, String Context context) { Response inner = this.serviceClient().postWithResponse(resourceGroupName, widgetName, body, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ActionResultImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ActionResultImpl(inner.getValue(), this.manager())); } public ActionResult post(String resourceGroupName, String widgetName) { @@ -97,12 +85,8 @@ public ActionResult post(String resourceGroupName, String widgetName) { public Response providerPostWithResponse(ChangeAllowanceRequest body, Context context) { Response inner = this.serviceClient().providerPostWithResponse(body, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChangeAllowanceResultImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChangeAllowanceResultImpl(inner.getValue(), this.manager())); } public ChangeAllowanceResult providerPost() { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java index aa268931b3..12271658b5 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/ExtensionsResourcesImpl.java @@ -31,12 +31,8 @@ public Response getWithResponse(String resourceUri, String e Context context) { Response inner = this.serviceClient().getWithResponse(resourceUri, extensionsResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ExtensionsResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ExtensionsResourceImpl(inner.getValue(), this.manager())); } public ExtensionsResource get(String resourceUri, String extensionsResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java index 59faad49dd..812ba6dadc 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/LocationResourcesImpl.java @@ -30,12 +30,8 @@ public LocationResourcesImpl(LocationResourcesClient innerClient, public Response getWithResponse(String location, String locationResourceName, Context context) { Response inner = this.serviceClient().getWithResponse(location, locationResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new LocationResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new LocationResourceImpl(inner.getValue(), this.manager())); } public LocationResource get(String location, String locationResourceName) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java index dd4d8747aa..adb72d20f2 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/NestedsImpl.java @@ -30,12 +30,8 @@ public Response getWithResponse(String resourceGroupName, S String nextedProxyResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new NestedProxyResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new NestedProxyResourceImpl(inner.getValue(), this.manager())); } public NestedProxyResource get(String resourceGroupName, String topLevelTrackedResourceName, diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java index 17d498c93d..44c0808719 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/SingletonsImpl.java @@ -31,12 +31,8 @@ public Response getByResourceGroupWithResponse(String Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); } public SingletonTrackedResource getByResourceGroup(String resourceGroupName) { @@ -71,12 +67,8 @@ public Response updateWithResponse(String resourceGrou SingletonTrackedResourceInner properties, Context context) { Response inner = this.serviceClient().updateWithResponse(resourceGroupName, properties, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SingletonTrackedResourceImpl(inner.getValue(), this.manager())); } public SingletonTrackedResource update(String resourceGroupName, SingletonTrackedResourceInner properties) { diff --git a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java index ef143a2f10..97a4030b78 100644 --- a/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java +++ b/typespec-tests/src/main/java/azure/resourcemanager/resources/implementation/TopLevelsImpl.java @@ -31,12 +31,8 @@ public Response getByResourceGroupWithResponse(String r String topLevelTrackedResourceName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelTrackedResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelTrackedResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelTrackedResourceImpl(inner.getValue(), this.manager())); } public TopLevelTrackedResource getByResourceGroup(String resourceGroupName, String topLevelTrackedResourceName) { diff --git a/typespec-tests/src/main/java/encode/duration/HeaderAsyncClient.java b/typespec-tests/src/main/java/encode/duration/HeaderAsyncClient.java index 6d626edacb..08346f6dc9 100644 --- a/typespec-tests/src/main/java/encode/duration/HeaderAsyncClient.java +++ b/typespec-tests/src/main/java/encode/duration/HeaderAsyncClient.java @@ -187,7 +187,7 @@ public Mono> float64SecondsWithResponse(Duration duration, Reques */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { + public Mono> int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponseAsync(duration, requestOptions); } @@ -204,7 +204,8 @@ public Mono> int32MillisecondsWithResponse(int duration, RequestO */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { + public Mono> int32MillisecondsLargerUnitWithResponse(Duration duration, + RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponseAsync(duration, requestOptions); } @@ -221,7 +222,7 @@ public Mono> int32MillisecondsLargerUnitWithResponse(int duration */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { + public Mono> floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponseAsync(duration, requestOptions); } @@ -238,7 +239,7 @@ public Mono> floatMillisecondsWithResponse(double duration, Reque */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponse(double duration, + public Mono> floatMillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponseAsync(duration, requestOptions); } @@ -256,7 +257,7 @@ public Mono> floatMillisecondsLargerUnitWithResponse(double durat */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { + public Mono> float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponseAsync(duration, requestOptions); } @@ -273,7 +274,7 @@ public Mono> float64MillisecondsWithResponse(double duration, Req */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponse(List duration, + public Mono> int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponseAsync(duration, requestOptions); } @@ -452,7 +453,7 @@ public Mono float64Seconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32Milliseconds(int duration) { + public Mono int32Milliseconds(Duration duration) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -472,7 +473,7 @@ public Mono int32Milliseconds(int duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsLargerUnit(int duration) { + public Mono int32MillisecondsLargerUnit(Duration duration) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsLargerUnitWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -492,7 +493,7 @@ public Mono int32MillisecondsLargerUnit(int duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMilliseconds(double duration) { + public Mono floatMilliseconds(Duration duration) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -512,7 +513,7 @@ public Mono floatMilliseconds(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMillisecondsLargerUnit(double duration) { + public Mono floatMillisecondsLargerUnit(Duration duration) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsLargerUnitWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -532,7 +533,7 @@ public Mono floatMillisecondsLargerUnit(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono float64Milliseconds(double duration) { + public Mono float64Milliseconds(Duration duration) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return float64MillisecondsWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); @@ -552,7 +553,7 @@ public Mono float64Milliseconds(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsArray(List duration) { + public Mono int32MillisecondsArray(List duration) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsArrayWithResponse(duration, requestOptions).flatMap(FluxUtil::toMono); diff --git a/typespec-tests/src/main/java/encode/duration/HeaderClient.java b/typespec-tests/src/main/java/encode/duration/HeaderClient.java index 710d085edc..41941b1c5b 100644 --- a/typespec-tests/src/main/java/encode/duration/HeaderClient.java +++ b/typespec-tests/src/main/java/encode/duration/HeaderClient.java @@ -185,7 +185,7 @@ public Response float64SecondsWithResponse(Duration duration, RequestOptio */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { + public Response int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponse(duration, requestOptions); } @@ -202,7 +202,7 @@ public Response int32MillisecondsWithResponse(int duration, RequestOptions */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { + public Response int32MillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponse(duration, requestOptions); } @@ -219,7 +219,7 @@ public Response int32MillisecondsLargerUnitWithResponse(int duration, Requ */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { + public Response floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponse(duration, requestOptions); } @@ -236,7 +236,7 @@ public Response floatMillisecondsWithResponse(double duration, RequestOpti */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double duration, RequestOptions requestOptions) { + public Response floatMillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponse(duration, requestOptions); } @@ -253,7 +253,7 @@ public Response floatMillisecondsLargerUnitWithResponse(double duration, R */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { + public Response float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponse(duration, requestOptions); } @@ -270,7 +270,7 @@ public Response float64MillisecondsWithResponse(double duration, RequestOp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { + public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponse(duration, requestOptions); } @@ -439,7 +439,7 @@ public void float64Seconds(Duration duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32Milliseconds(int duration) { + public void int32Milliseconds(Duration duration) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsWithResponse(duration, requestOptions).getValue(); @@ -458,7 +458,7 @@ public void int32Milliseconds(int duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsLargerUnit(int duration) { + public void int32MillisecondsLargerUnit(Duration duration) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsLargerUnitWithResponse(duration, requestOptions).getValue(); @@ -477,7 +477,7 @@ public void int32MillisecondsLargerUnit(int duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMilliseconds(double duration) { + public void floatMilliseconds(Duration duration) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsWithResponse(duration, requestOptions).getValue(); @@ -496,7 +496,7 @@ public void floatMilliseconds(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMillisecondsLargerUnit(double duration) { + public void floatMillisecondsLargerUnit(Duration duration) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsLargerUnitWithResponse(duration, requestOptions).getValue(); @@ -515,7 +515,7 @@ public void floatMillisecondsLargerUnit(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void float64Milliseconds(double duration) { + public void float64Milliseconds(Duration duration) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); float64MillisecondsWithResponse(duration, requestOptions).getValue(); @@ -534,7 +534,7 @@ public void float64Milliseconds(double duration) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsArray(List duration) { + public void int32MillisecondsArray(List duration) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsArrayWithResponse(duration, requestOptions).getValue(); diff --git a/typespec-tests/src/main/java/encode/duration/PropertyAsyncClient.java b/typespec-tests/src/main/java/encode/duration/PropertyAsyncClient.java index ddebcb7d99..17f4a7180e 100644 --- a/typespec-tests/src/main/java/encode/duration/PropertyAsyncClient.java +++ b/typespec-tests/src/main/java/encode/duration/PropertyAsyncClient.java @@ -238,7 +238,7 @@ public Mono> float64SecondsWithResponse(BinaryData body, Re * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -248,7 +248,7 @@ public Mono> float64SecondsWithResponse(BinaryData body, Re * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -501,7 +501,7 @@ public Mono> floatSecondsLargerUnitWithResponse(BinaryData * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -511,7 +511,7 @@ public Mono> floatSecondsLargerUnitWithResponse(BinaryData * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
diff --git a/typespec-tests/src/main/java/encode/duration/PropertyClient.java b/typespec-tests/src/main/java/encode/duration/PropertyClient.java index c175283374..39eadae545 100644 --- a/typespec-tests/src/main/java/encode/duration/PropertyClient.java +++ b/typespec-tests/src/main/java/encode/duration/PropertyClient.java @@ -236,7 +236,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -246,7 +246,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -496,7 +496,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -506,7 +506,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
diff --git a/typespec-tests/src/main/java/encode/duration/QueryAsyncClient.java b/typespec-tests/src/main/java/encode/duration/QueryAsyncClient.java index c376be68fe..02b1ee49de 100644 --- a/typespec-tests/src/main/java/encode/duration/QueryAsyncClient.java +++ b/typespec-tests/src/main/java/encode/duration/QueryAsyncClient.java @@ -170,7 +170,7 @@ public Mono> float64SecondsWithResponse(Duration input, RequestOp */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { + public Mono> int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponseAsync(input, requestOptions); } @@ -187,7 +187,7 @@ public Mono> int32MillisecondsWithResponse(int input, RequestOpti */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { + public Mono> int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponseAsync(input, requestOptions); } @@ -204,7 +204,7 @@ public Mono> int32MillisecondsLargerUnitWithResponse(int input, R */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { + public Mono> floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponseAsync(input, requestOptions); } @@ -221,7 +221,7 @@ public Mono> floatMillisecondsWithResponse(double input, RequestO */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { + public Mono> floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponseAsync(input, requestOptions); } @@ -238,7 +238,7 @@ public Mono> floatMillisecondsLargerUnitWithResponse(double input */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { + public Mono> float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponseAsync(input, requestOptions); } @@ -272,7 +272,8 @@ public Mono> int32SecondsArrayWithResponse(List input, */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { + public Mono> int32MillisecondsArrayWithResponse(List input, + RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponseAsync(input, requestOptions); } @@ -430,7 +431,7 @@ public Mono float64Seconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32Milliseconds(int input) { + public Mono int32Milliseconds(Duration input) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -450,7 +451,7 @@ public Mono int32Milliseconds(int input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsLargerUnit(int input) { + public Mono int32MillisecondsLargerUnit(Duration input) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsLargerUnitWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -470,7 +471,7 @@ public Mono int32MillisecondsLargerUnit(int input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMilliseconds(double input) { + public Mono floatMilliseconds(Duration input) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -490,7 +491,7 @@ public Mono floatMilliseconds(double input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono floatMillisecondsLargerUnit(double input) { + public Mono floatMillisecondsLargerUnit(Duration input) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); return floatMillisecondsLargerUnitWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -510,7 +511,7 @@ public Mono floatMillisecondsLargerUnit(double input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono float64Milliseconds(double input) { + public Mono float64Milliseconds(Duration input) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); return float64MillisecondsWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); @@ -550,7 +551,7 @@ public Mono int32SecondsArray(List input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono int32MillisecondsArray(List input) { + public Mono int32MillisecondsArray(List input) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); return int32MillisecondsArrayWithResponse(input, requestOptions).flatMap(FluxUtil::toMono); diff --git a/typespec-tests/src/main/java/encode/duration/QueryClient.java b/typespec-tests/src/main/java/encode/duration/QueryClient.java index 1c68bee8ba..1a2f5812a4 100644 --- a/typespec-tests/src/main/java/encode/duration/QueryClient.java +++ b/typespec-tests/src/main/java/encode/duration/QueryClient.java @@ -168,7 +168,7 @@ public Response float64SecondsWithResponse(Duration input, RequestOptions */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { + public Response int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsWithResponse(input, requestOptions); } @@ -185,7 +185,7 @@ public Response int32MillisecondsWithResponse(int input, RequestOptions re */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { + public Response int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsLargerUnitWithResponse(input, requestOptions); } @@ -202,7 +202,7 @@ public Response int32MillisecondsLargerUnitWithResponse(int input, Request */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { + public Response floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsWithResponse(input, requestOptions); } @@ -219,7 +219,7 @@ public Response floatMillisecondsWithResponse(double input, RequestOptions */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { + public Response floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.floatMillisecondsLargerUnitWithResponse(input, requestOptions); } @@ -236,7 +236,7 @@ public Response floatMillisecondsLargerUnitWithResponse(double input, Requ */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { + public Response float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { return this.serviceClient.float64MillisecondsWithResponse(input, requestOptions); } @@ -270,7 +270,7 @@ public Response int32SecondsArrayWithResponse(List input, Reques */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { + public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { return this.serviceClient.int32MillisecondsArrayWithResponse(input, requestOptions); } @@ -420,7 +420,7 @@ public void float64Seconds(Duration input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32Milliseconds(int input) { + public void int32Milliseconds(Duration input) { // Generated convenience method for int32MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsWithResponse(input, requestOptions).getValue(); @@ -439,7 +439,7 @@ public void int32Milliseconds(int input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsLargerUnit(int input) { + public void int32MillisecondsLargerUnit(Duration input) { // Generated convenience method for int32MillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsLargerUnitWithResponse(input, requestOptions).getValue(); @@ -458,7 +458,7 @@ public void int32MillisecondsLargerUnit(int input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMilliseconds(double input) { + public void floatMilliseconds(Duration input) { // Generated convenience method for floatMillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsWithResponse(input, requestOptions).getValue(); @@ -477,7 +477,7 @@ public void floatMilliseconds(double input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void floatMillisecondsLargerUnit(double input) { + public void floatMillisecondsLargerUnit(Duration input) { // Generated convenience method for floatMillisecondsLargerUnitWithResponse RequestOptions requestOptions = new RequestOptions(); floatMillisecondsLargerUnitWithResponse(input, requestOptions).getValue(); @@ -496,7 +496,7 @@ public void floatMillisecondsLargerUnit(double input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void float64Milliseconds(double input) { + public void float64Milliseconds(Duration input) { // Generated convenience method for float64MillisecondsWithResponse RequestOptions requestOptions = new RequestOptions(); float64MillisecondsWithResponse(input, requestOptions).getValue(); @@ -534,7 +534,7 @@ public void int32SecondsArray(List input) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public void int32MillisecondsArray(List input) { + public void int32MillisecondsArray(List input) { // Generated convenience method for int32MillisecondsArrayWithResponse RequestOptions requestOptions = new RequestOptions(); int32MillisecondsArrayWithResponse(input, requestOptions).getValue(); diff --git a/typespec-tests/src/main/java/encode/duration/implementation/HeadersImpl.java b/typespec-tests/src/main/java/encode/duration/implementation/HeadersImpl.java index 78fc0f39e9..86581183ea 100644 --- a/typespec-tests/src/main/java/encode/duration/implementation/HeadersImpl.java +++ b/typespec-tests/src/main/java/encode/duration/implementation/HeadersImpl.java @@ -26,6 +26,7 @@ import com.azure.core.util.serializer.JacksonAdapter; import java.time.Duration; import java.util.List; +import java.util.stream.Collectors; import reactor.core.publisher.Mono; /** @@ -210,7 +211,7 @@ Response float64SecondsSync(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds") @ExpectedResponses({ 204 }) @@ -219,7 +220,7 @@ Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -228,7 +229,7 @@ Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -237,7 +238,7 @@ Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String e @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsLargerUnitSync(@HostParam("endpoint") String endpoint, - @HeaderParam("duration") int duration, RequestOptions requestOptions, Context context); + @HeaderParam("duration") long duration, RequestOptions requestOptions, Context context); @Get("/encode/duration/header/float-milliseconds") @ExpectedResponses({ 204 }) @@ -606,9 +607,10 @@ public Response float64SecondsWithResponse(Duration duration, RequestOptio * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponseAsync(int duration, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.int32Milliseconds(this.client.getEndpoint(), duration, requestOptions, context)); + public Mono> int32MillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { + long durationConverted = duration.toMillis(); + return FluxUtil.withContext(context -> service.int32Milliseconds(this.client.getEndpoint(), durationConverted, + requestOptions, context)); } /** @@ -623,8 +625,10 @@ public Mono> int32MillisecondsWithResponseAsync(int duration, Req * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int duration, RequestOptions requestOptions) { - return service.int32MillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); + public Response int32MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + long durationConverted = duration.toMillis(); + return service.int32MillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, + Context.NONE); } /** @@ -639,10 +643,11 @@ public Response int32MillisecondsWithResponse(int duration, RequestOptions * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponseAsync(int duration, + public Mono> int32MillisecondsLargerUnitWithResponseAsync(Duration duration, RequestOptions requestOptions) { - return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), duration, - requestOptions, context)); + long durationConverted = duration.toMillis(); + return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), + durationConverted, requestOptions, context)); } /** @@ -657,8 +662,9 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(int dur * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int duration, RequestOptions requestOptions) { - return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), duration, requestOptions, + public Response int32MillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { + long durationConverted = duration.toMillis(); + return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), durationConverted, requestOptions, Context.NONE); } @@ -674,9 +680,10 @@ public Response int32MillisecondsLargerUnitWithResponse(int duration, Requ * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponseAsync(double duration, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.floatMilliseconds(this.client.getEndpoint(), duration, requestOptions, context)); + public Mono> floatMillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return FluxUtil.withContext(context -> service.floatMilliseconds(this.client.getEndpoint(), durationConverted, + requestOptions, context)); } /** @@ -691,8 +698,10 @@ public Mono> floatMillisecondsWithResponseAsync(double duration, * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double duration, RequestOptions requestOptions) { - return service.floatMillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); + public Response floatMillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.floatMillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, + Context.NONE); } /** @@ -707,10 +716,11 @@ public Response floatMillisecondsWithResponse(double duration, RequestOpti * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponseAsync(double duration, + public Mono> floatMillisecondsLargerUnitWithResponseAsync(Duration duration, RequestOptions requestOptions) { - return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), duration, - requestOptions, context)); + double durationConverted = (double) duration.toNanos() / 1000_000L; + return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), + durationConverted, requestOptions, context)); } /** @@ -725,8 +735,9 @@ public Mono> floatMillisecondsLargerUnitWithResponseAsync(double * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double duration, RequestOptions requestOptions) { - return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), duration, requestOptions, + public Response floatMillisecondsLargerUnitWithResponse(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), durationConverted, requestOptions, Context.NONE); } @@ -742,9 +753,10 @@ public Response floatMillisecondsLargerUnitWithResponse(double duration, R * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponseAsync(double duration, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.float64Milliseconds(this.client.getEndpoint(), duration, requestOptions, context)); + public Mono> float64MillisecondsWithResponseAsync(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return FluxUtil.withContext(context -> service.float64Milliseconds(this.client.getEndpoint(), durationConverted, + requestOptions, context)); } /** @@ -759,8 +771,10 @@ public Mono> float64MillisecondsWithResponseAsync(double duration * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double duration, RequestOptions requestOptions) { - return service.float64MillisecondsSync(this.client.getEndpoint(), duration, requestOptions, Context.NONE); + public Response float64MillisecondsWithResponse(Duration duration, RequestOptions requestOptions) { + double durationConverted = (double) duration.toNanos() / 1000_000L; + return service.float64MillisecondsSync(this.client.getEndpoint(), durationConverted, requestOptions, + Context.NONE); } /** @@ -775,10 +789,12 @@ public Response float64MillisecondsWithResponse(double duration, RequestOp * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponseAsync(List duration, + public Mono> int32MillisecondsArrayWithResponseAsync(List duration, RequestOptions requestOptions) { - String durationConverted - = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(duration, CollectionFormat.CSV); + String durationConverted = JacksonAdapter.createDefaultSerializerAdapter() + .serializeIterable( + duration.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), + CollectionFormat.CSV); return FluxUtil.withContext(context -> service.int32MillisecondsArray(this.client.getEndpoint(), durationConverted, requestOptions, context)); } @@ -795,9 +811,11 @@ public Mono> int32MillisecondsArrayWithResponseAsync(List int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { - String durationConverted - = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(duration, CollectionFormat.CSV); + public Response int32MillisecondsArrayWithResponse(List duration, RequestOptions requestOptions) { + String durationConverted = JacksonAdapter.createDefaultSerializerAdapter() + .serializeIterable( + duration.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), + CollectionFormat.CSV); return service.int32MillisecondsArraySync(this.client.getEndpoint(), durationConverted, requestOptions, Context.NONE); } diff --git a/typespec-tests/src/main/java/encode/duration/implementation/PropertiesImpl.java b/typespec-tests/src/main/java/encode/duration/implementation/PropertiesImpl.java index b727b536a7..0733e08920 100644 --- a/typespec-tests/src/main/java/encode/duration/implementation/PropertiesImpl.java +++ b/typespec-tests/src/main/java/encode/duration/implementation/PropertiesImpl.java @@ -725,7 +725,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -735,7 +735,7 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -764,7 +764,7 @@ public Mono> int32MillisecondsWithResponseAsync(BinaryData * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -774,7 +774,7 @@ public Mono> int32MillisecondsWithResponseAsync(BinaryData * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -1280,7 +1280,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -1290,7 +1290,7 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body, * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -1319,7 +1319,7 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(B * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
@@ -1329,7 +1329,7 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(B * 
      * {@code
      * {
-     *     value: int (Required)
+     *     value: long (Required)
      * }
      * }
      *
diff --git a/typespec-tests/src/main/java/encode/duration/implementation/QueriesImpl.java b/typespec-tests/src/main/java/encode/duration/implementation/QueriesImpl.java index 3a46e23b7a..476f3f5bb7 100644 --- a/typespec-tests/src/main/java/encode/duration/implementation/QueriesImpl.java +++ b/typespec-tests/src/main/java/encode/duration/implementation/QueriesImpl.java @@ -192,7 +192,7 @@ Response float64SecondsSync(@HostParam("endpoint") String endpoint, @Query @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryParam("input") int input, + Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @QueryParam("input") long input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds") @@ -201,7 +201,7 @@ Mono> int32Milliseconds(@HostParam("endpoint") String endpoint, @ @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @QueryParam("input") int input, + Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @QueryParam("input") long input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds-larger-unit") @@ -211,7 +211,7 @@ Response int32MillisecondsSync(@HostParam("endpoint") String endpoint, @Qu @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String endpoint, - @QueryParam("input") int input, RequestOptions requestOptions, Context context); + @QueryParam("input") long input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/int32-milliseconds-larger-unit") @ExpectedResponses({ 204 }) @@ -220,7 +220,7 @@ Mono> int32MillisecondsLargerUnit(@HostParam("endpoint") String e @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response int32MillisecondsLargerUnitSync(@HostParam("endpoint") String endpoint, - @QueryParam("input") int input, RequestOptions requestOptions, Context context); + @QueryParam("input") long input, RequestOptions requestOptions, Context context); @Get("/encode/duration/query/float-milliseconds") @ExpectedResponses({ 204 }) @@ -568,9 +568,10 @@ public Response float64SecondsWithResponse(Duration input, RequestOptions * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsWithResponseAsync(int input, RequestOptions requestOptions) { + public Mono> int32MillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { + long inputConverted = input.toMillis(); return FluxUtil.withContext( - context -> service.int32Milliseconds(this.client.getEndpoint(), input, requestOptions, context)); + context -> service.int32Milliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); } /** @@ -585,8 +586,9 @@ public Mono> int32MillisecondsWithResponseAsync(int input, Reques * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsWithResponse(int input, RequestOptions requestOptions) { - return service.int32MillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response int32MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + long inputConverted = input.toMillis(); + return service.int32MillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } /** @@ -601,9 +603,11 @@ public Response int32MillisecondsWithResponse(int input, RequestOptions re * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsLargerUnitWithResponseAsync(int input, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), input, requestOptions, context)); + public Mono> int32MillisecondsLargerUnitWithResponseAsync(Duration input, + RequestOptions requestOptions) { + long inputConverted = input.toMillis(); + return FluxUtil.withContext(context -> service.int32MillisecondsLargerUnit(this.client.getEndpoint(), + inputConverted, requestOptions, context)); } /** @@ -618,8 +622,10 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(int inp * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response int32MillisecondsLargerUnitWithResponse(int input, RequestOptions requestOptions) { - return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response int32MillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { + long inputConverted = input.toMillis(); + return service.int32MillisecondsLargerUnitSync(this.client.getEndpoint(), inputConverted, requestOptions, + Context.NONE); } /** @@ -634,9 +640,10 @@ public Response int32MillisecondsLargerUnitWithResponse(int input, Request * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsWithResponseAsync(double input, RequestOptions requestOptions) { + public Mono> floatMillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; return FluxUtil.withContext( - context -> service.floatMilliseconds(this.client.getEndpoint(), input, requestOptions, context)); + context -> service.floatMilliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); } /** @@ -651,8 +658,9 @@ public Mono> floatMillisecondsWithResponseAsync(double input, Req * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsWithResponse(double input, RequestOptions requestOptions) { - return service.floatMillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response floatMillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.floatMillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } /** @@ -667,10 +675,11 @@ public Response floatMillisecondsWithResponse(double input, RequestOptions * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> floatMillisecondsLargerUnitWithResponseAsync(double input, + public Mono> floatMillisecondsLargerUnitWithResponseAsync(Duration input, RequestOptions requestOptions) { - return FluxUtil.withContext( - context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), input, requestOptions, context)); + double inputConverted = (double) input.toNanos() / 1000_000L; + return FluxUtil.withContext(context -> service.floatMillisecondsLargerUnit(this.client.getEndpoint(), + inputConverted, requestOptions, context)); } /** @@ -685,8 +694,10 @@ public Mono> floatMillisecondsLargerUnitWithResponseAsync(double * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response floatMillisecondsLargerUnitWithResponse(double input, RequestOptions requestOptions) { - return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response floatMillisecondsLargerUnitWithResponse(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.floatMillisecondsLargerUnitSync(this.client.getEndpoint(), inputConverted, requestOptions, + Context.NONE); } /** @@ -701,9 +712,10 @@ public Response floatMillisecondsLargerUnitWithResponse(double input, Requ * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> float64MillisecondsWithResponseAsync(double input, RequestOptions requestOptions) { + public Mono> float64MillisecondsWithResponseAsync(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; return FluxUtil.withContext( - context -> service.float64Milliseconds(this.client.getEndpoint(), input, requestOptions, context)); + context -> service.float64Milliseconds(this.client.getEndpoint(), inputConverted, requestOptions, context)); } /** @@ -718,8 +730,9 @@ public Mono> float64MillisecondsWithResponseAsync(double input, R * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response float64MillisecondsWithResponse(double input, RequestOptions requestOptions) { - return service.float64MillisecondsSync(this.client.getEndpoint(), input, requestOptions, Context.NONE); + public Response float64MillisecondsWithResponse(Duration input, RequestOptions requestOptions) { + double inputConverted = (double) input.toNanos() / 1000_000L; + return service.float64MillisecondsSync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } /** @@ -776,10 +789,12 @@ public Response int32SecondsArrayWithResponse(List input, Reques * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> int32MillisecondsArrayWithResponseAsync(List input, + public Mono> int32MillisecondsArrayWithResponseAsync(List input, RequestOptions requestOptions) { - String inputConverted - = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(input, CollectionFormat.CSV); + String inputConverted = JacksonAdapter.createDefaultSerializerAdapter() + .serializeIterable( + input.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), + CollectionFormat.CSV); return FluxUtil.withContext(context -> service.int32MillisecondsArray(this.client.getEndpoint(), inputConverted, requestOptions, context)); } @@ -796,9 +811,11 @@ public Mono> int32MillisecondsArrayWithResponseAsync(List int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { - String inputConverted - = JacksonAdapter.createDefaultSerializerAdapter().serializeIterable(input, CollectionFormat.CSV); + public Response int32MillisecondsArrayWithResponse(List input, RequestOptions requestOptions) { + String inputConverted = JacksonAdapter.createDefaultSerializerAdapter() + .serializeIterable( + input.stream().map(paramItemValue -> paramItemValue.toMillis()).collect(Collectors.toList()), + CollectionFormat.CSV); return service.int32MillisecondsArraySync(this.client.getEndpoint(), inputConverted, requestOptions, Context.NONE); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java index 5a6aa75879..b72035fa61 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/Float64MillisecondsDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Float64MillisecondsDurationProperty model. @@ -30,8 +31,12 @@ public final class Float64MillisecondsDurationProperty * @param value the value value to set. */ @Generated - public Float64MillisecondsDurationProperty(double value) { - this.value = value; + public Float64MillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -40,8 +45,8 @@ public Float64MillisecondsDurationProperty(double value) { * @return the value value. */ @Generated - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -67,13 +72,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Float64MillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java index aa77fd209a..1341181dfc 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationArrayProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; import java.util.List; /** @@ -31,8 +32,14 @@ public final class FloatMillisecondsDurationArrayProperty * @param value the value value to set. */ @Generated - public FloatMillisecondsDurationArrayProperty(List value) { - this.value = value; + public FloatMillisecondsDurationArrayProperty(List value) { + if (value == null) { + this.value = null; + } else { + this.value = value.stream() + .map(el -> (double) el.toNanos() / 1000_000L) + .collect(java.util.stream.Collectors.toList()); + } } /** @@ -41,8 +48,13 @@ public FloatMillisecondsDurationArrayProperty(List value) { * @return the value value. */ @Generated - public List getValue() { - return this.value; + public List getValue() { + if (this.value == null) { + return null; + } + return this.value.stream() + .map(el -> Duration.ofNanos((long) (el * 1000_000L))) + .collect(java.util.stream.Collectors.toList()); } /** @@ -68,13 +80,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsDurationArrayProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - List value = null; + List value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.readArray(reader1 -> reader1.getDouble()); + value = reader.readArray(reader1 -> Duration.ofNanos((long) (reader1.getDouble() * 1000_000L))); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java index d40fbf62e9..cb4eac0de8 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The FloatMillisecondsDurationProperty model. @@ -29,8 +30,12 @@ public final class FloatMillisecondsDurationProperty implements JsonSerializable * @param value the value value to set. */ @Generated - public FloatMillisecondsDurationProperty(double value) { - this.value = value; + public FloatMillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -39,8 +44,8 @@ public FloatMillisecondsDurationProperty(double value) { * @return the value value. */ @Generated - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -66,13 +71,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java index e98cf4026c..13d8ffb22d 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/FloatMillisecondsLargerUnitDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The FloatMillisecondsLargerUnitDurationProperty model. @@ -30,8 +31,12 @@ public final class FloatMillisecondsLargerUnitDurationProperty * @param value the value value to set. */ @Generated - public FloatMillisecondsLargerUnitDurationProperty(double value) { - this.value = value; + public FloatMillisecondsLargerUnitDurationProperty(Duration value) { + if (value == null) { + this.value = 0.0; + } else { + this.value = (double) value.toNanos() / 1000_000L; + } } /** @@ -40,8 +45,8 @@ public FloatMillisecondsLargerUnitDurationProperty(double value) { * @return the value value. */ @Generated - public double getValue() { - return this.value; + public Duration getValue() { + return Duration.ofNanos((long) (this.value * 1000_000L)); } /** @@ -67,13 +72,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static FloatMillisecondsLargerUnitDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - double value = 0.0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getDouble(); + value = Duration.ofNanos((long) (reader.getDouble() * 1000_000L)); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java index d8130c569a..8c7d34072b 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Int32MillisecondsDurationProperty model. @@ -21,7 +22,7 @@ public final class Int32MillisecondsDurationProperty implements JsonSerializable * The value property. */ @Generated - private final int value; + private final long value; /** * Creates an instance of Int32MillisecondsDurationProperty class. @@ -29,8 +30,12 @@ public final class Int32MillisecondsDurationProperty implements JsonSerializable * @param value the value value to set. */ @Generated - public Int32MillisecondsDurationProperty(int value) { - this.value = value; + public Int32MillisecondsDurationProperty(Duration value) { + if (value == null) { + this.value = 0L; + } else { + this.value = value.toMillis(); + } } /** @@ -39,8 +44,8 @@ public Int32MillisecondsDurationProperty(int value) { * @return the value value. */ @Generated - public int getValue() { - return this.value; + public Duration getValue() { + return Duration.ofMillis(this.value); } /** @@ -50,7 +55,7 @@ public int getValue() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeIntField("value", this.value); + jsonWriter.writeLongField("value", this.value); return jsonWriter.writeEndObject(); } @@ -66,13 +71,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Int32MillisecondsDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - int value = 0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getInt(); + value = Duration.ofMillis(reader.getLong()); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java b/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java index 9be4f62447..7f74132a55 100644 --- a/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java +++ b/typespec-tests/src/main/java/encode/duration/property/models/Int32MillisecondsLargerUnitDurationProperty.java @@ -11,6 +11,7 @@ import com.azure.json.JsonToken; import com.azure.json.JsonWriter; import java.io.IOException; +import java.time.Duration; /** * The Int32MillisecondsLargerUnitDurationProperty model. @@ -22,7 +23,7 @@ public final class Int32MillisecondsLargerUnitDurationProperty * The value property. */ @Generated - private final int value; + private final long value; /** * Creates an instance of Int32MillisecondsLargerUnitDurationProperty class. @@ -30,8 +31,12 @@ public final class Int32MillisecondsLargerUnitDurationProperty * @param value the value value to set. */ @Generated - public Int32MillisecondsLargerUnitDurationProperty(int value) { - this.value = value; + public Int32MillisecondsLargerUnitDurationProperty(Duration value) { + if (value == null) { + this.value = 0L; + } else { + this.value = value.toMillis(); + } } /** @@ -40,8 +45,8 @@ public Int32MillisecondsLargerUnitDurationProperty(int value) { * @return the value value. */ @Generated - public int getValue() { - return this.value; + public Duration getValue() { + return Duration.ofMillis(this.value); } /** @@ -51,7 +56,7 @@ public int getValue() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeIntField("value", this.value); + jsonWriter.writeLongField("value", this.value); return jsonWriter.writeEndObject(); } @@ -67,13 +72,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { @Generated public static Int32MillisecondsLargerUnitDurationProperty fromJson(JsonReader jsonReader) throws IOException { return jsonReader.readObject(reader -> { - int value = 0; + Duration value = null; while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); if ("value".equals(fieldName)) { - value = reader.getInt(); + value = Duration.ofMillis(reader.getLong()); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/specialwords/ExtensibleStringsAsyncClient.java b/typespec-tests/src/main/java/specialwords/ExtensibleStringsAsyncClient.java new file mode 100644 index 0000000000..aeeab3d03f --- /dev/null +++ b/typespec-tests/src/main/java/specialwords/ExtensibleStringsAsyncClient.java @@ -0,0 +1,97 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package specialwords; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; +import specialwords.extensiblestrings.models.ExtensibleString; +import specialwords.implementation.ExtensibleStringsImpl; + +/** + * Initializes a new instance of the asynchronous SpecialWordsClient type. + */ +@ServiceClient(builder = SpecialWordsClientBuilder.class, isAsync = true) +public final class ExtensibleStringsAsyncClient { + @Generated + private final ExtensibleStringsImpl serviceClient; + + /** + * Initializes an instance of ExtensibleStringsAsyncClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + ExtensibleStringsAsyncClient(ExtensibleStringsImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The putExtensibleStringValue operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return verify enum member names that are special words using extensible enum (union) along with {@link Response} + * on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putExtensibleStringValueWithResponse(BinaryData body, + RequestOptions requestOptions) { + return this.serviceClient.putExtensibleStringValueWithResponseAsync(body, requestOptions); + } + + /** + * The putExtensibleStringValue operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return verify enum member names that are special words using extensible enum (union) on successful completion of + * {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono putExtensibleStringValue(ExtensibleString body) { + // Generated convenience method for putExtensibleStringValueWithResponse + RequestOptions requestOptions = new RequestOptions(); + return putExtensibleStringValueWithResponse(BinaryData.fromObject(body == null ? null : body.toString()), + requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> ExtensibleString.fromString(protocolMethodData.toObject(String.class))); + } +} diff --git a/typespec-tests/src/main/java/specialwords/ExtensibleStringsClient.java b/typespec-tests/src/main/java/specialwords/ExtensibleStringsClient.java new file mode 100644 index 0000000000..05656c704d --- /dev/null +++ b/typespec-tests/src/main/java/specialwords/ExtensibleStringsClient.java @@ -0,0 +1,93 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package specialwords; + +import com.azure.core.annotation.Generated; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.util.BinaryData; +import specialwords.extensiblestrings.models.ExtensibleString; +import specialwords.implementation.ExtensibleStringsImpl; + +/** + * Initializes a new instance of the synchronous SpecialWordsClient type. + */ +@ServiceClient(builder = SpecialWordsClientBuilder.class) +public final class ExtensibleStringsClient { + @Generated + private final ExtensibleStringsImpl serviceClient; + + /** + * Initializes an instance of ExtensibleStringsClient class. + * + * @param serviceClient the service client implementation. + */ + @Generated + ExtensibleStringsClient(ExtensibleStringsImpl serviceClient) { + this.serviceClient = serviceClient; + } + + /** + * The putExtensibleStringValue operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return verify enum member names that are special words using extensible enum (union) along with + * {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putExtensibleStringValueWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.putExtensibleStringValueWithResponse(body, requestOptions); + } + + /** + * The putExtensibleStringValue operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return verify enum member names that are special words using extensible enum (union). + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public ExtensibleString putExtensibleStringValue(ExtensibleString body) { + // Generated convenience method for putExtensibleStringValueWithResponse + RequestOptions requestOptions = new RequestOptions(); + return ExtensibleString.fromString( + putExtensibleStringValueWithResponse(BinaryData.fromObject(body == null ? null : body.toString()), + requestOptions).getValue().toObject(String.class)); + } +} diff --git a/typespec-tests/src/main/java/specialwords/SpecialWordsClientBuilder.java b/typespec-tests/src/main/java/specialwords/SpecialWordsClientBuilder.java index ea87d109d8..66786237ef 100644 --- a/typespec-tests/src/main/java/specialwords/SpecialWordsClientBuilder.java +++ b/typespec-tests/src/main/java/specialwords/SpecialWordsClientBuilder.java @@ -44,10 +44,12 @@ serviceClients = { ModelsClient.class, ModelPropertiesClient.class, + ExtensibleStringsClient.class, OperationsClient.class, ParametersClient.class, ModelsAsyncClient.class, ModelPropertiesAsyncClient.class, + ExtensibleStringsAsyncClient.class, OperationsAsyncClient.class, ParametersAsyncClient.class }) public final class SpecialWordsClientBuilder implements HttpTrait, @@ -292,6 +294,16 @@ public ModelPropertiesAsyncClient buildModelPropertiesAsyncClient() { return new ModelPropertiesAsyncClient(buildInnerClient().getModelProperties()); } + /** + * Builds an instance of ExtensibleStringsAsyncClient class. + * + * @return an instance of ExtensibleStringsAsyncClient. + */ + @Generated + public ExtensibleStringsAsyncClient buildExtensibleStringsAsyncClient() { + return new ExtensibleStringsAsyncClient(buildInnerClient().getExtensibleStrings()); + } + /** * Builds an instance of OperationsAsyncClient class. * @@ -332,6 +344,16 @@ public ModelPropertiesClient buildModelPropertiesClient() { return new ModelPropertiesClient(buildInnerClient().getModelProperties()); } + /** + * Builds an instance of ExtensibleStringsClient class. + * + * @return an instance of ExtensibleStringsClient. + */ + @Generated + public ExtensibleStringsClient buildExtensibleStringsClient() { + return new ExtensibleStringsClient(buildInnerClient().getExtensibleStrings()); + } + /** * Builds an instance of OperationsClient class. * diff --git a/typespec-tests/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java b/typespec-tests/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java new file mode 100644 index 0000000000..52fdb2469c --- /dev/null +++ b/typespec-tests/src/main/java/specialwords/extensiblestrings/models/ExtensibleString.java @@ -0,0 +1,243 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package specialwords.extensiblestrings.models; + +import com.azure.core.annotation.Generated; +import com.azure.core.util.ExpandableStringEnum; +import java.util.Collection; + +/** + * Verify enum member names that are special words using extensible enum (union). + */ +public final class ExtensibleString extends ExpandableStringEnum { + /** + * Static value and for ExtensibleString. + */ + @Generated + public static final ExtensibleString AND = fromString("and"); + + /** + * Static value as for ExtensibleString. + */ + @Generated + public static final ExtensibleString AS = fromString("as"); + + /** + * Static value assert for ExtensibleString. + */ + @Generated + public static final ExtensibleString ASSERT = fromString("assert"); + + /** + * Static value async for ExtensibleString. + */ + @Generated + public static final ExtensibleString ASYNC = fromString("async"); + + /** + * Static value await for ExtensibleString. + */ + @Generated + public static final ExtensibleString AWAIT = fromString("await"); + + /** + * Static value break for ExtensibleString. + */ + @Generated + public static final ExtensibleString BREAK = fromString("break"); + + /** + * Static value class for ExtensibleString. + */ + @Generated + public static final ExtensibleString CLASS = fromString("class"); + + /** + * Static value constructor for ExtensibleString. + */ + @Generated + public static final ExtensibleString CONSTRUCTOR = fromString("constructor"); + + /** + * Static value continue for ExtensibleString. + */ + @Generated + public static final ExtensibleString CONTINUE = fromString("continue"); + + /** + * Static value def for ExtensibleString. + */ + @Generated + public static final ExtensibleString DEF = fromString("def"); + + /** + * Static value del for ExtensibleString. + */ + @Generated + public static final ExtensibleString DEL = fromString("del"); + + /** + * Static value elif for ExtensibleString. + */ + @Generated + public static final ExtensibleString ELIF = fromString("elif"); + + /** + * Static value else for ExtensibleString. + */ + @Generated + public static final ExtensibleString ELSE = fromString("else"); + + /** + * Static value except for ExtensibleString. + */ + @Generated + public static final ExtensibleString EXCEPT = fromString("except"); + + /** + * Static value exec for ExtensibleString. + */ + @Generated + public static final ExtensibleString EXEC = fromString("exec"); + + /** + * Static value finally for ExtensibleString. + */ + @Generated + public static final ExtensibleString FINALLY = fromString("finally"); + + /** + * Static value for for ExtensibleString. + */ + @Generated + public static final ExtensibleString FOR = fromString("for"); + + /** + * Static value from for ExtensibleString. + */ + @Generated + public static final ExtensibleString FROM = fromString("from"); + + /** + * Static value global for ExtensibleString. + */ + @Generated + public static final ExtensibleString GLOBAL = fromString("global"); + + /** + * Static value if for ExtensibleString. + */ + @Generated + public static final ExtensibleString IF = fromString("if"); + + /** + * Static value import for ExtensibleString. + */ + @Generated + public static final ExtensibleString IMPORT = fromString("import"); + + /** + * Static value in for ExtensibleString. + */ + @Generated + public static final ExtensibleString IN = fromString("in"); + + /** + * Static value is for ExtensibleString. + */ + @Generated + public static final ExtensibleString IS = fromString("is"); + + /** + * Static value lambda for ExtensibleString. + */ + @Generated + public static final ExtensibleString LAMBDA = fromString("lambda"); + + /** + * Static value not for ExtensibleString. + */ + @Generated + public static final ExtensibleString NOT = fromString("not"); + + /** + * Static value or for ExtensibleString. + */ + @Generated + public static final ExtensibleString OR = fromString("or"); + + /** + * Static value pass for ExtensibleString. + */ + @Generated + public static final ExtensibleString PASS = fromString("pass"); + + /** + * Static value raise for ExtensibleString. + */ + @Generated + public static final ExtensibleString RAISE = fromString("raise"); + + /** + * Static value return for ExtensibleString. + */ + @Generated + public static final ExtensibleString RETURN = fromString("return"); + + /** + * Static value try for ExtensibleString. + */ + @Generated + public static final ExtensibleString TRY = fromString("try"); + + /** + * Static value while for ExtensibleString. + */ + @Generated + public static final ExtensibleString WHILE = fromString("while"); + + /** + * Static value with for ExtensibleString. + */ + @Generated + public static final ExtensibleString WITH = fromString("with"); + + /** + * Static value yield for ExtensibleString. + */ + @Generated + public static final ExtensibleString YIELD = fromString("yield"); + + /** + * Creates a new instance of ExtensibleString value. + * + * @deprecated Use the {@link #fromString(String)} factory method. + */ + @Generated + @Deprecated + public ExtensibleString() { + } + + /** + * Creates or finds a ExtensibleString from its string representation. + * + * @param name a name to look for. + * @return the corresponding ExtensibleString. + */ + @Generated + public static ExtensibleString fromString(String name) { + return fromString(name, ExtensibleString.class); + } + + /** + * Gets known ExtensibleString values. + * + * @return known ExtensibleString values. + */ + @Generated + public static Collection values() { + return values(ExtensibleString.class); + } +} diff --git a/typespec-tests/src/main/java/specialwords/extensiblestrings/models/package-info.java b/typespec-tests/src/main/java/specialwords/extensiblestrings/models/package-info.java new file mode 100644 index 0000000000..521c13ab8f --- /dev/null +++ b/typespec-tests/src/main/java/specialwords/extensiblestrings/models/package-info.java @@ -0,0 +1,49 @@ +// 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 SpecialWords. + * Scenarios to verify that reserved words can be used in service and generators will handle it appropriately. + * + * Current list of special words + * ```txt + * and + * as + * assert + * async + * await + * break + * class + * constructor + * continue + * def + * del + * elif + * else + * except + * exec + * finally + * for + * from + * global + * if + * import + * in + * is + * lambda + * list + * not + * or + * pass + * raise + * return + * try + * while + * with + * yield + * ```. + * + */ +package specialwords.extensiblestrings.models; diff --git a/typespec-tests/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java b/typespec-tests/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java new file mode 100644 index 0000000000..bfc14dc240 --- /dev/null +++ b/typespec-tests/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java @@ -0,0 +1,152 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package specialwords.implementation; + +import com.azure.core.annotation.BodyParam; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Put; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in ExtensibleStrings. + */ +public final class ExtensibleStringsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ExtensibleStringsService service; + + /** + * The service client containing this operation class. + */ + private final SpecialWordsClientImpl client; + + /** + * Initializes an instance of ExtensibleStringsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ExtensibleStringsImpl(SpecialWordsClientImpl client) { + this.service + = RestProxy.create(ExtensibleStringsService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for SpecialWordsClientExtensibleStrings to be used by the proxy service + * to perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "SpecialWordsClientExtensibleStrings") + public interface ExtensibleStringsService { + @Put("/special-words/extensible-strings/string") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> putExtensibleStringValue(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Put("/special-words/extensible-strings/string") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response putExtensibleStringValueSync(@HostParam("endpoint") String endpoint, + @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + } + + /** + * The putExtensibleStringValue operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return verify enum member names that are special words using extensible enum (union) along with {@link Response} + * on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> putExtensibleStringValueWithResponseAsync(BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.putExtensibleStringValue(this.client.getEndpoint(), contentType, + accept, body, requestOptions, context)); + } + + /** + * The putExtensibleStringValue operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return verify enum member names that are special words using extensible enum (union) along with + * {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putExtensibleStringValueWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.putExtensibleStringValueSync(this.client.getEndpoint(), contentType, accept, body, + requestOptions, Context.NONE); + } +} diff --git a/typespec-tests/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java b/typespec-tests/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java index 0228a3a8ef..5ff3f977f5 100644 --- a/typespec-tests/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java +++ b/typespec-tests/src/main/java/specialwords/implementation/SpecialWordsClientImpl.java @@ -85,6 +85,20 @@ public ModelPropertiesImpl getModelProperties() { return this.modelProperties; } + /** + * The ExtensibleStringsImpl object to access its operations. + */ + private final ExtensibleStringsImpl extensibleStrings; + + /** + * Gets the ExtensibleStringsImpl object to access its operations. + * + * @return the ExtensibleStringsImpl object. + */ + public ExtensibleStringsImpl getExtensibleStrings() { + return this.extensibleStrings; + } + /** * The OperationsImpl object to access its operations. */ @@ -146,6 +160,7 @@ public SpecialWordsClientImpl(HttpPipeline httpPipeline, SerializerAdapter seria this.endpoint = endpoint; this.models = new ModelsImpl(this); this.modelProperties = new ModelPropertiesImpl(this); + this.extensibleStrings = new ExtensibleStringsImpl(this); this.operations = new OperationsImpl(this); this.parameters = new ParametersImpl(this); } diff --git a/typespec-tests/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java b/typespec-tests/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java index 7f656c6cab..6b7bc67d76 100644 --- a/typespec-tests/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java +++ b/typespec-tests/src/main/java/tsptest/armcustomization/implementation/VaultsImpl.java @@ -28,12 +28,8 @@ public VaultsImpl(VaultsClient innerClient, tsptest.armcustomization.ArmCustomiz public Response getByResourceGroupWithResponse(String resourceGroupName, String vaultName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vaultName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VaultImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new VaultImpl(inner.getValue(), this.manager())); } public Vault getByResourceGroup(String resourceGroupName, String vaultName) { diff --git a/typespec-tests/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java b/typespec-tests/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java index 99a246c7ae..cc8e43cdf3 100644 --- a/typespec-tests/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java +++ b/typespec-tests/src/main/java/tsptest/armlegacy/implementation/SkusImpl.java @@ -29,12 +29,8 @@ public Response getNestedWithResponse(String providerNamespace, Str String nestedResourceTypeFirst, String sku, Context context) { Response inner = this.serviceClient() .getNestedWithResponse(providerNamespace, resourceType, nestedResourceTypeFirst, sku, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); } public SkuResource getNested(String providerNamespace, String resourceType, String nestedResourceTypeFirst, @@ -52,12 +48,8 @@ public Response createNestedWithResponse(String providerNamespace, String nestedResourceTypeFirst, String sku, SkuResourceInner resource, Context context) { Response inner = this.serviceClient() .createNestedWithResponse(providerNamespace, resourceType, nestedResourceTypeFirst, sku, resource, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); } public SkuResource createNested(String providerNamespace, String resourceType, String nestedResourceTypeFirst, @@ -86,12 +78,8 @@ public Response getRootWithResponse(String providerNamespace, Strin Context context) { Response inner = this.serviceClient().getRootWithResponse(providerNamespace, resourceType, sku, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new SkuResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new SkuResourceImpl(inner.getValue(), this.manager())); } public SkuResource getRoot(String providerNamespace, String resourceType, String sku) { diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java index 51e14bb9a4..f8f997455b 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildExtensionResourceInterfacesImpl.java @@ -31,12 +31,8 @@ public Response getWithResponse(String resourceUri, Stri String childExtensionResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceUri, topLevelArmResourceName, childExtensionResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChildExtensionResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChildExtensionResourceImpl(inner.getValue(), this.manager())); } public ChildExtensionResource get(String resourceUri, String topLevelArmResourceName, diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java index 2301426197..ef2b3f5052 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ChildResourcesInterfacesImpl.java @@ -31,12 +31,8 @@ public Response getWithResponse(String resourceGroupName, String String childResourceName, Context context) { Response inner = this.serviceClient() .getWithResponse(resourceGroupName, topLevelArmResourceName, childResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ChildResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ChildResourceImpl(inner.getValue(), this.manager())); } public ChildResource get(String resourceGroupName, String topLevelArmResourceName, String childResourceName) { diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java index cb64f8316c..b003d07a24 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ManagedMaintenanceWindowStatusOperationsImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(S String managedMaintenanceWindowStatusContentName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, managedMaintenanceWindowStatusContentName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ManagedMaintenanceWindowStatusImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ManagedMaintenanceWindowStatusImpl(inner.getValue(), this.manager())); } public ManagedMaintenanceWindowStatus getByResourceGroup(String resourceGroupName, diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java index 3cbcc629c0..ed9fb5cf73 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/ModelInterfaceSameNamesImpl.java @@ -30,12 +30,8 @@ public Response getByResourceGroupWithResponse(String re String modelInterfaceDifferentNameName, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, modelInterfaceDifferentNameName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ModelInterfaceSameNameImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ModelInterfaceSameNameImpl(inner.getValue(), this.manager())); } public ModelInterfaceSameName getByResourceGroup(String resourceGroupName, String modelInterfaceDifferentNameName) { diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java index 85ac6caf84..2e198ed797 100644 --- a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceInterfacesImpl.java @@ -34,12 +34,8 @@ public Response getByResourceGroupWithResponse(String resou String topLevelArmResourceName, Context context) { Response inner = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourceName, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); } public TopLevelArmResource getByResourceGroup(String resourceGroupName, String topLevelArmResourceName) { diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java index b12428994a..7241457923 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java @@ -7,7 +7,9 @@ import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceMethod; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; import com.azure.core.util.Context; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.models.Result; /** @@ -35,4 +37,70 @@ public interface ItemsClient { */ @ServiceMethod(returns = ReturnType.COLLECTION) PagedIterable list(Context context); + + /** + * The summary operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable summary(); + + /** + * The summary operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable summary(Context context); + + /** + * The list2 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list2(); + + /** + * The list2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list2(Context context); + + /** + * The summary2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + Response summary2WithResponse(Context context); + + /** + * The summary2 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + ListResultSummary2Inner summary2(); } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java new file mode 100644 index 0000000000..98b509fdb1 --- /dev/null +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java @@ -0,0 +1,132 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.fluent.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import tsptest.armstreamstyleserialization.models.ListResult2; +import tsptest.armstreamstyleserialization.models.Result; + +/** + * The ListResultSummary2 model. + */ +@Immutable +public final class ListResultSummary2Inner extends ListResult2 { + /* + * The summary property. + */ + private String summary; + + /* + * The nextLink property. + */ + private String nextLink; + + /* + * The items property. + */ + private List items; + + /** + * Creates an instance of ListResultSummary2Inner class. + */ + private ListResultSummary2Inner() { + } + + /** + * Get the summary property: The summary property. + * + * @return the summary value. + */ + public String summary() { + return this.summary; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + @Override + public String nextLink() { + return this.nextLink; + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + @Override + public List items() { + return this.items; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResultSummary2Inner")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResultSummary2Inner.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", items(), (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", nextLink()); + jsonWriter.writeStringField("summary", this.summary); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResultSummary2Inner from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResultSummary2Inner if the JsonReader was pointing to an instance of it, or null if it + * was pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResultSummary2Inner. + */ + public static ListResultSummary2Inner fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResultSummary2Inner deserializedListResultSummary2Inner = new ListResultSummary2Inner(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResultSummary2Inner.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResultSummary2Inner.nextLink = reader.getString(); + } else if ("summary".equals(fieldName)) { + deserializedListResultSummary2Inner.summary = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResultSummary2Inner; + }); + } +} diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java index 99a767143f..0a636c9e94 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java @@ -30,12 +30,8 @@ public FishesImpl(FishesClient innerClient, public Response getModelWithResponse(Context context) { Response inner = this.serviceClient().getModelWithResponse(context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new FishImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new FishImpl(inner.getValue(), this.manager())); } public Fish getModel() { @@ -49,12 +45,8 @@ public Fish getModel() { public Response putModelWithResponse(FishInner fish, Context context) { Response inner = this.serviceClient().putModelWithResponse(fish, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new FishImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new FishImpl(inner.getValue(), this.manager())); } public Fish putModel(FishInner fish) { @@ -68,12 +60,8 @@ public Fish putModel(FishInner fish) { public Response getOutputOnlyModelWithResponse(Context context) { Response inner = this.serviceClient().getOutputOnlyModelWithResponse(context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new OutputOnlyModelImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new OutputOnlyModelImpl(inner.getValue(), this.manager())); } public OutputOnlyModel getOutputOnlyModel() { diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java index 70d6dc0ac4..1422e8b2dc 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java @@ -30,7 +30,10 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import tsptest.armstreamstyleserialization.fluent.ItemsClient; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.implementation.models.ListResult; +import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; +import tsptest.armstreamstyleserialization.models.ListResult2; import tsptest.armstreamstyleserialization.models.Result; /** @@ -78,6 +81,48 @@ Mono>> list(@HostParam("endpoint") String endpoint, Response listSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> summary(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response summarySync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list2(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list2Sync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> summary2(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response summary2Sync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + @Headers({ "Content-Type: application/json" }) @Get("{nextLink}") @ExpectedResponses({ 200 }) @@ -91,6 +136,34 @@ Mono> listNext(@PathParam(value = "nextLink", encoded = tru @UnexpectedResponseExceptionType(ManagementException.class) Response listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> summaryNext(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response summaryNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list2Next(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list2NextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); } /** @@ -208,6 +281,269 @@ public PagedIterable list(Context context) { return new PagedIterable<>(() -> listSinglePage(context), nextLink -> listNextSinglePage(nextLink, context)); } + /** + * The summary operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> summarySinglePageAsync() { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.summary(this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The summary operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux summaryAsync() { + return new PagedFlux<>(() -> summarySinglePageAsync(), nextLink -> summaryNextSinglePageAsync(nextLink)); + } + + /** + * The summary operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse summarySinglePage() { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.summarySync(this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The summary operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse summarySinglePage(Context context) { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.summarySync(this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The summary operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable summary() { + return new PagedIterable<>(() -> summarySinglePage(), nextLink -> summaryNextSinglePage(nextLink)); + } + + /** + * The summary operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable summary(Context context) { + return new PagedIterable<>(() -> summarySinglePage(context), + nextLink -> summaryNextSinglePage(nextLink, context)); + } + + /** + * The list2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> list2SinglePageAsync() { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.list2(this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The list2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux list2Async() { + return new PagedFlux<>(() -> list2SinglePageAsync(), nextLink -> list2NextSinglePageAsync(nextLink)); + } + + /** + * The list2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list2SinglePage() { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list2Sync(this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list2SinglePage(Context context) { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list2Sync(this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list2() { + return new PagedIterable<>(() -> list2SinglePage(), nextLink -> list2NextSinglePage(nextLink)); + } + + /** + * The list2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list2(Context context) { + return new PagedIterable<>(() -> list2SinglePage(context), nextLink -> list2NextSinglePage(nextLink, context)); + } + + /** + * The summary2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> summary2WithResponseAsync() { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.summary2(this.client.getEndpoint(), accept, context)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The summary2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono summary2Async() { + return summary2WithResponseAsync().flatMap(res -> Mono.justOrEmpty(res.getValue())); + } + + /** + * The summary2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response summary2WithResponse(Context context) { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return service.summary2Sync(this.client.getEndpoint(), accept, context); + } + + /** + * The summary2 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ListResultSummary2Inner summary2() { + return summary2WithResponse(Context.NONE).getValue(); + } + /** * Get the next page of items. * @@ -286,5 +622,163 @@ private PagedResponse listNextSinglePage(String nextLink, Context contex res.getValue().nextLink(), null); } + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> summaryNextSinglePageAsync(String nextLink) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.summaryNext(nextLink, this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse summaryNextSinglePage(String nextLink) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res + = service.summaryNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse summaryNextSinglePage(String nextLink, Context context) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.summaryNextSync(nextLink, this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> list2NextSinglePageAsync(String nextLink) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.list2Next(nextLink, this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list2NextSinglePage(String nextLink) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list2NextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list2NextSinglePage(String nextLink, Context context) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list2NextSync(nextLink, this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + private static final ClientLogger LOGGER = new ClientLogger(ItemsClientImpl.class); } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java index 37ad164854..cf6522d43c 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java @@ -5,10 +5,14 @@ package tsptest.armstreamstyleserialization.implementation; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.SimpleResponse; import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import tsptest.armstreamstyleserialization.fluent.ItemsClient; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.models.Items; +import tsptest.armstreamstyleserialization.models.ListResultSummary2; import tsptest.armstreamstyleserialization.models.Result; public final class ItemsImpl implements Items { @@ -32,6 +36,37 @@ public PagedIterable list(Context context) { return this.serviceClient().list(context); } + public PagedIterable summary() { + return this.serviceClient().summary(); + } + + public PagedIterable summary(Context context) { + return this.serviceClient().summary(context); + } + + public PagedIterable list2() { + return this.serviceClient().list2(); + } + + public PagedIterable list2(Context context) { + return this.serviceClient().list2(context); + } + + public Response summary2WithResponse(Context context) { + Response inner = this.serviceClient().summary2WithResponse(context); + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ListResultSummary2Impl(inner.getValue(), this.manager())); + } + + public ListResultSummary2 summary2() { + ListResultSummary2Inner inner = this.serviceClient().summary2(); + if (inner != null) { + return new ListResultSummary2Impl(inner, this.manager()); + } else { + return null; + } + } + private ItemsClient serviceClient() { return this.innerClient; } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java new file mode 100644 index 0000000000..c5fe07fbb5 --- /dev/null +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java @@ -0,0 +1,48 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.implementation; + +import java.util.Collections; +import java.util.List; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.models.ListResultSummary2; +import tsptest.armstreamstyleserialization.models.Result; + +public final class ListResultSummary2Impl implements ListResultSummary2 { + private ListResultSummary2Inner innerObject; + + private final tsptest.armstreamstyleserialization.ArmResourceProviderManager serviceManager; + + ListResultSummary2Impl(ListResultSummary2Inner innerObject, + tsptest.armstreamstyleserialization.ArmResourceProviderManager serviceManager) { + this.innerObject = innerObject; + this.serviceManager = serviceManager; + } + + public List items() { + List inner = this.innerModel().items(); + if (inner != null) { + return Collections.unmodifiableList(inner); + } else { + return Collections.emptyList(); + } + } + + public String nextLink() { + return this.innerModel().nextLink(); + } + + public String summary() { + return this.innerModel().summary(); + } + + public ListResultSummary2Inner innerModel() { + return this.innerObject; + } + + private tsptest.armstreamstyleserialization.ArmResourceProviderManager manager() { + return this.serviceManager; + } +} diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java index 4556468423..e7f67aafc2 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java @@ -90,7 +90,7 @@ private Mono> setPriorityWithResponseAsync(Priority priority) if (priority == null) { return Mono.error(new IllegalArgumentException("Parameter priority is required and cannot be null.")); } - final String accept = "text/plain"; + final String accept = "application/json"; return FluxUtil .withContext(context -> service.setPriority(this.client.getEndpoint(), priority, accept, context)) .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); @@ -131,7 +131,7 @@ public Response setPriorityWithResponse(Priority priority, Context con throw LOGGER.atError() .log(new IllegalArgumentException("Parameter priority is required and cannot be null.")); } - final String accept = "text/plain"; + final String accept = "application/json"; return service.setPrioritySync(this.client.getEndpoint(), priority, accept, context); } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java index af772cd80e..0d612e3c14 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java @@ -18,7 +18,7 @@ * The ListResult model. */ @Immutable -public final class ListResult implements JsonSerializable { +public class ListResult implements JsonSerializable { /* * The items property. */ @@ -32,7 +32,7 @@ public final class ListResult implements JsonSerializable { /** * Creates an instance of ListResult class. */ - private ListResult() { + protected ListResult() { } /** @@ -44,6 +44,17 @@ public List items() { return this.items; } + /** + * Set the items property: The items property. + * + * @param items the items value to set. + * @return the ListResult object itself. + */ + ListResult withItems(List items) { + this.items = items; + return this; + } + /** * Get the nextLink property: The nextLink property. * @@ -53,6 +64,17 @@ public String nextLink() { return this.nextLink; } + /** + * Set the nextLink property: The nextLink property. + * + * @param nextLink the nextLink value to set. + * @return the ListResult object itself. + */ + ListResult withNextLink(String nextLink) { + this.nextLink = nextLink; + return this; + } + /** * Validates the instance. * diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java new file mode 100644 index 0000000000..04710cf983 --- /dev/null +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java @@ -0,0 +1,131 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.implementation.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import tsptest.armstreamstyleserialization.models.Result; + +/** + * The ListResultSummary model. + */ +@Immutable +public final class ListResultSummary extends ListResult { + /* + * The summary property. + */ + private String summary; + + /* + * The nextLink property. + */ + private String nextLink; + + /* + * The items property. + */ + private List items; + + /** + * Creates an instance of ListResultSummary class. + */ + private ListResultSummary() { + } + + /** + * Get the summary property: The summary property. + * + * @return the summary value. + */ + public String summary() { + return this.summary; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + @Override + public String nextLink() { + return this.nextLink; + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + @Override + public List items() { + return this.items; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResultSummary")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResultSummary.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", items(), (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", nextLink()); + jsonWriter.writeStringField("summary", this.summary); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResultSummary from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResultSummary if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResultSummary. + */ + public static ListResultSummary fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResultSummary deserializedListResultSummary = new ListResultSummary(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResultSummary.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResultSummary.nextLink = reader.getString(); + } else if ("summary".equals(fieldName)) { + deserializedListResultSummary.summary = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResultSummary; + }); + } +} diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Items.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Items.java index 819aef6f3a..e6a0925190 100644 --- a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Items.java +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Items.java @@ -5,6 +5,7 @@ package tsptest.armstreamstyleserialization.models; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; import com.azure.core.util.Context; /** @@ -30,4 +31,64 @@ public interface Items { * @return the paginated response with {@link PagedIterable}. */ PagedIterable list(Context context); + + /** + * The summary operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable summary(); + + /** + * The summary operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable summary(Context context); + + /** + * The list2 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable list2(); + + /** + * The list2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable list2(Context context); + + /** + * The summary2 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link Response}. + */ + Response summary2WithResponse(Context context); + + /** + * The summary2 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response. + */ + ListResultSummary2 summary2(); } diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java new file mode 100644 index 0000000000..27bdf410dd --- /dev/null +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java @@ -0,0 +1,133 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; + +/** + * The ListResult2 model. + */ +@Immutable +public class ListResult2 implements JsonSerializable { + /* + * The items property. + */ + private List items; + + /* + * The nextLink property. + */ + private String nextLink; + + /** + * Creates an instance of ListResult2 class. + */ + protected ListResult2() { + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + public List items() { + return this.items; + } + + /** + * Set the items property: The items property. + * + * @param items the items value to set. + * @return the ListResult2 object itself. + */ + ListResult2 withItems(List items) { + this.items = items; + return this; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + public String nextLink() { + return this.nextLink; + } + + /** + * Set the nextLink property: The nextLink property. + * + * @param nextLink the nextLink value to set. + * @return the ListResult2 object itself. + */ + ListResult2 withNextLink(String nextLink) { + this.nextLink = nextLink; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResult2")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResult2.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", this.items, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", this.nextLink); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResult2 from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResult2 if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResult2. + */ + public static ListResult2 fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResult2 deserializedListResult2 = new ListResult2(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResult2.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResult2.nextLink = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResult2; + }); + } +} diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java new file mode 100644 index 0000000000..5bd683003c --- /dev/null +++ b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java @@ -0,0 +1,41 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.models; + +import java.util.List; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; + +/** + * An immutable client-side representation of ListResultSummary2. + */ +public interface ListResultSummary2 { + /** + * Gets the items property: The items property. + * + * @return the items value. + */ + List items(); + + /** + * Gets the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + String nextLink(); + + /** + * Gets the summary property: The summary property. + * + * @return the summary value. + */ + String summary(); + + /** + * Gets the inner tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner object. + * + * @return the inner object. + */ + ListResultSummary2Inner innerModel(); +} diff --git a/typespec-tests/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java b/typespec-tests/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java index a0b31f30db..f38b566286 100644 --- a/typespec-tests/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java +++ b/typespec-tests/src/main/java/tsptest/armversioned/implementation/TopLevelArmResourcesImpl.java @@ -66,24 +66,16 @@ public Response getByResourceGroupWithResponse(String resou Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourcePropertiesName, parameter, newParameter, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); } public Response getByResourceGroupWithResponse(String resourceGroupName, String topLevelArmResourcePropertiesName, String parameter, Context context) { Response inner = this.serviceClient() .getByResourceGroupWithResponse(resourceGroupName, topLevelArmResourcePropertiesName, parameter, context); - if (inner != null) { - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new TopLevelArmResourceImpl(inner.getValue(), this.manager())); - } else { - return null; - } + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new TopLevelArmResourceImpl(inner.getValue(), this.manager())); } public TopLevelArmResource getByResourceGroup(String resourceGroupName, String topLevelArmResourcePropertiesName) { diff --git a/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java b/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java index 5eb297d5fd..28fd5ff589 100644 --- a/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java +++ b/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java @@ -474,6 +474,38 @@ public Mono> setStringEnumArrayHeaderWithResponse(List co return this.serviceClient.setStringEnumArrayHeaderWithResponseAsync(colorArray, requestOptions); } + /** + * The getWrongBody operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return simple string along with {@link Response} on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.getWrongBodyWithResponseAsync(body, requestOptions); + } + /** * The getColor operation. * @@ -1042,4 +1074,25 @@ public Mono setStringEnumArrayHeader(List colorArray) { .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), requestOptions).flatMap(FluxUtil::toMono); } + + /** + * The getWrongBody operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return simple string on successful completion of {@link Mono}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getWrongBody(String body) { + // Generated convenience method for getWrongBodyWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getWrongBodyWithResponse(BinaryData.fromString(body), requestOptions).flatMap(FluxUtil::toMono) + .map(protocolMethodData -> protocolMethodData.toString()); + } } diff --git a/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceClient.java b/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceClient.java index 802a27c880..05e4be7cc2 100644 --- a/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceClient.java +++ b/typespec-tests/src/main/java/tsptest/enumservice/EnumServiceClient.java @@ -470,6 +470,38 @@ public Response setStringEnumArrayHeaderWithResponse(List colorArr return this.serviceClient.setStringEnumArrayHeaderWithResponse(colorArray, requestOptions); } + /** + * The getWrongBody operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return simple string along with {@link Response}. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { + return this.serviceClient.getWrongBodyWithResponse(body, requestOptions); + } + /** * The getColor operation. * @@ -1015,4 +1047,24 @@ public void setStringEnumArrayHeader(List colorArray) { .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), requestOptions).getValue(); } + + /** + * The getWrongBody operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return simple string. + */ + @Generated + @ServiceMethod(returns = ReturnType.SINGLE) + public String getWrongBody(String body) { + // Generated convenience method for getWrongBodyWithResponse + RequestOptions requestOptions = new RequestOptions(); + return getWrongBodyWithResponse(BinaryData.fromString(body), requestOptions).getValue().toString(); + } } diff --git a/typespec-tests/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java b/typespec-tests/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java index fce35a37c7..14c8d1c04e 100644 --- a/typespec-tests/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java +++ b/typespec-tests/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java @@ -4,6 +4,7 @@ package tsptest.enumservice.implementation; +import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; import com.azure.core.annotation.HeaderParam; @@ -415,6 +416,26 @@ Mono> setStringEnumArrayHeader(@HostParam("endpoint") String endp @UnexpectedResponseExceptionType(HttpResponseException.class) Response setStringEnumArrayHeaderSync(@HostParam("endpoint") String endpoint, @HeaderParam("color-array") String colorArray, RequestOptions requestOptions, Context context); + + @Post("/enum/operation/wrong-body") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getWrongBody(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("text/plain") BinaryData body, RequestOptions requestOptions, Context context); + + @Post("/enum/operation/wrong-body") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getWrongBodySync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("text/plain") BinaryData body, RequestOptions requestOptions, Context context); } /** @@ -1317,4 +1338,71 @@ public Response setStringEnumArrayHeaderWithResponse(List colorArr return service.setStringEnumArrayHeaderSync(this.getEndpoint(), colorArrayConverted, requestOptions, Context.NONE); } + + /** + * The getWrongBody operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return simple string along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getWrongBodyWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "text/plain"; + final String accept = "text/plain"; + return FluxUtil.withContext( + context -> service.getWrongBody(this.getEndpoint(), contentType, accept, body, requestOptions, context)); + } + + /** + * The getWrongBody operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * String
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return simple string along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWrongBodyWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "text/plain"; + final String accept = "text/plain"; + return service.getWrongBodySync(this.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE); + } } diff --git a/typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties b/typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-defaultclient.properties similarity index 100% rename from typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-defaultclient.properties rename to typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-defaultclient.properties diff --git a/typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties b/typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyclient.properties similarity index 100% rename from typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-individuallyclient.properties rename to typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyclient.properties diff --git a/typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties b/typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties similarity index 100% rename from typespec-tests/src/main/resources/_specs_-azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties rename to typespec-tests/src/main/resources/azure-clientgenerator-core-clientinitialization-individuallyparentclient.properties diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java new file mode 100644 index 0000000000..80caba42b5 --- /dev/null +++ b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/DefaultClientTests.java @@ -0,0 +1,68 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package azure.clientgenerator.core.clientinitialization.defaultclient; + +import azure.clientgenerator.core.clientinitialization.defaultclient.models.BlobProperties; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.Input; +import azure.clientgenerator.core.clientinitialization.defaultclient.models.WithBodyRequest; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class DefaultClientTests { + + @Test + public void testHeaderParam() { + HeaderParamClient headerParamClient = new HeaderParamClientBuilder().name("test-name-value").buildClient(); + + headerParamClient.withQuery("test-id"); + headerParamClient.withBody(new Input("test-name")); + } + + @Test + public void testMultipleParams() { + MultipleParamsClient multipleParamsClient + = new MultipleParamsClientBuilder().name("test-name-value").region("us-west").buildClient(); + + multipleParamsClient.withQuery("test-id"); + multipleParamsClient.withBody(new Input("test-name")); + } + + @Test + public void testMixedParams() { + MixedParamsClient mixedParamsClient = new MixedParamsClientBuilder().name("test-name-value").buildClient(); + + mixedParamsClient.withQuery("us-west", "test-id"); + mixedParamsClient.withBody("us-west", new WithBodyRequest("test-name")); + } + + @Test + public void testPathParam() { + PathParamClient pathParamClient = new PathParamClientBuilder().blobName("sample-blob").buildClient(); + + pathParamClient.withQuery("text"); + BlobProperties blobProperties = pathParamClient.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("sample-blob", blobProperties.getName()); + pathParamClient.deleteStandalone(); + } + + @Test + public void testParamAlias() { + ParamAliasClient paramAliasClient = new ParamAliasClientBuilder().blobName("sample-blob").buildClient(); + + paramAliasClient.withAliasedName(); + paramAliasClient.withOriginalName(); + } + + @Test + public void testQueryParam() { + QueryParamClient queryParamClient = new QueryParamClientBuilder().blobName("test-blob").buildClient(); + + queryParamClient.withQuery("text"); + BlobProperties blobProperties = queryParamClient.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + queryParamClient.deleteStandalone(); + } +} diff --git a/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java similarity index 80% rename from typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java rename to typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java index 4b0f55cce3..7200a132b6 100644 --- a/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java +++ b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/defaultclient/generated/HeaderParamClientTestBase.java @@ -2,24 +2,24 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.generated; +package azure.clientgenerator.core.clientinitialization.defaultclient.generated; // The Java test files under 'generated' package are generated for your reference. // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient; -import _specs_.azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.HeaderParamClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.MixedParamsClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.MultipleParamsClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.ParamAliasClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.PathParamClientBuilder; +import azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClient; +import azure.clientgenerator.core.clientinitialization.defaultclient.QueryParamClientBuilder; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java new file mode 100644 index 0000000000..02b30166f3 --- /dev/null +++ b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyClientTests.java @@ -0,0 +1,74 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package azure.clientgenerator.core.clientinitialization.individuallyclient; + +import azure.clientgenerator.core.clientinitialization.individuallyclient.models.BlobProperties; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class IndividuallyClientTests { + + @Test + public void testIndividuallyNestedWithPath() { + IndividuallyNestedWithPathClient client + = new IndividuallyNestedWithPathClientBuilder().blobName("test-blob").buildClient(); + + client.withQuery("text"); + BlobProperties blobProperties = client.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyNestedWithQuery() { + IndividuallyNestedWithQueryClient client + = new IndividuallyNestedWithQueryClientBuilder().blobName("test-blob").buildClient(); + + client.withQuery("text"); + BlobProperties blobProperties = client.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyNestedWithHeader() { + IndividuallyNestedWithHeaderClient client + = new IndividuallyNestedWithHeaderClientBuilder().name("test-name-value").buildClient(); + + client.withQuery("text"); + client.getStandalone(); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyNestedWithMultiple() { + IndividuallyNestedWithMultipleClient client + = new IndividuallyNestedWithMultipleClientBuilder().name("test-name-value").region("us-west").buildClient(); + + client.withQuery("text"); + client.getStandalone(); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyNestedWithMixed() { + IndividuallyNestedWithMixedClient client + = new IndividuallyNestedWithMixedClientBuilder().name("test-name-value").buildClient(); + + client.withQuery("us-west", "text"); + client.getStandalone("us-west"); + client.deleteStandalone("us-west"); + } + + @Test + public void testIndividuallyNestedWithParamAlias() { + IndividuallyNestedWithParamAliasClient client + = new IndividuallyNestedWithParamAliasClientBuilder().blobName("sample-blob").buildClient(); + + client.withAliasedName(); + client.withOriginalName(); + } +} diff --git a/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java similarity index 80% rename from typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java rename to typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java index c5add06432..995a5c1423 100644 --- a/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java +++ b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyclient/generated/IndividuallyNestedWithPathClientTestBase.java @@ -2,24 +2,24 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.generated; +package azure.clientgenerator.core.clientinitialization.individuallyclient.generated; // The Java test files under 'generated' package are generated for your reference. // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithHeaderClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMixedClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithMultipleClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithParamAliasClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithPathClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClient; +import azure.clientgenerator.core.clientinitialization.individuallyclient.IndividuallyNestedWithQueryClientBuilder; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; diff --git a/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java new file mode 100644 index 0000000000..18feb0c542 --- /dev/null +++ b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentClientTests.java @@ -0,0 +1,76 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package azure.clientgenerator.core.clientinitialization.individuallyparentclient; + +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.models.BlobProperties; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class IndividuallyParentClientTests { + + private final IndividuallyParentClient parentClient = new IndividuallyParentClientBuilder().buildClient(); + + @Test + public void testIndividuallyParentNestedWithPath() { + IndividuallyParentNestedWithPathClient client + = parentClient.getIndividuallyParentNestedWithPathClient("test-blob"); + + client.withQuery("text"); + BlobProperties blobProperties = client.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyParentNestedWithQuery() { + IndividuallyParentNestedWithQueryClient client + = parentClient.getIndividuallyParentNestedWithQueryClient("test-blob"); + + client.withQuery("text"); + BlobProperties blobProperties = client.getStandalone(); + Assertions.assertNotNull(blobProperties); + Assertions.assertEquals("test-blob", blobProperties.getName()); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyParentNestedWithHeader() { + IndividuallyParentNestedWithHeaderClient client + = parentClient.getIndividuallyParentNestedWithHeaderClient("test-name-value"); + + client.withQuery("text"); + client.getStandalone(); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyParentNestedWithMultiple() { + IndividuallyParentNestedWithMultipleClient client + = parentClient.getIndividuallyParentNestedWithMultipleClient("test-name-value", "us-west"); + + client.withQuery("text"); + client.getStandalone(); + client.deleteStandalone(); + } + + @Test + public void testIndividuallyParentNestedWithMixed() { + IndividuallyParentNestedWithMixedClient client + = parentClient.getIndividuallyParentNestedWithMixedClient("test-name-value"); + + client.withQuery("us-west", "text"); + client.getStandalone("us-west"); + client.deleteStandalone("us-west"); + } + + @Test + public void testIndividuallyParentNestedWithParamAlias() { + IndividuallyParentNestedWithParamAliasClient client + = parentClient.getIndividuallyParentNestedWithParamAliasClient("sample-blob"); + + client.withAliasedName(); + client.withOriginalName(); + } +} diff --git a/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java similarity index 78% rename from typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java rename to typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java index 79eb17cdd8..255296ba8a 100644 --- a/typespec-tests/src/test/java/_specs_/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java +++ b/typespec-tests/src/test/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/generated/IndividuallyParentNestedWithPathClientTestBase.java @@ -2,26 +2,26 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.generated; +package azure.clientgenerator.core.clientinitialization.individuallyparentclient.generated; // The Java test files under 'generated' package are generated for your reference. // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClientBuilder; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient; -import _specs_.azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithHeaderClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMixedClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithMultipleClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithParamAliasClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithPathClientBuilder; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClient; +import azure.clientgenerator.core.clientinitialization.individuallyparentclient.IndividuallyParentNestedWithQueryClientBuilder; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; diff --git a/typespec-tests/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java b/typespec-tests/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java index af8b611d49..b9b6ec4329 100644 --- a/typespec-tests/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java +++ b/typespec-tests/src/test/java/azure/resourcemanager/methodsubscriptionid/MethodSubscriptionIdTest.java @@ -6,6 +6,8 @@ import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource1Inner; import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResource2Inner; import azure.resourcemanager.methodsubscriptionid.fluent.models.SubscriptionResourceInner; +import azure.resourcemanager.methodsubscriptionid.models.Operation; +import azure.resourcemanager.methodsubscriptionid.models.OperationDisplay; import azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResource; import azure.resourcemanager.methodsubscriptionid.models.ResourceGroupResourceProperties; import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource; @@ -15,6 +17,8 @@ import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResource2Properties; import azure.resourcemanager.methodsubscriptionid.models.SubscriptionResourceProperties; import com.azure.core.management.Region; +import java.util.List; +import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.utils.ArmUtils; @@ -44,6 +48,23 @@ public class MethodSubscriptionIdTest { private final MethodSubscriptionIdManager manager = MethodSubscriptionIdManager.authenticate(ArmUtils.createTestHttpPipeline(), ArmUtils.getAzureProfile()); + @Test + public void testOperationsList() { + List operationList = manager.operations().list().stream().collect(Collectors.toList()); + Assertions.assertFalse(operationList.isEmpty()); + Assertions.assertEquals(1, operationList.size()); + Operation operation = operationList.get(0); + Assertions.assertNotNull(operation); + Assertions.assertEquals("Azure.ResourceManager.MethodSubscriptionId/services/read", operation.name()); + Assertions.assertFalse(operation.isDataAction()); + OperationDisplay display = operation.display(); + Assertions.assertNotNull(display); + Assertions.assertEquals("Azure.ResourceManager.MethodSubscriptionId", display.provider()); + Assertions.assertEquals("services", display.resource()); + Assertions.assertEquals("Lists services", display.operation()); + Assertions.assertEquals("Lists registered services", display.description()); + } + @Test public void testTwoSubscriptionResourcesMethodLevelSubscriptionResource1Operations() { // Test Scenario 1: Two subscription resources with method-level subscriptionId diff --git a/typespec-tests/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java b/typespec-tests/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java index e2bd7fd5a2..be9de58af4 100644 --- a/typespec-tests/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java +++ b/typespec-tests/src/test/java/azure/resourcemanager/nonresource/NonResourceTests.java @@ -3,6 +3,8 @@ package azure.resourcemanager.nonresource; +import azure.resourcemanager.nonresource.fluent.models.NonResourceInner; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.utils.ArmUtils; @@ -17,6 +19,15 @@ public void testNonResourceGet() { manager.nonResourceOperations().get("eastus", "hello"); } + @Test + public void testNonResourceCreate() { + NonResourceInner body = new NonResourceInner().withId("id").withName("hello").withType("nonResource"); + NonResourceInner result = manager.serviceClient().getNonResourceOperations().create("eastus", "hello", body); + Assertions.assertEquals("id", result.id()); + Assertions.assertEquals("hello", result.name()); + Assertions.assertEquals("nonResource", result.type()); + } + @Disabled("It is mistakenly treated as a resource") @Test public void testNonResourcePut() { diff --git a/typespec-tests/src/test/java/encode/duration/EncodeDurationTests.java b/typespec-tests/src/test/java/encode/duration/EncodeDurationTests.java index ff829e46ea..9313e9e9b6 100644 --- a/typespec-tests/src/test/java/encode/duration/EncodeDurationTests.java +++ b/typespec-tests/src/test/java/encode/duration/EncodeDurationTests.java @@ -4,11 +4,19 @@ package encode.duration; import encode.duration.property.models.DefaultDurationProperty; +import encode.duration.property.models.Float64MillisecondsDurationProperty; import encode.duration.property.models.Float64SecondsDurationProperty; +import encode.duration.property.models.FloatMillisecondsDurationArrayProperty; +import encode.duration.property.models.FloatMillisecondsDurationProperty; +import encode.duration.property.models.FloatMillisecondsLargerUnitDurationProperty; import encode.duration.property.models.FloatSecondsDurationArrayProperty; import encode.duration.property.models.FloatSecondsDurationProperty; +import encode.duration.property.models.FloatSecondsLargerUnitDurationProperty; import encode.duration.property.models.ISO8601DurationProperty; +import encode.duration.property.models.Int32MillisecondsDurationProperty; +import encode.duration.property.models.Int32MillisecondsLargerUnitDurationProperty; import encode.duration.property.models.Int32SecondsDurationProperty; +import encode.duration.property.models.Int32SecondsLargerUnitDurationProperty; import java.time.Duration; import java.util.Arrays; import java.util.List; @@ -24,6 +32,8 @@ public class EncodeDurationTests { private static final Duration DAY40 = Duration.ofDays(40); private static final Duration SECOND35 = Duration.ofSeconds(35, 625_000_000); private static final Duration SECOND36 = Duration.ofSeconds(36); + private static final Duration MILLIS35625 = Duration.ofMillis(35625); + private static final Duration MILLIS36000 = Duration.ofMillis(36000); @Test public void testQuery() { @@ -35,9 +45,25 @@ public void testQuery() { queryClient.int32Seconds(SECOND36); + queryClient.int32SecondsLargerUnit(Duration.ofMinutes(2)); + + queryClient.floatSecondsLargerUnit(Duration.ofMinutes(2).plusSeconds(30)); + queryClient.iso8601(DAY40); queryClient.int32SecondsArray(Arrays.asList(SECOND36, Duration.ofSeconds(47))); + + queryClient.int32Milliseconds(MILLIS36000); + + queryClient.int32MillisecondsLargerUnit(Duration.ofMinutes(3)); + + queryClient.floatMilliseconds(MILLIS35625); + + queryClient.floatMillisecondsLargerUnit(Duration.ofMinutes(3).plusSeconds(30)); + + queryClient.float64Milliseconds(MILLIS35625); + + queryClient.int32MillisecondsArray(Arrays.asList(MILLIS36000, Duration.ofMillis(47000))); } @Test @@ -50,9 +76,25 @@ public void testHeader() { headerClient.int32Seconds(SECOND36); + headerClient.int32SecondsLargerUnit(Duration.ofMinutes(2)); + + headerClient.floatSecondsLargerUnit(Duration.ofMinutes(2).plusSeconds(30)); + headerClient.iso8601(DAY40); headerClient.iso8601Array(Arrays.asList(DAY40, Duration.ofDays(50))); + + headerClient.int32Milliseconds(MILLIS36000); + + headerClient.int32MillisecondsLargerUnit(Duration.ofMinutes(3)); + + headerClient.floatMilliseconds(MILLIS35625); + + headerClient.floatMillisecondsLargerUnit(Duration.ofMinutes(3).plusSeconds(30)); + + headerClient.float64Milliseconds(MILLIS35625); + + headerClient.int32MillisecondsArray(Arrays.asList(MILLIS36000, Duration.ofMillis(47000))); } @Test @@ -68,11 +110,46 @@ public void testProperty() { Assertions.assertEquals(SECOND36, propertyClient.int32Seconds(new Int32SecondsDurationProperty(SECOND36)).getValue()); + Assertions.assertEquals(Duration.ofMinutes(2), + propertyClient.int32SecondsLargerUnit(new Int32SecondsLargerUnitDurationProperty(Duration.ofMinutes(2))) + .getValue()); + + Assertions.assertEquals(Duration.ofMinutes(2).plusSeconds(30), + propertyClient + .floatSecondsLargerUnit( + new FloatSecondsLargerUnitDurationProperty(Duration.ofMinutes(2).plusSeconds(30))) + .getValue()); + propertyClient.iso8601(new ISO8601DurationProperty(DAY40)); List array = Arrays.asList(SECOND35, Duration.ofSeconds(46, 750_000_000)); FloatSecondsDurationArrayProperty ret = propertyClient.floatSecondsArray(new FloatSecondsDurationArrayProperty(array)); Assertions.assertEquals(array, ret.getValue()); + + Assertions.assertEquals(MILLIS36000, + propertyClient.int32Milliseconds(new Int32MillisecondsDurationProperty(MILLIS36000)).getValue()); + + Assertions.assertEquals(MILLIS35625, + propertyClient.floatMilliseconds(new FloatMillisecondsDurationProperty(MILLIS35625)).getValue()); + + Assertions.assertEquals(MILLIS35625, + propertyClient.float64Milliseconds(new Float64MillisecondsDurationProperty(MILLIS35625)).getValue()); + + Assertions.assertEquals(Duration.ofMinutes(3), + propertyClient + .int32MillisecondsLargerUnit(new Int32MillisecondsLargerUnitDurationProperty(Duration.ofMinutes(3))) + .getValue()); + + Assertions.assertEquals(Duration.ofMinutes(3).plusSeconds(30), + propertyClient + .floatMillisecondsLargerUnit( + new FloatMillisecondsLargerUnitDurationProperty(Duration.ofMinutes(3).plusSeconds(30))) + .getValue()); + + List millisArray = Arrays.asList(Duration.ofMillis(35625), Duration.ofMillis(46750)); + FloatMillisecondsDurationArrayProperty millisArrayRet + = propertyClient.floatMillisecondsArray(new FloatMillisecondsDurationArrayProperty(millisArray)); + Assertions.assertEquals(millisArray, millisArrayRet.getValue()); } } diff --git a/typespec-tests/src/test/java/specialwords/ExtensibleStringsClientTest.java b/typespec-tests/src/test/java/specialwords/ExtensibleStringsClientTest.java new file mode 100644 index 0000000000..633147c06f --- /dev/null +++ b/typespec-tests/src/test/java/specialwords/ExtensibleStringsClientTest.java @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package specialwords; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import specialwords.extensiblestrings.models.ExtensibleString; + +public class ExtensibleStringsClientTest { + + private final ExtensibleStringsClient client = new SpecialWordsClientBuilder().buildExtensibleStringsClient(); + + @Test + public void testPutExtensibleStringValue() { + ExtensibleString result = client.putExtensibleStringValue(ExtensibleString.CLASS); + Assertions.assertEquals(ExtensibleString.CLASS, result); + } +} diff --git a/typespec-tests/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java b/typespec-tests/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java index 20be242ec4..04ff1266c8 100644 --- a/typespec-tests/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java +++ b/typespec-tests/src/test/java/specialwords/generated/SpecialWordsClientTestBase.java @@ -13,6 +13,7 @@ import com.azure.core.test.TestMode; import com.azure.core.test.TestProxyTestBase; import com.azure.core.util.Configuration; +import specialwords.ExtensibleStringsClient; import specialwords.ModelPropertiesClient; import specialwords.ModelsClient; import specialwords.OperationsClient; @@ -24,6 +25,8 @@ class SpecialWordsClientTestBase extends TestProxyTestBase { protected ModelPropertiesClient modelPropertiesClient; + protected ExtensibleStringsClient extensibleStringsClient; + protected OperationsClient operationsClient; protected ParametersClient parametersClient; @@ -48,6 +51,15 @@ protected void beforeTest() { } modelPropertiesClient = modelPropertiesClientbuilder.buildModelPropertiesClient(); + SpecialWordsClientBuilder extensibleStringsClientbuilder = new SpecialWordsClientBuilder() + .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + extensibleStringsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + extensibleStringsClient = extensibleStringsClientbuilder.buildExtensibleStringsClient(); + SpecialWordsClientBuilder operationsClientbuilder = new SpecialWordsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) diff --git a/typespec-tests/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java b/typespec-tests/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java new file mode 100644 index 0000000000..2be886de28 --- /dev/null +++ b/typespec-tests/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package tsptest.armstreamstyleserialization; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.implementation.models.ListResult; +import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; +import tsptest.armstreamstyleserialization.models.ListResult2; + +public class PagedModelPackageTests { + + @Test + public void testPagedModelPackage() { + Assertions.assertTrue(isInImplementationModels(ListResult.class)); + Assertions.assertTrue(isInImplementationModels(ListResultSummary.class)); + + // ListResult2 not in implementation, because its child ListResultSummary2(Inner) is PUBLIC + Assertions.assertFalse(isInImplementationModels(ListResult2.class)); + Assertions.assertFalse(isInImplementationModels(ListResultSummary2Inner.class)); + } + + private static boolean isInImplementationModels(Class clazz) { + return clazz.getPackage().getName().endsWith(".implementation.models"); + } +} diff --git a/typespec-tests/tsp/arm-stream-style-serialization.tsp b/typespec-tests/tsp/arm-stream-style-serialization.tsp index d26c8cf9f3..a240bd8ee1 100644 --- a/typespec-tests/tsp/arm-stream-style-serialization.tsp +++ b/typespec-tests/tsp/arm-stream-style-serialization.tsp @@ -253,6 +253,7 @@ interface Functions { interface Priorities { @post setPriority(@query priority: Priority): { + @header("Content-Type") contentType: "application/json"; @body body: Priority; }; } @@ -263,6 +264,25 @@ interface Items { @get @list list(): ListResult & ArmLroLocationHeader; + + @get + @list + @route("summary") + summary(): ListResultSummary; + + @get + @list + @route("list2") + list2(): ListResult2; + + @get + @route("summary2") + summary2(): ListResultSummary2; +} + +// model does not contain `@pageItems` property, but inherit them from parent +model ListResultSummary extends ListResult { + summary?: string; } model ListResult { @@ -273,6 +293,19 @@ model ListResult { nextLink?: string; } +// This paged model need to be public (instead of in "implementation" package), as its child ListResultSummary2 is public +model ListResult2 { + @pageItems + items: Result[]; + + @nextLink + nextLink?: string; +} + +model ListResultSummary2 extends ListResult2 { + summary?: string; +} + model Result { name: string; diff --git a/typespec-tests/tsp/enum.tsp b/typespec-tests/tsp/enum.tsp index 989388c862..8545bfbc2b 100644 --- a/typespec-tests/tsp/enum.tsp +++ b/typespec-tests/tsp/enum.tsp @@ -202,4 +202,12 @@ interface EnumOp { @header colorArrayOpt?: ColorModel[], ): void; + + // The request and response should be `@header contentType: "application/json", @body body: ColorModel` + // The test here is to make sure the generated code still compile pass, even if it is not the expected operation definition. + @post + @route("operation/wrong-body") + getWrongBody(@body body: ColorModelBase): { + @body body: ColorModelBase; + }; } From f8995bddda88ef1e259228e168d5b0b2702b01b6 Mon Sep 17 00:00:00 2001 From: "Xiaofei Cao (from Dev Box)" Date: Fri, 20 Mar 2026 10:29:00 +0800 Subject: [PATCH 5/7] sync core --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index c970fe81eb..379841db73 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c970fe81eb27cc4a7a8e60440e43863c41daaa78 +Subproject commit 379841db7311ac647689ae7f1df319c1b24b1995 From 8c749a50347df57abe6f91c3265f3c93a2271a06 Mon Sep 17 00:00:00 2001 From: "Xiaofei Cao (from Dev Box)" Date: Fri, 20 Mar 2026 12:44:36 +0800 Subject: [PATCH 6/7] Bump version to 0.43.2 and update dependencies - Updated @azure-tools/typespec-client-generator-core to 0.66.3 - Updated @azure-tools/typespec-liftr-base to 0.13.0 - Updated @typescript-eslint packages to 8.57.1 - Updated typescript-eslint to 8.57.1 - Updated peerDependencies and overrides to match Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- typespec-extension/changelog.md | 6 + typespec-extension/package-lock.json | 193 +++++++++++++++------------ typespec-extension/package.json | 20 +-- typespec-tests/package.json | 6 +- 4 files changed, 127 insertions(+), 98 deletions(-) diff --git a/typespec-extension/changelog.md b/typespec-extension/changelog.md index 80f4510de2..25535ccab6 100644 --- a/typespec-extension/changelog.md +++ b/typespec-extension/changelog.md @@ -1,5 +1,11 @@ # Release History +## 0.43.2 (2026-03-20) + +Compatible with compiler 1.10.0. + +- Updated package dependencies to the latest versions. + ## 0.43.1 (2026-03-16) Compatible with compiler 1.10.0. diff --git a/typespec-extension/package-lock.json b/typespec-extension/package-lock.json index b50720cb7d..bb595665ee 100644 --- a/typespec-extension/package-lock.json +++ b/typespec-extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "@azure-tools/typespec-java", - "version": "0.43.1", + "version": "0.43.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@azure-tools/typespec-java", - "version": "0.43.1", + "version": "0.43.2", "license": "MIT", "dependencies": { "@autorest/codemodel": "~4.20.1", @@ -19,14 +19,14 @@ "@azure-tools/typespec-azure-core": "0.66.0", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-azure-rulesets": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.2", - "@azure-tools/typespec-liftr-base": "0.12.0", + "@azure-tools/typespec-client-generator-core": "0.66.3", + "@azure-tools/typespec-liftr-base": "0.13.0", "@microsoft/api-extractor": "^7.57.7", "@types/js-yaml": "~4.0.9", "@types/lodash": "~4.17.24", "@types/node": "~25.5.0", - "@typescript-eslint/eslint-plugin": "~8.57.0", - "@typescript-eslint/parser": "~8.57.0", + "@typescript-eslint/eslint-plugin": "~8.57.1", + "@typescript-eslint/parser": "~8.57.1", "@typespec/compiler": "1.10.0", "@typespec/events": "0.80.0", "@typespec/http": "1.10.0", @@ -48,7 +48,7 @@ "prettier": "~3.8.1", "rimraf": "~6.1.3", "typescript": "~5.9.3", - "typescript-eslint": "^8.57.0", + "typescript-eslint": "^8.57.1", "vitest": "^4.1.0" }, "engines": { @@ -60,8 +60,8 @@ "@azure-tools/typespec-azure-core": ">=0.66.0 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.66.0 <1.0.0", "@azure-tools/typespec-azure-rulesets": ">=0.66.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.66.2 <1.0.0", - "@azure-tools/typespec-liftr-base": ">=0.12.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.66.3 <1.0.0", + "@azure-tools/typespec-liftr-base": ">=0.13.0 <1.0.0", "@typespec/compiler": "^1.10.0", "@typespec/http": "^1.10.0", "@typespec/openapi": "^1.10.0", @@ -200,6 +200,7 @@ "integrity": "sha512-OBKxRN7AucK3snh+GtLKSDdcZTz08IgcSZlIO3c4KSlmcR5twT1NMyqf1+V8SAhyOdZimndb+ikzrkkgab+GpA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -215,6 +216,7 @@ "integrity": "sha512-UbgYUaYTt7prsv+RYxd2kiOWjeEeoH56QOqgXnSOFhYzq/h9fyDaQAm6+CY7cklziED+MYy3uMQd1BG9mNwlfQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "change-case": "~5.4.4", "pluralize": "^8.0.0" @@ -248,11 +250,12 @@ } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.66.2", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.66.2.tgz", - "integrity": "sha512-Qr5fstJ0yQiTYNvp/EuY3+mUBue2ri9qNZkT6aC+CsfBt5yjfdjo++3SuEsDQtELyS8pBoDOT3weLiB0N+/fSw==", + "version": "0.66.3", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.66.3.tgz", + "integrity": "sha512-sNetQ6igxAp/vL6X2kEIy715ToDTqoJeb+OL59GEUtOW/3KBSi5tsxvDdCwSfEoaNEmv/FYjh/gJDwAWCJdFJg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "change-case": "~5.4.4", "pluralize": "^8.0.0", @@ -275,9 +278,9 @@ } }, "node_modules/@azure-tools/typespec-liftr-base": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-liftr-base/-/typespec-liftr-base-0.12.0.tgz", - "integrity": "sha512-jM5jjhiWUsqRvzYNiDc+7q4UXs02EbA3m8LRaUiLUkF61n7Vzz2Y0Jw2pW88zD4feCyyXoixRjpqvmurIY8K2w==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-liftr-base/-/typespec-liftr-base-0.13.0.tgz", + "integrity": "sha512-MF40K/IHwyy3N606DTZSPhFSwA/84ekR9RqvmtJXsXD0SdYcQSoAHOJp4o5qw8OAPSC+aKZ5A+TXRx333V/3PQ==", "dev": true }, "node_modules/@babel/code-frame": { @@ -1893,6 +1896,7 @@ "integrity": "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.18.0" } @@ -1905,17 +1909,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.57.0.tgz", - "integrity": "sha512-qeu4rTHR3/IaFORbD16gmjq9+rEs9fGKdX0kF6BKSfi+gCuG3RCKLlSBYzn/bGsY9Tj7KE/DAQStbp8AHJGHEQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.57.1.tgz", + "integrity": "sha512-Gn3aqnvNl4NGc6x3/Bqk1AOn0thyTU9bqDRhiRnUWezgvr2OnhYCWCgC8zXXRVqBsIL1pSDt7T9nJUe0oM0kDQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.57.0", - "@typescript-eslint/type-utils": "8.57.0", - "@typescript-eslint/utils": "8.57.0", - "@typescript-eslint/visitor-keys": "8.57.0", + "@typescript-eslint/scope-manager": "8.57.1", + "@typescript-eslint/type-utils": "8.57.1", + "@typescript-eslint/utils": "8.57.1", + "@typescript-eslint/visitor-keys": "8.57.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.4.0" @@ -1928,7 +1932,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.57.0", + "@typescript-eslint/parser": "^8.57.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } @@ -1957,16 +1961,17 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.57.0.tgz", - "integrity": "sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.57.1.tgz", + "integrity": "sha512-k4eNDan0EIMTT/dUKc/g+rsJ6wcHYhNPdY19VoX/EOtaAG8DLtKCykhrUnuHPYvinn5jhAPgD2Qw9hXBwrahsw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "@typescript-eslint/scope-manager": "8.57.0", - "@typescript-eslint/types": "8.57.0", - "@typescript-eslint/typescript-estree": "8.57.0", - "@typescript-eslint/visitor-keys": "8.57.0", + "@typescript-eslint/scope-manager": "8.57.1", + "@typescript-eslint/types": "8.57.1", + "@typescript-eslint/typescript-estree": "8.57.1", + "@typescript-eslint/visitor-keys": "8.57.1", "debug": "^4.4.3" }, "engines": { @@ -1982,14 +1987,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.57.0.tgz", - "integrity": "sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.57.1.tgz", + "integrity": "sha512-vx1F37BRO1OftsYlmG9xay1TqnjNVlqALymwWVuYTdo18XuKxtBpCj1QlzNIEHlvlB27osvXFWptYiEWsVdYsg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.57.0", - "@typescript-eslint/types": "^8.57.0", + "@typescript-eslint/tsconfig-utils": "^8.57.1", + "@typescript-eslint/types": "^8.57.1", "debug": "^4.4.3" }, "engines": { @@ -2004,14 +2009,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.57.0.tgz", - "integrity": "sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.57.1.tgz", + "integrity": "sha512-hs/QcpCwlwT2L5S+3fT6gp0PabyGk4Q0Rv2doJXA0435/OpnSR3VRgvrp8Xdoc3UAYSg9cyUjTeFXZEPg/3OKg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.57.0", - "@typescript-eslint/visitor-keys": "8.57.0" + "@typescript-eslint/types": "8.57.1", + "@typescript-eslint/visitor-keys": "8.57.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2022,9 +2027,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.0.tgz", - "integrity": "sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.1.tgz", + "integrity": "sha512-0lgOZB8cl19fHO4eI46YUx2EceQqhgkPSuCGLlGi79L2jwYY1cxeYc1Nae8Aw1xjgW3PKVDLlr3YJ6Bxx8HkWg==", "dev": true, "license": "MIT", "engines": { @@ -2039,15 +2044,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.57.0.tgz", - "integrity": "sha512-yjgh7gmDcJ1+TcEg8x3uWQmn8ifvSupnPfjP21twPKrDP/pTHlEQgmKcitzF/rzPSmv7QjJ90vRpN4U+zoUjwQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.57.1.tgz", + "integrity": "sha512-+Bwwm0ScukFdyoJsh2u6pp4S9ktegF98pYUU0hkphOOqdMB+1sNQhIz8y5E9+4pOioZijrkfNO/HUJVAFFfPKA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.57.0", - "@typescript-eslint/typescript-estree": "8.57.0", - "@typescript-eslint/utils": "8.57.0", + "@typescript-eslint/types": "8.57.1", + "@typescript-eslint/typescript-estree": "8.57.1", + "@typescript-eslint/utils": "8.57.1", "debug": "^4.4.3", "ts-api-utils": "^2.4.0" }, @@ -2064,9 +2069,9 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/ts-api-utils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz", - "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", + "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==", "dev": true, "license": "MIT", "engines": { @@ -2077,9 +2082,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.57.0.tgz", - "integrity": "sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.57.1.tgz", + "integrity": "sha512-S29BOBPJSFUiblEl6RzPPjJt6w25A6XsBqRVDt53tA/tlL8q7ceQNZHTjPeONt/3S7KRI4quk+yP9jK2WjBiPQ==", "dev": true, "license": "MIT", "engines": { @@ -2091,16 +2096,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.0.tgz", - "integrity": "sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.1.tgz", + "integrity": "sha512-ybe2hS9G6pXpqGtPli9Gx9quNV0TWLOmh58ADlmZe9DguLq0tiAKVjirSbtM1szG6+QH6rVXyU6GTLQbWnMY+g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.57.0", - "@typescript-eslint/tsconfig-utils": "8.57.0", - "@typescript-eslint/types": "8.57.0", - "@typescript-eslint/visitor-keys": "8.57.0", + "@typescript-eslint/project-service": "8.57.1", + "@typescript-eslint/tsconfig-utils": "8.57.1", + "@typescript-eslint/types": "8.57.1", + "@typescript-eslint/visitor-keys": "8.57.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -2135,9 +2140,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/ts-api-utils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz", - "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", + "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==", "dev": true, "license": "MIT", "engines": { @@ -2148,16 +2153,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.57.0.tgz", - "integrity": "sha512-5iIHvpD3CZe06riAsbNxxreP+MuYgVUsV0n4bwLH//VJmgtt54sQeY2GszntJ4BjYCpMzrfVh2SBnUQTtys2lQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.57.1.tgz", + "integrity": "sha512-XUNSJ/lEVFttPMMoDVA2r2bwrl8/oPx8cURtczkSEswY5T3AeLmCy+EKWQNdL4u0MmAHOjcWrqJp2cdvgjn8dQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.57.0", - "@typescript-eslint/types": "8.57.0", - "@typescript-eslint/typescript-estree": "8.57.0" + "@typescript-eslint/scope-manager": "8.57.1", + "@typescript-eslint/types": "8.57.1", + "@typescript-eslint/typescript-estree": "8.57.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2172,13 +2177,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.0.tgz", - "integrity": "sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.1.tgz", + "integrity": "sha512-YWnmJkXbofiz9KbnbbwuA2rpGkFPLbAIetcCNO6mJ8gdhdZ/v7WDXsoGFAJuM6ikUFKTlSQnjWnVO4ux+UzS6A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.57.0", + "@typescript-eslint/types": "8.57.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -2221,6 +2226,7 @@ "integrity": "sha512-R6BATDkughntPpaxeESJF+wxma5PEjgmnnKvH0/ByqUH8VyhIckQWE9kkP0Uc/EJ0o0VYhe8qCwWQvV70k5lTw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "~7.29.0", "@inquirer/prompts": "^8.0.1", @@ -2426,6 +2432,7 @@ "integrity": "sha512-FrWEUwxhDNbE2YN4fyqV5Qrz9qFJbvPoiKrJM7dexkb7eyhepq3dbc5zZgAm/qFBQ+XxGQQVJ4swXxKT+338fw==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2439,6 +2446,7 @@ "integrity": "sha512-/fj55fmUj4m/FmNdfH0V52menVrmS2r5Xj9d1H+pnjQbxvvaxS906RSRcoF8kbg3PvlibP/Py5u82TAk53AyqA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2458,6 +2466,7 @@ "integrity": "sha512-tukmyp+c9CFlA2FdF61XfT9eTe5WXWz6J8pOrJ9+IYg0BcBwhJkvDj6BYpDD6SjxbRr1wO5ZL2Whe6MequsyVw==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2522,6 +2531,7 @@ "integrity": "sha512-xczXLoB2akSIDner41gQYTS9CG6TdCN0QHYvXBT6ZrYEnBh+pMvdymW//5CSOTamZLOGo9AOJVJaFfwbFA4vQQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2536,6 +2546,7 @@ "integrity": "sha512-/lxYgMaxgEcjBVhep9tf/VnFD2wnkZlkmjUHLeZL8Cuf+qip61Ren6Ml91YtNnnIFYsuuymDzRclrA073ZBR6Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2552,6 +2563,7 @@ "integrity": "sha512-lNvzrvX/ZRIxRpxIBZu90XNsT+uWsMbLtxHd9edspHAiID3c9WKZbl2fnLcPqdR/60odqKve4yGzB9gF58GUDQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2722,6 +2734,7 @@ "integrity": "sha512-WQCT0jN2lSRfwOy+Cd1KUYzenpKR5TdoX0uW6zQdvxQ9nQZIXoaSaReh9/ldhmSV4xv3p2dqF9oq1cdbVGfJTg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2735,6 +2748,7 @@ "integrity": "sha512-Qfy5eyCcOF3xYOU/dejhpmmeY75U1Q9C8XBE+GvSZ3lakRfKBIpT+X6Q07qmKSAbGYJZKYLWCIAy/dgCuu/OAA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2877,6 +2891,7 @@ "integrity": "sha512-sTSDtVM1GOevRGsCNhp1mBUHKo9Qlc55+HCreFT4fe99AHxl1QQNXSL3uj4Pkjh5yEuWZIx8E2tVC94nnBZECQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/utils": "4.1.0", "fflate": "^0.8.2", @@ -2931,6 +2946,7 @@ "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3229,9 +3245,9 @@ } }, "node_modules/brace-expansion": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", - "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", + "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", "dev": true, "license": "MIT", "dependencies": { @@ -3282,6 +3298,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.19", "caniuse-lite": "^1.0.30001751", @@ -3973,6 +3990,7 @@ "integrity": "sha512-COV33RzXZkqhG9P2rZCFl9ZmJ7WL+gQSCRzE7RhkbclbQPtLAWReL7ysA0Sh4c8Im2U9ynybdR56PV0XcKvqaQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", @@ -7462,6 +7480,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -7630,6 +7649,7 @@ "integrity": "sha512-aw45vwtwOl3QkUAmWCnLV9QW1xY+FSX2zzlit4MAfE99wX+Jij4ycnpbAWgBXsRrxmfs9LaYktg/eX5Bpthd3g==", "dev": true, "license": "Apache-2.0", + "peer": true, "dependencies": { "@gerrit0/mini-shiki": "^3.9.0", "lunr": "^2.3.9", @@ -7667,6 +7687,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7676,16 +7697,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.57.0.tgz", - "integrity": "sha512-W8GcigEMEeB07xEZol8oJ26rigm3+bfPHxHvwbYUlu1fUDsGuQ7Hiskx5xGW/xM4USc9Ephe3jtv7ZYPQntHeA==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.57.1.tgz", + "integrity": "sha512-fLvZWf+cAGw3tqMCYzGIU6yR8K+Y9NT2z23RwOjlNFF2HwSB3KhdEFI5lSBv8tNmFkkBShSjsCjzx1vahZfISA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.57.0", - "@typescript-eslint/parser": "8.57.0", - "@typescript-eslint/typescript-estree": "8.57.0", - "@typescript-eslint/utils": "8.57.0" + "@typescript-eslint/eslint-plugin": "8.57.1", + "@typescript-eslint/parser": "8.57.1", + "@typescript-eslint/typescript-estree": "8.57.1", + "@typescript-eslint/utils": "8.57.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7815,6 +7836,7 @@ "integrity": "sha512-fPGaRNj9Zytaf8LEiBhY7Z6ijnFKdzU/+mL8EFBaKr7Vw1/FWcTBAMW0wLPJAGMPX38ZPVCVgLceWiEqeoqL2Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@oxc-project/runtime": "0.115.0", "lightningcss": "^1.32.0", @@ -7907,6 +7929,7 @@ "integrity": "sha512-YbDrMF9jM2Lqc++2530UourxZHmkKLxrs4+mYhEwqWS97WJ7wOYEkcr+QfRgJ3PW9wz3odRijLZjHEaRLTNbqw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/expect": "4.1.0", "@vitest/mocker": "4.1.0", diff --git a/typespec-extension/package.json b/typespec-extension/package.json index 738a885080..b26cfb43ab 100644 --- a/typespec-extension/package.json +++ b/typespec-extension/package.json @@ -1,6 +1,6 @@ { "name": "@azure-tools/typespec-java", - "version": "0.43.1", + "version": "0.43.2", "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding", "keywords": [ "TypeSpec" @@ -52,8 +52,8 @@ "@azure-tools/typespec-azure-core": ">=0.66.0 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.66.0 <1.0.0", "@azure-tools/typespec-azure-rulesets": ">=0.66.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.66.2 <1.0.0", - "@azure-tools/typespec-liftr-base": ">=0.12.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.66.3 <1.0.0", + "@azure-tools/typespec-liftr-base": ">=0.13.0 <1.0.0", "@typespec/compiler": "^1.10.0", "@typespec/http": "^1.10.0", "@typespec/openapi": "^1.10.0", @@ -73,14 +73,14 @@ "@azure-tools/typespec-azure-core": "0.66.0", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-azure-rulesets": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.2", - "@azure-tools/typespec-liftr-base": "0.12.0", + "@azure-tools/typespec-client-generator-core": "0.66.3", + "@azure-tools/typespec-liftr-base": "0.13.0", "@microsoft/api-extractor": "^7.57.7", "@types/js-yaml": "~4.0.9", "@types/lodash": "~4.17.24", "@types/node": "~25.5.0", - "@typescript-eslint/eslint-plugin": "~8.57.0", - "@typescript-eslint/parser": "~8.57.0", + "@typescript-eslint/eslint-plugin": "~8.57.1", + "@typescript-eslint/parser": "~8.57.1", "@typespec/compiler": "1.10.0", "@typespec/events": "0.80.0", "@typespec/http": "1.10.0", @@ -102,12 +102,12 @@ "prettier": "~3.8.1", "rimraf": "~6.1.3", "typescript": "~5.9.3", - "typescript-eslint": "^8.57.0", + "typescript-eslint": "^8.57.1", "vitest": "^4.1.0" }, "overrides": { "eslint": "~10.0.3", - "@typescript-eslint/eslint-plugin": "~8.57.0", - "@typescript-eslint/parser": "~8.57.0" + "@typescript-eslint/eslint-plugin": "~8.57.1", + "@typescript-eslint/parser": "~8.57.1" } } diff --git a/typespec-tests/package.json b/typespec-tests/package.json index 44586ddf3f..2903f26b67 100644 --- a/typespec-tests/package.json +++ b/typespec-tests/package.json @@ -13,7 +13,7 @@ "@typespec/spector": "0.1.0-alpha.24", "@typespec/http-specs": "0.1.0-alpha.34", "@azure-tools/azure-http-specs": "0.1.0-alpha.38", - "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.43.1.tgz" + "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.43.2.tgz" }, "devDependencies": { "@typespec/prettier-plugin-typespec": "^1.10.0", @@ -31,10 +31,10 @@ "@typespec/sse": "0.80.0", "@typespec/streams": "0.80.0", "@azure-tools/typespec-azure-core": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.2", + "@azure-tools/typespec-client-generator-core": "0.66.3", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-autorest": "0.66.0", - "@azure-tools/typespec-liftr-base": "0.12.0" + "@azure-tools/typespec-liftr-base": "0.13.0" }, "private": true } From 6c522537068eb9f9e120939d9b086b0f9adcb051 Mon Sep 17 00:00:00 2001 From: "Xiaofei Cao (from Dev Box)" Date: Fri, 20 Mar 2026 12:53:55 +0800 Subject: [PATCH 7/7] prepare autorest 4.1.64 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b4a47be6b..daf96942e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@autorest/java", - "version": "4.1.63", + "version": "4.1.64", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@autorest/java", - "version": "4.1.63", + "version": "4.1.64", "license": "MIT", "devDependencies": { "@microsoft.azure/autorest.testserver": "3.3.50", diff --git a/package.json b/package.json index 857bd97ca1..1ab249e7be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@autorest/java", - "version": "4.1.63", + "version": "4.1.64", "description": "The Java extension for classic generators in AutoRest.", "scripts": { "autorest": "autorest",