From 766f61a5f7da6db0a5bb3dcfcec4d9978220d663 Mon Sep 17 00:00:00 2001 From: Pavel Gross Date: Mon, 18 Nov 2024 11:11:17 +0300 Subject: [PATCH] [#26] All: Remove V2 from naming Rename project, namespaces and class names Signed-off-by: Pavel Gross --- FrostFS.SDK.sln | 4 +- .../Caches.cs | 2 +- .../CllientKey.cs | 2 +- .../Exceptions/FrostFsException.cs | 2 +- .../FrostFsInvalidObjectException.cs | 2 +- .../Exceptions/FrostFsResponseException.cs | 2 +- .../Exceptions/FrostFsStreamException.cs | 2 +- .../Exceptions/SessionExpiredException.cs | 2 +- .../Exceptions/SessionNotFoundException.cs | 2 +- .../FrostFS.SDK.Client.csproj} | 6 +- .../FrostFSClient.cs | 6 +- .../GlobalSuppressions.cs | 2 +- .../Interceptors/ErrorInterceptor.cs | 2 +- .../Interceptors/MetricsInterceptor.cs | 2 +- .../Interfaces/IFrostFSClient.cs | 3 +- .../Logging/FrostFsMessages.cs | 2 +- .../Mappers/Container.cs | 2 +- .../Mappers/ContainerId.cs | 2 +- .../Mappers/MetaHeader.cs | 2 +- .../Mappers/Netmap/Netmap.cs | 2 +- .../Mappers/Netmap/NodeInfo.cs | 4 +- .../Mappers/Netmap/PlacementPolicy.cs | 2 +- .../Mappers/Netmap/Replica.cs | 2 +- .../Mappers/Object/Object.cs | 2 +- .../Mappers/Object/ObjectAttributeMapper.cs | 2 +- .../Mappers/Object/ObjectFilterMapper.cs | 2 +- .../Mappers/Object/ObjectHeaderMapper.cs | 2 +- .../Mappers/Object/ObjectId.cs | 2 +- .../Mappers/OwnerId.cs | 2 +- .../Mappers/Session/SessionMapper.cs | 2 +- .../Mappers/SignatureMapper.cs | 2 +- .../Mappers/Status.cs | 2 +- .../Mappers/Version.cs | 2 +- .../Models/Chain/ChainTarget.cs | 2 +- .../Models/Chain/FrostFsChain.cs | 2 +- .../Models/Chain/FrostFsTargetType.cs | 2 +- .../Models/Client/ClientSettings.cs | 0 .../Models/Containers/FrostFsContainerId.cs | 4 +- .../Models/Containers/FrostFsContainerInfo.cs | 4 +- .../Models/Enums/FrostFsMatchType.cs | 0 .../Models/Enums/FrostFsObjectType.cs | 0 .../Models/Enums/FrostFsStatusCode.cs | 0 .../Models/Enums/NodeState.cs | 0 .../Models/Enums/SignatureScheme.cs | 0 .../Models/Misc/CallStatistics.cs | 0 .../Models/Misc/CheckSum.cs | 0 .../Models/Misc/Constants.cs | 0 .../Models/Netmap/FrostFsNetmapSnapshot.cs | 0 .../Models/Netmap/FrostFsNodeInfo.cs | 0 .../Models/Netmap/FrostFsPlacementPolicy.cs | 2 +- .../Models/Netmap/FrostFsReplica.cs | 0 .../Models/Netmap/FrostFsVersion.cs | 2 +- .../Models/Object/FrostFsAddress.cs | 2 +- .../Models/Object/FrostFsAttributePair.cs | 0 .../Models/Object/FrostFsLargeObject.cs | 0 .../Models/Object/FrostFsLinkObject.cs | 0 .../Models/Object/FrostFsObject.cs | 0 .../Models/Object/FrostFsObjectFilter.cs | 0 .../Models/Object/FrostFsObjectHeader.cs | 2 +- .../Models/Object/FrostFsObjectId.cs | 0 .../Models/Object/FrostFsOwner.cs | 2 +- .../Models/Object/FrostFsRange.cs | 0 .../Models/Object/FrostFsSplit.cs | 0 .../Models/Object/IObjectReader.cs | 0 .../Models/Object/SplitId.cs | 0 .../Models/Response/FrostFsResponseStatus.cs | 0 .../Models/Response/FrostFsSignature.cs | 0 .../Models/Response/MetaHeader.cs | 0 .../Models/Session/FrostFsSessionToken.cs | 0 .../Parameters/CallContext.cs | 2 +- .../Parameters/Credentials.cs | 2 +- .../Parameters/IContext.cs | 2 +- .../Parameters/ISessionToken.cs | 2 +- .../Parameters/PrmApeChainList.cs | 2 +- .../Parameters/PrmApeChainRemove.cs | 2 +- .../Parameters/PrmApeRemoveAdd.cs | 2 +- .../Parameters/PrmBalance.cs | 2 +- .../Parameters/PrmBase.cs | 2 +- .../Parameters/PrmContainerCreate.cs | 2 +- .../Parameters/PrmContainerDelete.cs | 2 +- .../Parameters/PrmContainerGet.cs | 2 +- .../Parameters/PrmContainerGetAll.cs | 2 +- .../Parameters/PrmNetmapSnapshot.cs | 2 +- .../Parameters/PrmNetworkSettings.cs | 2 +- .../Parameters/PrmNodeInfo.cs | 2 +- .../Parameters/PrmObjectDelete.cs | 2 +- .../Parameters/PrmObjectGet.cs | 2 +- .../Parameters/PrmObjectHeadGet.cs | 2 +- .../Parameters/PrmObjectPatch.cs | 2 +- .../Parameters/PrmObjectPut.cs | 2 +- .../Parameters/PrmObjectSearch.cs | 2 +- .../Parameters/PrmRangeGet.cs | 2 +- .../Parameters/PrmRangeHashGet.cs | 2 +- .../Parameters/PrmSessionCreate.cs | 2 +- .../Parameters/PrmSingleObjectPut.cs | 2 +- .../Parameters/PrmWait.cs | 2 +- .../Pool/ClientStatusMonitor.cs | 2 +- .../Pool/ClientWrapper.cs | 40 +++++-- .../Pool/HealthyStatus.cs | 2 +- .../Pool/IClientStatus.cs | 2 +- .../Pool/InitParameters.cs | 2 +- .../Pool/InnerPool.cs | 2 +- .../Pool/MethodIndex.cs | 2 +- .../Pool/MethodStatus.cs | 2 +- .../Pool/NodeParam.cs | 2 +- .../Pool/NodeStatistic.cs | 2 +- .../Pool/NodesParam.cs | 2 +- .../Pool/Pool.cs | 6 +- .../Pool/RebalanceParameters.cs | 2 +- .../Pool/RequestInfo.cs | 2 +- .../Pool/Sampler.cs | 2 +- .../Pool/SessionCache.cs | 2 +- .../Pool/Statistic.cs | 2 +- .../Pool/StatusSnapshot.cs | 2 +- .../Pool/WorkList.cs | 2 +- .../Pool/WrapperPrm.cs | 2 +- .../Services/AccountingServiceProvider.cs | 2 +- .../Services/ApeManagerServiceProvider.cs | 2 +- .../Services/ContainerServiceProvider.cs | 6 +- .../Services/NetmapServiceProvider.cs | 2 +- .../Services/ObjectServiceProvider.cs | 6 +- .../Services/SessionServiceProvider.cs | 6 +- .../Services/Shared/ContextAccessor.cs | 2 +- .../Services/Shared/SessionProvider.cs | 2 +- .../Tools/ClientContext.cs | 2 +- .../Tools/NetworkSettings.cs | 2 +- .../Tools/ObjectReader.cs | 2 +- .../Tools/ObjectStreamer.cs | 2 +- .../Tools/ObjectTools.cs | 4 +- .../Tools/Range.cs | 0 .../Tools/RangeReader.cs | 2 +- .../Tools/RequestConstructor.cs | 6 +- .../Tools/RequestSigner.cs | 4 +- .../Tools/SearchReader.cs | 2 +- .../Tools/Verifier.cs | 6 +- src/FrostFS.SDK.ClientV2/Ростелеком.txt | 8 -- .../FrostFS.SDK.Cryptography.csproj | 10 +- .../Client/ClientSettings.cs | 63 ---------- .../Containers/ContainerId.cs | 11 -- .../Containers/FrostFsContainer.cs | 11 -- src/FrostFS.SDK.ModelsV2/Enums/BasicAcl.cs | 21 ---- .../Enums/FrostFsObjectMatchType.cs | 10 -- .../Enums/FrostFsObjectType.cs | 8 -- .../Enums/FrostFsStatusCode.cs | 22 ---- src/FrostFS.SDK.ModelsV2/Enums/NodeState.cs | 9 -- .../Enums/SignatureScheme.cs | 8 -- .../FrostFS.SDK.ModelsV2.csproj | 22 ---- .../Misc/CallStatistics.cs | 7 -- src/FrostFS.SDK.ModelsV2/Misc/CheckSum.cs | 20 ---- src/FrostFS.SDK.ModelsV2/Misc/Constants.cs | 52 -------- .../Netmap/FrostFsNodeInfo.cs | 18 --- .../Netmap/FrostFsPlacementPolicy.cs | 28 ----- .../Netmap/FrostFsReplica.cs | 15 --- .../Netmap/FrostFsVersion.cs | 17 --- src/FrostFS.SDK.ModelsV2/Netmap/NetmapInfo.cs | 10 -- .../Object/FrostFsObject.cs | 83 ------------- .../Object/IObjectReader.cs | 10 -- .../Object/ObjectAttribute.cs | 7 -- .../Object/ObjectFilter.cs | 111 ------------------ .../Object/ObjectHeader.cs | 26 ---- src/FrostFS.SDK.ModelsV2/Object/ObjectId.cs | 28 ----- src/FrostFS.SDK.ModelsV2/Object/OwnerId.cs | 25 ---- src/FrostFS.SDK.ModelsV2/Object/SplitId.cs | 62 ---------- src/FrostFS.SDK.ModelsV2/Object/Splitter.cs | 24 ---- .../Response/FrostFsResponseStatus.cs | 14 --- .../Response/FrostFsSignature.cs | 10 -- .../Response/MetaHeader.cs | 20 ---- .../Session/FrostFsSessionToken.cs | 6 - .../FrostFS.SDK.Protos.csproj} | 10 +- .../Interfaces/IMetaHeader.cs | 0 .../Interfaces/IRequest.cs | 2 +- .../Interfaces/IResponse.cs | 0 .../Interfaces/IVerifiableMessage.cs | 0 .../Interfaces/IVerificationHeader.cs | 0 .../accounting/Extension.Message.cs | 2 +- .../accounting/service.proto | 0 .../accounting/types.proto | 0 .../acl/types.proto | 0 .../ape/types.proto | 0 .../apemanager/Extension.Message.cs | 2 +- .../apemanager/service.proto | 0 .../container/Extension.Message.cs | 2 +- .../container/service.proto | 0 .../container/types.proto | 0 .../lock/types.proto | 0 .../netmap/Extension.Message.cs | 2 +- .../netmap/service.proto | 0 .../netmap/types.proto | 0 .../object/Extension.Message.cs | 2 +- .../object/service.proto | 0 .../object/types.proto | 0 .../refs/types.proto | 0 .../session/Extension.Message.cs | 2 +- .../session/Extension.MetaHeader.cs | 0 .../session/Extension.VerificationHeader.cs | 0 .../session/Extension.XHeader.cs | 0 .../session/service.proto | 0 .../session/types.proto | 0 .../status/types.proto | 0 .../tombstone/types.proto | 0 src/FrostFS.SDK.Tests/ContainerTest.cs | 4 +- src/FrostFS.SDK.Tests/ContainerTestsBase.cs | 4 +- .../FrostFS.SDK.Tests.csproj | 12 +- .../Mocks/AsyncStreamRangeReaderMock.cs | 4 +- .../Mocks/AsyncStreamReaderMock.cs | 4 +- .../Mocks/ClientStreamWriter.cs | 2 +- .../ContainerServiceBase.cs | 4 +- .../ContainerServiceMocks/GetContainerMock.cs | 4 +- src/FrostFS.SDK.Tests/Mocks/ObjectMock.cs | 4 +- .../Mocks/PatchStreamWriter.cs | 2 +- src/FrostFS.SDK.Tests/NetworkTest.cs | 2 +- src/FrostFS.SDK.Tests/NetworkTestsBase.cs | 4 +- src/FrostFS.SDK.Tests/ObjectTest.cs | 4 +- src/FrostFS.SDK.Tests/ObjectTestsBase.cs | 4 +- src/FrostFS.SDK.Tests/PoolSmokeTests.cs | 2 +- src/FrostFS.SDK.Tests/SessionTests.cs | 4 +- src/FrostFS.SDK.Tests/SessionTestsBase.cs | 4 +- src/FrostFS.SDK.Tests/SmokeClientTests.cs | 4 +- src/FrostFS.SDK.Tests/SmokeTestsBase.cs | 2 +- 219 files changed, 219 insertions(+), 974 deletions(-) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Caches.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/CllientKey.cs (89%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Exceptions/FrostFsException.cs (90%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Exceptions/FrostFsInvalidObjectException.cs (91%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Exceptions/FrostFsResponseException.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Exceptions/FrostFsStreamException.cs (90%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Exceptions/SessionExpiredException.cs (91%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Exceptions/SessionNotFoundException.cs (91%) rename src/{FrostFS.SDK.ClientV2/FrostFS.SDK.ClientV2.csproj => FrostFS.SDK.Client/FrostFS.SDK.Client.csproj} (85%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/FrostFSClient.cs (99%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/GlobalSuppressions.cs (87%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Interceptors/ErrorInterceptor.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Interceptors/MetricsInterceptor.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Interfaces/IFrostFSClient.cs (97%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Logging/FrostFsMessages.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Container.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/ContainerId.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/MetaHeader.cs (91%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Netmap/Netmap.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Netmap/NodeInfo.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Netmap/PlacementPolicy.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Netmap/Replica.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Object/Object.cs (85%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Object/ObjectAttributeMapper.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Object/ObjectFilterMapper.cs (95%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Object/ObjectHeaderMapper.cs (97%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Object/ObjectId.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/OwnerId.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Session/SessionMapper.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/SignatureMapper.cs (95%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Status.cs (92%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Mappers/Version.cs (97%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Chain/ChainTarget.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Chain/FrostFsChain.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Chain/FrostFsTargetType.cs (74%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Client/ClientSettings.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Containers/FrostFsContainerId.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Containers/FrostFsContainerInfo.cs (97%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Enums/FrostFsMatchType.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Enums/FrostFsObjectType.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Enums/FrostFsStatusCode.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Enums/NodeState.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Enums/SignatureScheme.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Misc/CallStatistics.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Misc/CheckSum.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Misc/Constants.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Netmap/FrostFsNetmapSnapshot.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Netmap/FrostFsNodeInfo.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Netmap/FrostFsPlacementPolicy.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Netmap/FrostFsReplica.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Netmap/FrostFsVersion.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsAddress.cs (97%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsAttributePair.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsLargeObject.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsLinkObject.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsObject.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsObjectFilter.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsObjectHeader.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsObjectId.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsOwner.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsRange.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/FrostFsSplit.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/IObjectReader.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Object/SplitId.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Response/FrostFsResponseStatus.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Response/FrostFsSignature.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Response/MetaHeader.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Models/Session/FrostFsSessionToken.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/CallContext.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/Credentials.cs (85%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/IContext.cs (89%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/ISessionToken.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmApeChainList.cs (82%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmApeChainRemove.cs (87%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmApeRemoveAdd.cs (86%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmBalance.cs (68%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmBase.cs (91%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmContainerCreate.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmContainerDelete.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmContainerGet.cs (83%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmContainerGetAll.cs (70%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmNetmapSnapshot.cs (70%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmNetworkSettings.cs (70%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmNodeInfo.cs (68%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmObjectDelete.cs (91%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmObjectGet.cs (91%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmObjectHeadGet.cs (91%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmObjectPatch.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmObjectPut.cs (97%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmObjectSearch.cs (95%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmRangeGet.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmRangeHashGet.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmSessionCreate.cs (81%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmSingleObjectPut.cs (88%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Parameters/PrmWait.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/ClientStatusMonitor.cs (99%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/ClientWrapper.cs (81%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/HealthyStatus.cs (95%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/IClientStatus.cs (95%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/InitParameters.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/InnerPool.cs (97%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/MethodIndex.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/MethodStatus.cs (91%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/NodeParam.cs (92%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/NodeStatistic.cs (87%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/NodesParam.cs (88%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/Pool.cs (99%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/RebalanceParameters.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/RequestInfo.cs (87%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/Sampler.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/SessionCache.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/Statistic.cs (88%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/StatusSnapshot.cs (79%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/WorkList.cs (93%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Pool/WrapperPrm.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Services/AccountingServiceProvider.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Services/ApeManagerServiceProvider.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Services/ContainerServiceProvider.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Services/NetmapServiceProvider.cs (99%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Services/ObjectServiceProvider.cs (99%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Services/SessionServiceProvider.cs (94%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Services/Shared/ContextAccessor.cs (79%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Services/Shared/SessionProvider.cs (95%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/ClientContext.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/NetworkSettings.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/ObjectReader.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/ObjectStreamer.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/ObjectTools.cs (97%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/Range.cs (100%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/RangeReader.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/RequestConstructor.cs (95%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/RequestSigner.cs (98%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/SearchReader.cs (96%) rename src/{FrostFS.SDK.ClientV2 => FrostFS.SDK.Client}/Tools/Verifier.cs (97%) delete mode 100644 src/FrostFS.SDK.ClientV2/Ростелеком.txt delete mode 100644 src/FrostFS.SDK.ModelsV2/Client/ClientSettings.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Containers/ContainerId.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Containers/FrostFsContainer.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Enums/BasicAcl.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Enums/FrostFsObjectMatchType.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Enums/FrostFsObjectType.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Enums/FrostFsStatusCode.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Enums/NodeState.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Enums/SignatureScheme.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/FrostFS.SDK.ModelsV2.csproj delete mode 100644 src/FrostFS.SDK.ModelsV2/Misc/CallStatistics.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Misc/CheckSum.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Misc/Constants.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Netmap/FrostFsNodeInfo.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Netmap/FrostFsPlacementPolicy.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Netmap/FrostFsReplica.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Netmap/FrostFsVersion.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Netmap/NetmapInfo.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/FrostFsObject.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/IObjectReader.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/ObjectAttribute.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/ObjectFilter.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/ObjectHeader.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/ObjectId.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/OwnerId.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/SplitId.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Object/Splitter.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Response/FrostFsResponseStatus.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Response/FrostFsSignature.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Response/MetaHeader.cs delete mode 100644 src/FrostFS.SDK.ModelsV2/Session/FrostFsSessionToken.cs rename src/{FrostFS.SDK.ProtosV2/FrostFS.SDK.ProtosV2.csproj => FrostFS.SDK.Protos/FrostFS.SDK.Protos.csproj} (88%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/Interfaces/IMetaHeader.cs (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/Interfaces/IRequest.cs (80%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/Interfaces/IResponse.cs (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/Interfaces/IVerifiableMessage.cs (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/Interfaces/IVerificationHeader.cs (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/accounting/Extension.Message.cs (97%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/accounting/service.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/accounting/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/acl/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/ape/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/apemanager/Extension.Message.cs (98%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/apemanager/service.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/container/Extension.Message.cs (99%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/container/service.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/container/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/lock/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/netmap/Extension.Message.cs (98%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/netmap/service.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/netmap/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/object/Extension.Message.cs (99%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/object/service.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/object/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/refs/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/session/Extension.Message.cs (96%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/session/Extension.MetaHeader.cs (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/session/Extension.VerificationHeader.cs (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/session/Extension.XHeader.cs (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/session/service.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/session/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/status/types.proto (100%) rename src/{FrostFS.SDK.ProtosV2 => FrostFS.SDK.Protos}/tombstone/types.proto (100%) diff --git a/FrostFS.SDK.sln b/FrostFS.SDK.sln index 9d9fbbe..b96bda2 100644 --- a/FrostFS.SDK.sln +++ b/FrostFS.SDK.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.5.002.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrostFS.SDK.ClientV2", "src\FrostFS.SDK.ClientV2\FrostFS.SDK.ClientV2.csproj", "{50D8F61F-C302-4AC9-8D8A-AB0B8C0988C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrostFS.SDK.Client", "src\FrostFS.SDK.Client\FrostFS.SDK.Client.csproj", "{50D8F61F-C302-4AC9-8D8A-AB0B8C0988C3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrostFS.SDK.Cryptography", "src\FrostFS.SDK.Cryptography\FrostFS.SDK.Cryptography.csproj", "{3D804F4A-B0B2-47A5-B006-BE447BE64B50}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrostFS.SDK.ProtosV2", "src\FrostFS.SDK.ProtosV2\FrostFS.SDK.ProtosV2.csproj", "{5012EF96-9C9E-4E77-BC78-B4111EE54107}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrostFS.SDK.Protos", "src\FrostFS.SDK.Protos\FrostFS.SDK.Protos.csproj", "{5012EF96-9C9E-4E77-BC78-B4111EE54107}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrostFS.SDK.Tests", "src\FrostFS.SDK.Tests\FrostFS.SDK.Tests.csproj", "{8FDA7E0D-9C75-4874-988E-6592CD28F76C}" EndProject diff --git a/src/FrostFS.SDK.ClientV2/Caches.cs b/src/FrostFS.SDK.Client/Caches.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Caches.cs rename to src/FrostFS.SDK.Client/Caches.cs index ae6a290..9f2b3c2 100644 --- a/src/FrostFS.SDK.ClientV2/Caches.cs +++ b/src/FrostFS.SDK.Client/Caches.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Caching.Memory; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal static class Caches { diff --git a/src/FrostFS.SDK.ClientV2/CllientKey.cs b/src/FrostFS.SDK.Client/CllientKey.cs similarity index 89% rename from src/FrostFS.SDK.ClientV2/CllientKey.cs rename to src/FrostFS.SDK.Client/CllientKey.cs index a7542cb..cdafb3f 100644 --- a/src/FrostFS.SDK.ClientV2/CllientKey.cs +++ b/src/FrostFS.SDK.Client/CllientKey.cs @@ -4,7 +4,7 @@ using FrostFS.SDK.Cryptography; using Google.Protobuf; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class ClientKey(ECDsa key) { diff --git a/src/FrostFS.SDK.ClientV2/Exceptions/FrostFsException.cs b/src/FrostFS.SDK.Client/Exceptions/FrostFsException.cs similarity index 90% rename from src/FrostFS.SDK.ClientV2/Exceptions/FrostFsException.cs rename to src/FrostFS.SDK.Client/Exceptions/FrostFsException.cs index ba31b9d..9f3f36c 100644 --- a/src/FrostFS.SDK.ClientV2/Exceptions/FrostFsException.cs +++ b/src/FrostFS.SDK.Client/Exceptions/FrostFsException.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class FrostFsException : Exception { diff --git a/src/FrostFS.SDK.ClientV2/Exceptions/FrostFsInvalidObjectException.cs b/src/FrostFS.SDK.Client/Exceptions/FrostFsInvalidObjectException.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Exceptions/FrostFsInvalidObjectException.cs rename to src/FrostFS.SDK.Client/Exceptions/FrostFsInvalidObjectException.cs index 87e20e7..de1a88d 100644 --- a/src/FrostFS.SDK.ClientV2/Exceptions/FrostFsInvalidObjectException.cs +++ b/src/FrostFS.SDK.Client/Exceptions/FrostFsInvalidObjectException.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class FrostFsInvalidObjectException : FrostFsException { diff --git a/src/FrostFS.SDK.ClientV2/Exceptions/FrostFsResponseException.cs b/src/FrostFS.SDK.Client/Exceptions/FrostFsResponseException.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Exceptions/FrostFsResponseException.cs rename to src/FrostFS.SDK.Client/Exceptions/FrostFsResponseException.cs index 6ef30aa..61f4e98 100644 --- a/src/FrostFS.SDK.ClientV2/Exceptions/FrostFsResponseException.cs +++ b/src/FrostFS.SDK.Client/Exceptions/FrostFsResponseException.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class FrostFsResponseException : FrostFsException { diff --git a/src/FrostFS.SDK.ClientV2/Exceptions/FrostFsStreamException.cs b/src/FrostFS.SDK.Client/Exceptions/FrostFsStreamException.cs similarity index 90% rename from src/FrostFS.SDK.ClientV2/Exceptions/FrostFsStreamException.cs rename to src/FrostFS.SDK.Client/Exceptions/FrostFsStreamException.cs index 45472e4..0bd40d5 100644 --- a/src/FrostFS.SDK.ClientV2/Exceptions/FrostFsStreamException.cs +++ b/src/FrostFS.SDK.Client/Exceptions/FrostFsStreamException.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class FrostFsStreamException : FrostFsException { diff --git a/src/FrostFS.SDK.ClientV2/Exceptions/SessionExpiredException.cs b/src/FrostFS.SDK.Client/Exceptions/SessionExpiredException.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Exceptions/SessionExpiredException.cs rename to src/FrostFS.SDK.Client/Exceptions/SessionExpiredException.cs index 44404dd..0fa6a82 100644 --- a/src/FrostFS.SDK.ClientV2/Exceptions/SessionExpiredException.cs +++ b/src/FrostFS.SDK.Client/Exceptions/SessionExpiredException.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class SessionExpiredException : FrostFsException { diff --git a/src/FrostFS.SDK.ClientV2/Exceptions/SessionNotFoundException.cs b/src/FrostFS.SDK.Client/Exceptions/SessionNotFoundException.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Exceptions/SessionNotFoundException.cs rename to src/FrostFS.SDK.Client/Exceptions/SessionNotFoundException.cs index 5ec0a09..c5be848 100644 --- a/src/FrostFS.SDK.ClientV2/Exceptions/SessionNotFoundException.cs +++ b/src/FrostFS.SDK.Client/Exceptions/SessionNotFoundException.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class SessionNotFoundException : FrostFsException { diff --git a/src/FrostFS.SDK.ClientV2/FrostFS.SDK.ClientV2.csproj b/src/FrostFS.SDK.Client/FrostFS.SDK.Client.csproj similarity index 85% rename from src/FrostFS.SDK.ClientV2/FrostFS.SDK.ClientV2.csproj rename to src/FrostFS.SDK.Client/FrostFS.SDK.Client.csproj index fefaaf2..e175d13 100644 --- a/src/FrostFS.SDK.ClientV2/FrostFS.SDK.ClientV2.csproj +++ b/src/FrostFS.SDK.Client/FrostFS.SDK.Client.csproj @@ -8,11 +8,11 @@ - true + true - true + true @@ -30,7 +30,7 @@ - + diff --git a/src/FrostFS.SDK.ClientV2/FrostFSClient.cs b/src/FrostFS.SDK.Client/FrostFSClient.cs similarity index 99% rename from src/FrostFS.SDK.ClientV2/FrostFSClient.cs rename to src/FrostFS.SDK.Client/FrostFSClient.cs index a7bfff4..4112a5b 100644 --- a/src/FrostFS.SDK.ClientV2/FrostFSClient.cs +++ b/src/FrostFS.SDK.Client/FrostFSClient.cs @@ -10,8 +10,8 @@ using FrostFS.Accounting; using FrostFS.Container; using FrostFS.Netmap; using FrostFS.Object; -using FrostFS.SDK.ClientV2.Interfaces; -using FrostFS.SDK.ClientV2.Services; +using FrostFS.SDK.Client.Interfaces; +using FrostFS.SDK.Client.Services; using FrostFS.SDK.Cryptography; using FrostFS.Session; @@ -21,7 +21,7 @@ using Grpc.Net.Client; using Microsoft.Extensions.Options; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class FrostFSClient : IFrostFSClient { diff --git a/src/FrostFS.SDK.ClientV2/GlobalSuppressions.cs b/src/FrostFS.SDK.Client/GlobalSuppressions.cs similarity index 87% rename from src/FrostFS.SDK.ClientV2/GlobalSuppressions.cs rename to src/FrostFS.SDK.Client/GlobalSuppressions.cs index c87cda6..29a5b5c 100644 --- a/src/FrostFS.SDK.ClientV2/GlobalSuppressions.cs +++ b/src/FrostFS.SDK.Client/GlobalSuppressions.cs @@ -5,4 +5,4 @@ using System.Diagnostics.CodeAnalysis; -[assembly: SuppressMessage("Security", "CA5394:Do not use insecure randomness", Justification = "", Scope = "member", Target = "~M:FrostFS.SDK.ClientV2.Sampler.Next~System.Int32")] +[assembly: SuppressMessage("Security", "CA5394:Do not use insecure randomness", Justification = "", Scope = "member", Target = "~M:FrostFS.SDK.Client.Sampler.Next~System.Int32")] diff --git a/src/FrostFS.SDK.ClientV2/Interceptors/ErrorInterceptor.cs b/src/FrostFS.SDK.Client/Interceptors/ErrorInterceptor.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Interceptors/ErrorInterceptor.cs rename to src/FrostFS.SDK.Client/Interceptors/ErrorInterceptor.cs index d76477f..771a0f2 100644 --- a/src/FrostFS.SDK.ClientV2/Interceptors/ErrorInterceptor.cs +++ b/src/FrostFS.SDK.Client/Interceptors/ErrorInterceptor.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Grpc.Core; using Grpc.Core.Interceptors; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1062:Validate arguments of public methods", Justification = "parameters are provided by GRPC infrastructure")] diff --git a/src/FrostFS.SDK.ClientV2/Interceptors/MetricsInterceptor.cs b/src/FrostFS.SDK.Client/Interceptors/MetricsInterceptor.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Interceptors/MetricsInterceptor.cs rename to src/FrostFS.SDK.Client/Interceptors/MetricsInterceptor.cs index f4d93c0..414551e 100644 --- a/src/FrostFS.SDK.ClientV2/Interceptors/MetricsInterceptor.cs +++ b/src/FrostFS.SDK.Client/Interceptors/MetricsInterceptor.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Grpc.Core; using Grpc.Core.Interceptors; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1062:Validate arguments of public methods", Justification = "parameters are provided by GRPC infrastructure")] diff --git a/src/FrostFS.SDK.ClientV2/Interfaces/IFrostFSClient.cs b/src/FrostFS.SDK.Client/Interfaces/IFrostFSClient.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Interfaces/IFrostFSClient.cs rename to src/FrostFS.SDK.Client/Interfaces/IFrostFSClient.cs index 8e4bae4..456962f 100644 --- a/src/FrostFS.SDK.ClientV2/Interfaces/IFrostFSClient.cs +++ b/src/FrostFS.SDK.Client/Interfaces/IFrostFSClient.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using Frostfs.V2.Ape; -namespace FrostFS.SDK.ClientV2.Interfaces; + +namespace FrostFS.SDK.Client.Interfaces; public interface IFrostFSClient : IDisposable { diff --git a/src/FrostFS.SDK.ClientV2/Logging/FrostFsMessages.cs b/src/FrostFS.SDK.Client/Logging/FrostFsMessages.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Logging/FrostFsMessages.cs rename to src/FrostFS.SDK.Client/Logging/FrostFsMessages.cs index 2fd1fe1..b5e78ab 100644 --- a/src/FrostFS.SDK.ClientV2/Logging/FrostFsMessages.cs +++ b/src/FrostFS.SDK.Client/Logging/FrostFsMessages.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal static partial class FrostFsMessages { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Container.cs b/src/FrostFS.SDK.Client/Mappers/Container.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Mappers/Container.cs rename to src/FrostFS.SDK.Client/Mappers/Container.cs index e631472..7355c4a 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Container.cs +++ b/src/FrostFS.SDK.Client/Mappers/Container.cs @@ -3,7 +3,7 @@ using System.Linq; using FrostFS.SDK.Cryptography; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class ContainerMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/ContainerId.cs b/src/FrostFS.SDK.Client/Mappers/ContainerId.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Mappers/ContainerId.cs rename to src/FrostFS.SDK.Client/Mappers/ContainerId.cs index c4c805c..fe8632f 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/ContainerId.cs +++ b/src/FrostFS.SDK.Client/Mappers/ContainerId.cs @@ -7,7 +7,7 @@ using Google.Protobuf; using Microsoft.Extensions.Caching.Memory; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class ContainerIdMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/MetaHeader.cs b/src/FrostFS.SDK.Client/Mappers/MetaHeader.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Mappers/MetaHeader.cs rename to src/FrostFS.SDK.Client/Mappers/MetaHeader.cs index 5bf994e..e4ab8a2 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/MetaHeader.cs +++ b/src/FrostFS.SDK.Client/Mappers/MetaHeader.cs @@ -2,7 +2,7 @@ using System; using FrostFS.Session; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class MetaHeaderMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Netmap/Netmap.cs b/src/FrostFS.SDK.Client/Mappers/Netmap/Netmap.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Mappers/Netmap/Netmap.cs rename to src/FrostFS.SDK.Client/Mappers/Netmap/Netmap.cs index 6729501..be378fc 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Netmap/Netmap.cs +++ b/src/FrostFS.SDK.Client/Mappers/Netmap/Netmap.cs @@ -3,7 +3,7 @@ using System.Linq; using FrostFS.Netmap; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public static class NetmapMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Netmap/NodeInfo.cs b/src/FrostFS.SDK.Client/Mappers/Netmap/NodeInfo.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Mappers/Netmap/NodeInfo.cs rename to src/FrostFS.SDK.Client/Mappers/Netmap/NodeInfo.cs index d882127..747468b 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Netmap/NodeInfo.cs +++ b/src/FrostFS.SDK.Client/Mappers/Netmap/NodeInfo.cs @@ -2,9 +2,9 @@ using System; using System.Linq; using FrostFS.Netmap; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Mappers.GRPC; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public static class NodeInfoMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Netmap/PlacementPolicy.cs b/src/FrostFS.SDK.Client/Mappers/Netmap/PlacementPolicy.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Mappers/Netmap/PlacementPolicy.cs rename to src/FrostFS.SDK.Client/Mappers/Netmap/PlacementPolicy.cs index c44a397..5f1600c 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Netmap/PlacementPolicy.cs +++ b/src/FrostFS.SDK.Client/Mappers/Netmap/PlacementPolicy.cs @@ -3,7 +3,7 @@ using System.Linq; using FrostFS.Netmap; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public static class PlacementPolicyMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Netmap/Replica.cs b/src/FrostFS.SDK.Client/Mappers/Netmap/Replica.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Mappers/Netmap/Replica.cs rename to src/FrostFS.SDK.Client/Mappers/Netmap/Replica.cs index d9ea0cd..f0ace94 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Netmap/Replica.cs +++ b/src/FrostFS.SDK.Client/Mappers/Netmap/Replica.cs @@ -2,7 +2,7 @@ using System; using FrostFS.Netmap; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public static class ReplicaMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Object/Object.cs b/src/FrostFS.SDK.Client/Mappers/Object/Object.cs similarity index 85% rename from src/FrostFS.SDK.ClientV2/Mappers/Object/Object.cs rename to src/FrostFS.SDK.Client/Mappers/Object/Object.cs index d9f5d13..b9d1520 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Object/Object.cs +++ b/src/FrostFS.SDK.Client/Mappers/Object/Object.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; internal static class ObjectMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectAttributeMapper.cs b/src/FrostFS.SDK.Client/Mappers/Object/ObjectAttributeMapper.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectAttributeMapper.cs rename to src/FrostFS.SDK.Client/Mappers/Object/ObjectAttributeMapper.cs index 85c7c5a..cfec8fd 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectAttributeMapper.cs +++ b/src/FrostFS.SDK.Client/Mappers/Object/ObjectAttributeMapper.cs @@ -2,7 +2,7 @@ using System; using FrostFS.Object; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class ObjectAttributeMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectFilterMapper.cs b/src/FrostFS.SDK.Client/Mappers/Object/ObjectFilterMapper.cs similarity index 95% rename from src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectFilterMapper.cs rename to src/FrostFS.SDK.Client/Mappers/Object/ObjectFilterMapper.cs index 76d1c92..249045d 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectFilterMapper.cs +++ b/src/FrostFS.SDK.Client/Mappers/Object/ObjectFilterMapper.cs @@ -2,7 +2,7 @@ using System; using FrostFS.Object; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class ObjectFilterMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectHeaderMapper.cs b/src/FrostFS.SDK.Client/Mappers/Object/ObjectHeaderMapper.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectHeaderMapper.cs rename to src/FrostFS.SDK.Client/Mappers/Object/ObjectHeaderMapper.cs index bdeb862..1ee29a6 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectHeaderMapper.cs +++ b/src/FrostFS.SDK.Client/Mappers/Object/ObjectHeaderMapper.cs @@ -5,7 +5,7 @@ using System.Linq; using FrostFS.Object; using FrostFS.SDK.Cryptography; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class ObjectHeaderMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectId.cs b/src/FrostFS.SDK.Client/Mappers/Object/ObjectId.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectId.cs rename to src/FrostFS.SDK.Client/Mappers/Object/ObjectId.cs index 10f8409..373edfb 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Object/ObjectId.cs +++ b/src/FrostFS.SDK.Client/Mappers/Object/ObjectId.cs @@ -4,7 +4,7 @@ using FrostFS.Refs; using Google.Protobuf; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class ObjectIdMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/OwnerId.cs b/src/FrostFS.SDK.Client/Mappers/OwnerId.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Mappers/OwnerId.cs rename to src/FrostFS.SDK.Client/Mappers/OwnerId.cs index c2e61e6..297178a 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/OwnerId.cs +++ b/src/FrostFS.SDK.Client/Mappers/OwnerId.cs @@ -7,7 +7,7 @@ using Google.Protobuf; using Microsoft.Extensions.Caching.Memory; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class OwnerIdMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Session/SessionMapper.cs b/src/FrostFS.SDK.Client/Mappers/Session/SessionMapper.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Mappers/Session/SessionMapper.cs rename to src/FrostFS.SDK.Client/Mappers/Session/SessionMapper.cs index 9f4a36f..d1307e8 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Session/SessionMapper.cs +++ b/src/FrostFS.SDK.Client/Mappers/Session/SessionMapper.cs @@ -2,7 +2,7 @@ using System; using Google.Protobuf; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public static class SessionMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/SignatureMapper.cs b/src/FrostFS.SDK.Client/Mappers/SignatureMapper.cs similarity index 95% rename from src/FrostFS.SDK.ClientV2/Mappers/SignatureMapper.cs rename to src/FrostFS.SDK.Client/Mappers/SignatureMapper.cs index d3bf988..88b4ac8 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/SignatureMapper.cs +++ b/src/FrostFS.SDK.Client/Mappers/SignatureMapper.cs @@ -2,7 +2,7 @@ using System; using Google.Protobuf; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class SignatureMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Status.cs b/src/FrostFS.SDK.Client/Mappers/Status.cs similarity index 92% rename from src/FrostFS.SDK.ClientV2/Mappers/Status.cs rename to src/FrostFS.SDK.Client/Mappers/Status.cs index ad9ea7d..f39b1fe 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Status.cs +++ b/src/FrostFS.SDK.Client/Mappers/Status.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class StatusMapper { diff --git a/src/FrostFS.SDK.ClientV2/Mappers/Version.cs b/src/FrostFS.SDK.Client/Mappers/Version.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Mappers/Version.cs rename to src/FrostFS.SDK.Client/Mappers/Version.cs index d4cc254..a66df6e 100644 --- a/src/FrostFS.SDK.ClientV2/Mappers/Version.cs +++ b/src/FrostFS.SDK.Client/Mappers/Version.cs @@ -3,7 +3,7 @@ using System.Threading; using FrostFS.Refs; -namespace FrostFS.SDK.ClientV2.Mappers.GRPC; +namespace FrostFS.SDK.Client.Mappers.GRPC; public static class VersionMapper { diff --git a/src/FrostFS.SDK.ClientV2/Models/Chain/ChainTarget.cs b/src/FrostFS.SDK.Client/Models/Chain/ChainTarget.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Models/Chain/ChainTarget.cs rename to src/FrostFS.SDK.Client/Models/Chain/ChainTarget.cs index a009df2..dbdde51 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Chain/ChainTarget.cs +++ b/src/FrostFS.SDK.Client/Models/Chain/ChainTarget.cs @@ -2,7 +2,7 @@ using Frostfs.V2.Ape; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public struct FrostFsChainTarget(FrostFsTargetType type, string name) : IEquatable { diff --git a/src/FrostFS.SDK.ClientV2/Models/Chain/FrostFsChain.cs b/src/FrostFS.SDK.Client/Models/Chain/FrostFsChain.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Models/Chain/FrostFsChain.cs rename to src/FrostFS.SDK.Client/Models/Chain/FrostFsChain.cs index 1f4d251..70bf093 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Chain/FrostFsChain.cs +++ b/src/FrostFS.SDK.Client/Models/Chain/FrostFsChain.cs @@ -1,6 +1,6 @@ using Google.Protobuf; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public struct FrostFsChain(byte[] raw) : System.IEquatable { diff --git a/src/FrostFS.SDK.ClientV2/Models/Chain/FrostFsTargetType.cs b/src/FrostFS.SDK.Client/Models/Chain/FrostFsTargetType.cs similarity index 74% rename from src/FrostFS.SDK.ClientV2/Models/Chain/FrostFsTargetType.cs rename to src/FrostFS.SDK.Client/Models/Chain/FrostFsTargetType.cs index ed5fa27..d5379f8 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Chain/FrostFsTargetType.cs +++ b/src/FrostFS.SDK.Client/Models/Chain/FrostFsTargetType.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public enum FrostFsTargetType { diff --git a/src/FrostFS.SDK.ClientV2/Models/Client/ClientSettings.cs b/src/FrostFS.SDK.Client/Models/Client/ClientSettings.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Client/ClientSettings.cs rename to src/FrostFS.SDK.Client/Models/Client/ClientSettings.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Containers/FrostFsContainerId.cs b/src/FrostFS.SDK.Client/Models/Containers/FrostFsContainerId.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Models/Containers/FrostFsContainerId.cs rename to src/FrostFS.SDK.Client/Models/Containers/FrostFsContainerId.cs index 06b87ca..f0b3fdf 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Containers/FrostFsContainerId.cs +++ b/src/FrostFS.SDK.Client/Models/Containers/FrostFsContainerId.cs @@ -1,6 +1,6 @@ using FrostFS.Refs; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; namespace FrostFS.SDK; diff --git a/src/FrostFS.SDK.ClientV2/Models/Containers/FrostFsContainerInfo.cs b/src/FrostFS.SDK.Client/Models/Containers/FrostFsContainerInfo.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Models/Containers/FrostFsContainerInfo.cs rename to src/FrostFS.SDK.Client/Models/Containers/FrostFsContainerInfo.cs index affdbee..6223a7f 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Containers/FrostFsContainerInfo.cs +++ b/src/FrostFS.SDK.Client/Models/Containers/FrostFsContainerInfo.cs @@ -2,8 +2,8 @@ using System; using System.Collections.ObjectModel; using System.Linq; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using Google.Protobuf; diff --git a/src/FrostFS.SDK.ClientV2/Models/Enums/FrostFsMatchType.cs b/src/FrostFS.SDK.Client/Models/Enums/FrostFsMatchType.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Enums/FrostFsMatchType.cs rename to src/FrostFS.SDK.Client/Models/Enums/FrostFsMatchType.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Enums/FrostFsObjectType.cs b/src/FrostFS.SDK.Client/Models/Enums/FrostFsObjectType.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Enums/FrostFsObjectType.cs rename to src/FrostFS.SDK.Client/Models/Enums/FrostFsObjectType.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Enums/FrostFsStatusCode.cs b/src/FrostFS.SDK.Client/Models/Enums/FrostFsStatusCode.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Enums/FrostFsStatusCode.cs rename to src/FrostFS.SDK.Client/Models/Enums/FrostFsStatusCode.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Enums/NodeState.cs b/src/FrostFS.SDK.Client/Models/Enums/NodeState.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Enums/NodeState.cs rename to src/FrostFS.SDK.Client/Models/Enums/NodeState.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Enums/SignatureScheme.cs b/src/FrostFS.SDK.Client/Models/Enums/SignatureScheme.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Enums/SignatureScheme.cs rename to src/FrostFS.SDK.Client/Models/Enums/SignatureScheme.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Misc/CallStatistics.cs b/src/FrostFS.SDK.Client/Models/Misc/CallStatistics.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Misc/CallStatistics.cs rename to src/FrostFS.SDK.Client/Models/Misc/CallStatistics.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Misc/CheckSum.cs b/src/FrostFS.SDK.Client/Models/Misc/CheckSum.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Misc/CheckSum.cs rename to src/FrostFS.SDK.Client/Models/Misc/CheckSum.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Misc/Constants.cs b/src/FrostFS.SDK.Client/Models/Misc/Constants.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Misc/Constants.cs rename to src/FrostFS.SDK.Client/Models/Misc/Constants.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsNetmapSnapshot.cs b/src/FrostFS.SDK.Client/Models/Netmap/FrostFsNetmapSnapshot.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsNetmapSnapshot.cs rename to src/FrostFS.SDK.Client/Models/Netmap/FrostFsNetmapSnapshot.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsNodeInfo.cs b/src/FrostFS.SDK.Client/Models/Netmap/FrostFsNodeInfo.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsNodeInfo.cs rename to src/FrostFS.SDK.Client/Models/Netmap/FrostFsNodeInfo.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsPlacementPolicy.cs b/src/FrostFS.SDK.Client/Models/Netmap/FrostFsPlacementPolicy.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsPlacementPolicy.cs rename to src/FrostFS.SDK.Client/Models/Netmap/FrostFsPlacementPolicy.cs index 62f7fb2..29c9310 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsPlacementPolicy.cs +++ b/src/FrostFS.SDK.Client/Models/Netmap/FrostFsPlacementPolicy.cs @@ -3,7 +3,7 @@ using System; using System.Linq; using FrostFS.Netmap; -using FrostFS.SDK.ClientV2; +using FrostFS.SDK.Client; namespace FrostFS.SDK; diff --git a/src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsReplica.cs b/src/FrostFS.SDK.Client/Models/Netmap/FrostFsReplica.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsReplica.cs rename to src/FrostFS.SDK.Client/Models/Netmap/FrostFsReplica.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsVersion.cs b/src/FrostFS.SDK.Client/Models/Netmap/FrostFsVersion.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsVersion.cs rename to src/FrostFS.SDK.Client/Models/Netmap/FrostFsVersion.cs index e63d9ac..6fd0afc 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Netmap/FrostFsVersion.cs +++ b/src/FrostFS.SDK.Client/Models/Netmap/FrostFsVersion.cs @@ -1,5 +1,5 @@ using FrostFS.Refs; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Mappers.GRPC; namespace FrostFS.SDK; diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsAddress.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsAddress.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsAddress.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsAddress.cs index 46581d1..bf17f18 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsAddress.cs +++ b/src/FrostFS.SDK.Client/Models/Object/FrostFsAddress.cs @@ -1,5 +1,5 @@ using FrostFS.Refs; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Mappers.GRPC; namespace FrostFS.SDK; diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsAttributePair.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsAttributePair.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsAttributePair.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsAttributePair.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsLargeObject.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsLargeObject.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsLargeObject.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsLargeObject.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsLinkObject.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsLinkObject.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsLinkObject.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsLinkObject.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObject.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsObject.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObject.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsObject.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObjectFilter.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsObjectFilter.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObjectFilter.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsObjectFilter.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObjectHeader.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsObjectHeader.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObjectHeader.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsObjectHeader.cs index ad8887f..4f1c5d0 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObjectHeader.cs +++ b/src/FrostFS.SDK.Client/Models/Object/FrostFsObjectHeader.cs @@ -4,7 +4,7 @@ using System.Linq; using FrostFS.Object; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Mappers.GRPC; namespace FrostFS.SDK; diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObjectId.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsObjectId.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsObjectId.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsObjectId.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsOwner.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsOwner.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsOwner.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsOwner.cs index 0a24164..1bd6754 100644 --- a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsOwner.cs +++ b/src/FrostFS.SDK.Client/Models/Object/FrostFsOwner.cs @@ -1,7 +1,7 @@ using System.Security.Cryptography; using FrostFS.Refs; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; namespace FrostFS.SDK; diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsRange.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsRange.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsRange.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsRange.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/FrostFsSplit.cs b/src/FrostFS.SDK.Client/Models/Object/FrostFsSplit.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/FrostFsSplit.cs rename to src/FrostFS.SDK.Client/Models/Object/FrostFsSplit.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/IObjectReader.cs b/src/FrostFS.SDK.Client/Models/Object/IObjectReader.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/IObjectReader.cs rename to src/FrostFS.SDK.Client/Models/Object/IObjectReader.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Object/SplitId.cs b/src/FrostFS.SDK.Client/Models/Object/SplitId.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Object/SplitId.cs rename to src/FrostFS.SDK.Client/Models/Object/SplitId.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Response/FrostFsResponseStatus.cs b/src/FrostFS.SDK.Client/Models/Response/FrostFsResponseStatus.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Response/FrostFsResponseStatus.cs rename to src/FrostFS.SDK.Client/Models/Response/FrostFsResponseStatus.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Response/FrostFsSignature.cs b/src/FrostFS.SDK.Client/Models/Response/FrostFsSignature.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Response/FrostFsSignature.cs rename to src/FrostFS.SDK.Client/Models/Response/FrostFsSignature.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Response/MetaHeader.cs b/src/FrostFS.SDK.Client/Models/Response/MetaHeader.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Response/MetaHeader.cs rename to src/FrostFS.SDK.Client/Models/Response/MetaHeader.cs diff --git a/src/FrostFS.SDK.ClientV2/Models/Session/FrostFsSessionToken.cs b/src/FrostFS.SDK.Client/Models/Session/FrostFsSessionToken.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Models/Session/FrostFsSessionToken.cs rename to src/FrostFS.SDK.Client/Models/Session/FrostFsSessionToken.cs diff --git a/src/FrostFS.SDK.ClientV2/Parameters/CallContext.cs b/src/FrostFS.SDK.Client/Parameters/CallContext.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Parameters/CallContext.cs rename to src/FrostFS.SDK.Client/Parameters/CallContext.cs index 24f076e..323a990 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/CallContext.cs +++ b/src/FrostFS.SDK.Client/Parameters/CallContext.cs @@ -9,7 +9,7 @@ using Google.Protobuf; using Grpc.Core.Interceptors; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class CallContext() { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/Credentials.cs b/src/FrostFS.SDK.Client/Parameters/Credentials.cs similarity index 85% rename from src/FrostFS.SDK.ClientV2/Parameters/Credentials.cs rename to src/FrostFS.SDK.Client/Parameters/Credentials.cs index ebc7558..6b712ff 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/Credentials.cs +++ b/src/FrostFS.SDK.Client/Parameters/Credentials.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class Credentials(ECDsa key, FrostFsOwner ownerId) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/IContext.cs b/src/FrostFS.SDK.Client/Parameters/IContext.cs similarity index 89% rename from src/FrostFS.SDK.ClientV2/Parameters/IContext.cs rename to src/FrostFS.SDK.Client/Parameters/IContext.cs index 128c6a0..ebf99a9 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/IContext.cs +++ b/src/FrostFS.SDK.Client/Parameters/IContext.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public interface IContext { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/ISessionToken.cs b/src/FrostFS.SDK.Client/Parameters/ISessionToken.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Parameters/ISessionToken.cs rename to src/FrostFS.SDK.Client/Parameters/ISessionToken.cs index cc3ed0f..6d07be0 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/ISessionToken.cs +++ b/src/FrostFS.SDK.Client/Parameters/ISessionToken.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public interface ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmApeChainList.cs b/src/FrostFS.SDK.Client/Parameters/PrmApeChainList.cs similarity index 82% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmApeChainList.cs rename to src/FrostFS.SDK.Client/Parameters/PrmApeChainList.cs index 4202685..a9a75bb 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmApeChainList.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmApeChainList.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmApeChainList(FrostFsChainTarget target, CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmApeChainRemove.cs b/src/FrostFS.SDK.Client/Parameters/PrmApeChainRemove.cs similarity index 87% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmApeChainRemove.cs rename to src/FrostFS.SDK.Client/Parameters/PrmApeChainRemove.cs index a7a9f5a..9773e6d 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmApeChainRemove.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmApeChainRemove.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmApeChainRemove(FrostFsChainTarget target, FrostFsChain chain, CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmApeRemoveAdd.cs b/src/FrostFS.SDK.Client/Parameters/PrmApeRemoveAdd.cs similarity index 86% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmApeRemoveAdd.cs rename to src/FrostFS.SDK.Client/Parameters/PrmApeRemoveAdd.cs index 75ac0e7..b74901f 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmApeRemoveAdd.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmApeRemoveAdd.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmApeChainAdd(FrostFsChainTarget target, FrostFsChain chain, CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmBalance.cs b/src/FrostFS.SDK.Client/Parameters/PrmBalance.cs similarity index 68% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmBalance.cs rename to src/FrostFS.SDK.Client/Parameters/PrmBalance.cs index df36980..6544287 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmBalance.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmBalance.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmBalance(CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmBase.cs b/src/FrostFS.SDK.Client/Parameters/PrmBase.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmBase.cs rename to src/FrostFS.SDK.Client/Parameters/PrmBase.cs index e6fb030..092be46 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmBase.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmBase.cs @@ -1,6 +1,6 @@ using System.Collections.Specialized; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class PrmBase(CallContext? ctx, NameValueCollection? xheaders = null) : IContext { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmContainerCreate.cs b/src/FrostFS.SDK.Client/Parameters/PrmContainerCreate.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmContainerCreate.cs rename to src/FrostFS.SDK.Client/Parameters/PrmContainerCreate.cs index 68eadc9..ea29967 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmContainerCreate.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmContainerCreate.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmContainerCreate(FrostFsContainerInfo container, CallContext? ctx = null) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmContainerDelete.cs b/src/FrostFS.SDK.Client/Parameters/PrmContainerDelete.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmContainerDelete.cs rename to src/FrostFS.SDK.Client/Parameters/PrmContainerDelete.cs index 9de85f8..e6b1d6d 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmContainerDelete.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmContainerDelete.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmContainerDelete(FrostFsContainerId containerId, CallContext? ctx = null) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmContainerGet.cs b/src/FrostFS.SDK.Client/Parameters/PrmContainerGet.cs similarity index 83% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmContainerGet.cs rename to src/FrostFS.SDK.Client/Parameters/PrmContainerGet.cs index 85f0821..723a4c2 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmContainerGet.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmContainerGet.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmContainerGet(FrostFsContainerId container, CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmContainerGetAll.cs b/src/FrostFS.SDK.Client/Parameters/PrmContainerGetAll.cs similarity index 70% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmContainerGetAll.cs rename to src/FrostFS.SDK.Client/Parameters/PrmContainerGetAll.cs index ceec0c1..66e2f9b 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmContainerGetAll.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmContainerGetAll.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmContainerGetAll(CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmNetmapSnapshot.cs b/src/FrostFS.SDK.Client/Parameters/PrmNetmapSnapshot.cs similarity index 70% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmNetmapSnapshot.cs rename to src/FrostFS.SDK.Client/Parameters/PrmNetmapSnapshot.cs index 0938f86..06a379c 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmNetmapSnapshot.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmNetmapSnapshot.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmNetmapSnapshot(CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmNetworkSettings.cs b/src/FrostFS.SDK.Client/Parameters/PrmNetworkSettings.cs similarity index 70% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmNetworkSettings.cs rename to src/FrostFS.SDK.Client/Parameters/PrmNetworkSettings.cs index de2c13d..9731d4d 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmNetworkSettings.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmNetworkSettings.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmNetworkSettings(CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmNodeInfo.cs b/src/FrostFS.SDK.Client/Parameters/PrmNodeInfo.cs similarity index 68% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmNodeInfo.cs rename to src/FrostFS.SDK.Client/Parameters/PrmNodeInfo.cs index dbbcdd8..e93b94f 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmNodeInfo.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmNodeInfo.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmNodeInfo(CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectDelete.cs b/src/FrostFS.SDK.Client/Parameters/PrmObjectDelete.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmObjectDelete.cs rename to src/FrostFS.SDK.Client/Parameters/PrmObjectDelete.cs index e168b31..9a42958 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectDelete.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmObjectDelete.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmObjectDelete(FrostFsContainerId containerId, FrostFsObjectId objectId, CallContext? ctx = null) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectGet.cs b/src/FrostFS.SDK.Client/Parameters/PrmObjectGet.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmObjectGet.cs rename to src/FrostFS.SDK.Client/Parameters/PrmObjectGet.cs index 11e64d7..a50a657 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectGet.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmObjectGet.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmObjectGet(FrostFsContainerId containerId, FrostFsObjectId objectId, CallContext? ctx = null) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectHeadGet.cs b/src/FrostFS.SDK.Client/Parameters/PrmObjectHeadGet.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmObjectHeadGet.cs rename to src/FrostFS.SDK.Client/Parameters/PrmObjectHeadGet.cs index 0b948b7..84fed94 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectHeadGet.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmObjectHeadGet.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmObjectHeadGet(FrostFsContainerId containerId, FrostFsObjectId objectId, CallContext? ctx = null) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectPatch.cs b/src/FrostFS.SDK.Client/Parameters/PrmObjectPatch.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmObjectPatch.cs rename to src/FrostFS.SDK.Client/Parameters/PrmObjectPatch.cs index de292ea..2feb84c 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectPatch.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmObjectPatch.cs @@ -1,6 +1,6 @@ using System.IO; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmObjectPatch(FrostFsAddress address, CallContext? ctx = null) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectPut.cs b/src/FrostFS.SDK.Client/Parameters/PrmObjectPut.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmObjectPut.cs rename to src/FrostFS.SDK.Client/Parameters/PrmObjectPut.cs index 47a1e1e..582d3f5 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectPut.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmObjectPut.cs @@ -1,6 +1,6 @@ using System.IO; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmObjectPut(CallContext? ctx = null) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectSearch.cs b/src/FrostFS.SDK.Client/Parameters/PrmObjectSearch.cs similarity index 95% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmObjectSearch.cs rename to src/FrostFS.SDK.Client/Parameters/PrmObjectSearch.cs index 723c1e7..2e6d3d2 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmObjectSearch.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmObjectSearch.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmObjectSearch(FrostFsContainerId containerId, CallContext? ctx = null, params IObjectFilter[] filters) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmRangeGet.cs b/src/FrostFS.SDK.Client/Parameters/PrmRangeGet.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmRangeGet.cs rename to src/FrostFS.SDK.Client/Parameters/PrmRangeGet.cs index 5bcad9f..60286f4 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmRangeGet.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmRangeGet.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmRangeGet( FrostFsContainerId containerId, diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmRangeHashGet.cs b/src/FrostFS.SDK.Client/Parameters/PrmRangeHashGet.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmRangeHashGet.cs rename to src/FrostFS.SDK.Client/Parameters/PrmRangeHashGet.cs index 661ed64..95853d7 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmRangeHashGet.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmRangeHashGet.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmRangeHashGet( FrostFsContainerId containerId, diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmSessionCreate.cs b/src/FrostFS.SDK.Client/Parameters/PrmSessionCreate.cs similarity index 81% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmSessionCreate.cs rename to src/FrostFS.SDK.Client/Parameters/PrmSessionCreate.cs index ab02f69..7fdc3de 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmSessionCreate.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmSessionCreate.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmSessionCreate(ulong expiration, CallContext? ctx = null) : PrmBase(ctx) { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmSingleObjectPut.cs b/src/FrostFS.SDK.Client/Parameters/PrmSingleObjectPut.cs similarity index 88% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmSingleObjectPut.cs rename to src/FrostFS.SDK.Client/Parameters/PrmSingleObjectPut.cs index 8cb8c19..6e5d180 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmSingleObjectPut.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmSingleObjectPut.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class PrmSingleObjectPut(FrostFsObject frostFsObject, CallContext? ctx = null) : PrmBase(ctx), ISessionToken { diff --git a/src/FrostFS.SDK.ClientV2/Parameters/PrmWait.cs b/src/FrostFS.SDK.Client/Parameters/PrmWait.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Parameters/PrmWait.cs rename to src/FrostFS.SDK.Client/Parameters/PrmWait.cs index d914719..047f446 100644 --- a/src/FrostFS.SDK.ClientV2/Parameters/PrmWait.cs +++ b/src/FrostFS.SDK.Client/Parameters/PrmWait.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class PrmWait(TimeSpan timeout, TimeSpan pollInterval) { diff --git a/src/FrostFS.SDK.ClientV2/Pool/ClientStatusMonitor.cs b/src/FrostFS.SDK.Client/Pool/ClientStatusMonitor.cs similarity index 99% rename from src/FrostFS.SDK.ClientV2/Pool/ClientStatusMonitor.cs rename to src/FrostFS.SDK.Client/Pool/ClientStatusMonitor.cs index 7200b37..c05c24c 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/ClientStatusMonitor.cs +++ b/src/FrostFS.SDK.Client/Pool/ClientStatusMonitor.cs @@ -3,7 +3,7 @@ using System.Threading; using Microsoft.Extensions.Logging; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; // clientStatusMonitor count error rate and other statistics for connection. public class ClientStatusMonitor : IClientStatus diff --git a/src/FrostFS.SDK.ClientV2/Pool/ClientWrapper.cs b/src/FrostFS.SDK.Client/Pool/ClientWrapper.cs similarity index 81% rename from src/FrostFS.SDK.ClientV2/Pool/ClientWrapper.cs rename to src/FrostFS.SDK.Client/Pool/ClientWrapper.cs index 206f69e..7e50337 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/ClientWrapper.cs +++ b/src/FrostFS.SDK.Client/Pool/ClientWrapper.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Grpc.Core; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; // clientWrapper is used by default, alternative implementations are intended for testing purposes only. public class ClientWrapper : ClientStatusMonitor @@ -101,27 +101,41 @@ public class ClientWrapper : ClientStatusMonitor await ScheduleGracefulClose().ConfigureAwait(false); } - //#pragma warning disable CA2000 // Dispose objects before losing scope: will be disposed manually - FrostFSClient client = new(WrapperPrm, sessionCache); - //#pragma warning restore CA2000 + FrostFSClient? client = null; - //TODO: set additioanl params - var error = await client.Dial(ctx).ConfigureAwait(false); - if (!string.IsNullOrEmpty(error)) + try { - SetUnhealthyOnDial(); - return wasHealthy; + client = new(WrapperPrm, sessionCache); + + var dialCtx = new CallContext + { + Timeout = TimeSpan.FromTicks((long)WrapperPrm.DialTimeout), + CancellationToken = ctx.CancellationToken + }; + + var error = await client.Dial(ctx).ConfigureAwait(false); + if (!string.IsNullOrEmpty(error)) + { + SetUnhealthyOnDial(); + return wasHealthy; + } + + lock (_lock) + { + Client = client; + } + + client = null; } - - lock (_lock) + finally { - Client = client; + client?.Dispose(); } try { var prmNodeInfo = new PrmNodeInfo(ctx); - var res = await client.GetNodeInfoAsync(prmNodeInfo).ConfigureAwait(false); + var res = await Client.GetNodeInfoAsync(prmNodeInfo).ConfigureAwait(false); } catch (FrostFsException) { diff --git a/src/FrostFS.SDK.ClientV2/Pool/HealthyStatus.cs b/src/FrostFS.SDK.Client/Pool/HealthyStatus.cs similarity index 95% rename from src/FrostFS.SDK.ClientV2/Pool/HealthyStatus.cs rename to src/FrostFS.SDK.Client/Pool/HealthyStatus.cs index f87c1dd..d02e6bb 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/HealthyStatus.cs +++ b/src/FrostFS.SDK.Client/Pool/HealthyStatus.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; // values for healthy status of clientStatusMonitor. public enum HealthyStatus diff --git a/src/FrostFS.SDK.ClientV2/Pool/IClientStatus.cs b/src/FrostFS.SDK.Client/Pool/IClientStatus.cs similarity index 95% rename from src/FrostFS.SDK.ClientV2/Pool/IClientStatus.cs rename to src/FrostFS.SDK.Client/Pool/IClientStatus.cs index cbf597e..0c08fac 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/IClientStatus.cs +++ b/src/FrostFS.SDK.Client/Pool/IClientStatus.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public interface IClientStatus { diff --git a/src/FrostFS.SDK.ClientV2/Pool/InitParameters.cs b/src/FrostFS.SDK.Client/Pool/InitParameters.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Pool/InitParameters.cs rename to src/FrostFS.SDK.Client/Pool/InitParameters.cs index f02bd9e..480820e 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/InitParameters.cs +++ b/src/FrostFS.SDK.Client/Pool/InitParameters.cs @@ -5,7 +5,7 @@ using Grpc.Net.Client; using Microsoft.Extensions.Logging; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; // InitParameters contains values used to initialize connection Pool. public class InitParameters diff --git a/src/FrostFS.SDK.ClientV2/Pool/InnerPool.cs b/src/FrostFS.SDK.Client/Pool/InnerPool.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Pool/InnerPool.cs rename to src/FrostFS.SDK.Client/Pool/InnerPool.cs index 104f1f1..f712552 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/InnerPool.cs +++ b/src/FrostFS.SDK.Client/Pool/InnerPool.cs @@ -1,4 +1,4 @@ -using FrostFS.SDK.ClientV2; +using FrostFS.SDK.Client; internal sealed class InnerPool { diff --git a/src/FrostFS.SDK.ClientV2/Pool/MethodIndex.cs b/src/FrostFS.SDK.Client/Pool/MethodIndex.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Pool/MethodIndex.cs rename to src/FrostFS.SDK.Client/Pool/MethodIndex.cs index 8a7008b..53e5430 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/MethodIndex.cs +++ b/src/FrostFS.SDK.Client/Pool/MethodIndex.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public enum MethodIndex { diff --git a/src/FrostFS.SDK.ClientV2/Pool/MethodStatus.cs b/src/FrostFS.SDK.Client/Pool/MethodStatus.cs similarity index 91% rename from src/FrostFS.SDK.ClientV2/Pool/MethodStatus.cs rename to src/FrostFS.SDK.Client/Pool/MethodStatus.cs index 33cad49..8f40f3c 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/MethodStatus.cs +++ b/src/FrostFS.SDK.Client/Pool/MethodStatus.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class MethodStatus(string name) { diff --git a/src/FrostFS.SDK.ClientV2/Pool/NodeParam.cs b/src/FrostFS.SDK.Client/Pool/NodeParam.cs similarity index 92% rename from src/FrostFS.SDK.ClientV2/Pool/NodeParam.cs rename to src/FrostFS.SDK.Client/Pool/NodeParam.cs index f95772b..92c2560 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/NodeParam.cs +++ b/src/FrostFS.SDK.Client/Pool/NodeParam.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; // NodeParam groups parameters of remote node. [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "")] diff --git a/src/FrostFS.SDK.ClientV2/Pool/NodeStatistic.cs b/src/FrostFS.SDK.Client/Pool/NodeStatistic.cs similarity index 87% rename from src/FrostFS.SDK.ClientV2/Pool/NodeStatistic.cs rename to src/FrostFS.SDK.Client/Pool/NodeStatistic.cs index d51aa83..9323d93 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/NodeStatistic.cs +++ b/src/FrostFS.SDK.Client/Pool/NodeStatistic.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class NodeStatistic { diff --git a/src/FrostFS.SDK.ClientV2/Pool/NodesParam.cs b/src/FrostFS.SDK.Client/Pool/NodesParam.cs similarity index 88% rename from src/FrostFS.SDK.ClientV2/Pool/NodesParam.cs rename to src/FrostFS.SDK.Client/Pool/NodesParam.cs index eaeef7c..be9f012 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/NodesParam.cs +++ b/src/FrostFS.SDK.Client/Pool/NodesParam.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class NodesParam(int priority) { diff --git a/src/FrostFS.SDK.ClientV2/Pool/Pool.cs b/src/FrostFS.SDK.Client/Pool/Pool.cs similarity index 99% rename from src/FrostFS.SDK.ClientV2/Pool/Pool.cs rename to src/FrostFS.SDK.Client/Pool/Pool.cs index 00abda2..105978d 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/Pool.cs +++ b/src/FrostFS.SDK.Client/Pool/Pool.cs @@ -8,8 +8,8 @@ using System.Threading.Tasks; using Frostfs.V2.Ape; using FrostFS.Refs; -using FrostFS.SDK.ClientV2.Interfaces; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Interfaces; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using Grpc.Core; @@ -17,7 +17,7 @@ using Grpc.Core; using Microsoft.Extensions.Logging; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public partial class Pool : IFrostFSClient { diff --git a/src/FrostFS.SDK.ClientV2/Pool/RebalanceParameters.cs b/src/FrostFS.SDK.Client/Pool/RebalanceParameters.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Pool/RebalanceParameters.cs rename to src/FrostFS.SDK.Client/Pool/RebalanceParameters.cs index a443b2d..988002c 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/RebalanceParameters.cs +++ b/src/FrostFS.SDK.Client/Pool/RebalanceParameters.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class RebalanceParameters( NodesParam[] nodesParams, diff --git a/src/FrostFS.SDK.ClientV2/Pool/RequestInfo.cs b/src/FrostFS.SDK.Client/Pool/RequestInfo.cs similarity index 87% rename from src/FrostFS.SDK.ClientV2/Pool/RequestInfo.cs rename to src/FrostFS.SDK.Client/Pool/RequestInfo.cs index 9eb931f..3b70650 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/RequestInfo.cs +++ b/src/FrostFS.SDK.Client/Pool/RequestInfo.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; // RequestInfo groups info about pool request. struct RequestInfo diff --git a/src/FrostFS.SDK.ClientV2/Pool/Sampler.cs b/src/FrostFS.SDK.Client/Pool/Sampler.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Pool/Sampler.cs rename to src/FrostFS.SDK.Client/Pool/Sampler.cs index 0d4a1e0..275f3f0 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/Sampler.cs +++ b/src/FrostFS.SDK.Client/Pool/Sampler.cs @@ -1,6 +1,6 @@ using System; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class Sampler { diff --git a/src/FrostFS.SDK.ClientV2/Pool/SessionCache.cs b/src/FrostFS.SDK.Client/Pool/SessionCache.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Pool/SessionCache.cs rename to src/FrostFS.SDK.Client/Pool/SessionCache.cs index f65046f..829b1c9 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/SessionCache.cs +++ b/src/FrostFS.SDK.Client/Pool/SessionCache.cs @@ -1,7 +1,7 @@ using System; using System.Collections; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal struct SessionCache(ulong sessionExpirationDuration) { diff --git a/src/FrostFS.SDK.ClientV2/Pool/Statistic.cs b/src/FrostFS.SDK.Client/Pool/Statistic.cs similarity index 88% rename from src/FrostFS.SDK.ClientV2/Pool/Statistic.cs rename to src/FrostFS.SDK.Client/Pool/Statistic.cs index 58fa72d..c4977d5 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/Statistic.cs +++ b/src/FrostFS.SDK.Client/Pool/Statistic.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class Statistic { diff --git a/src/FrostFS.SDK.ClientV2/Pool/StatusSnapshot.cs b/src/FrostFS.SDK.Client/Pool/StatusSnapshot.cs similarity index 79% rename from src/FrostFS.SDK.ClientV2/Pool/StatusSnapshot.cs rename to src/FrostFS.SDK.Client/Pool/StatusSnapshot.cs index 9434cb9..2156f99 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/StatusSnapshot.cs +++ b/src/FrostFS.SDK.Client/Pool/StatusSnapshot.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class StatusSnapshot() { diff --git a/src/FrostFS.SDK.ClientV2/Pool/WorkList.cs b/src/FrostFS.SDK.Client/Pool/WorkList.cs similarity index 93% rename from src/FrostFS.SDK.ClientV2/Pool/WorkList.cs rename to src/FrostFS.SDK.Client/Pool/WorkList.cs index 39551f4..7796e86 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/WorkList.cs +++ b/src/FrostFS.SDK.Client/Pool/WorkList.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class WorkList { diff --git a/src/FrostFS.SDK.ClientV2/Pool/WrapperPrm.cs b/src/FrostFS.SDK.Client/Pool/WrapperPrm.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Pool/WrapperPrm.cs rename to src/FrostFS.SDK.Client/Pool/WrapperPrm.cs index b389f68..3c23505 100644 --- a/src/FrostFS.SDK.ClientV2/Pool/WrapperPrm.cs +++ b/src/FrostFS.SDK.Client/Pool/WrapperPrm.cs @@ -5,7 +5,7 @@ using Grpc.Net.Client; using Microsoft.Extensions.Logging; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; // wrapperPrm is params to create clientWrapper. [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "")] diff --git a/src/FrostFS.SDK.ClientV2/Services/AccountingServiceProvider.cs b/src/FrostFS.SDK.Client/Services/AccountingServiceProvider.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Services/AccountingServiceProvider.cs rename to src/FrostFS.SDK.Client/Services/AccountingServiceProvider.cs index b5fa42b..ba8ba2a 100644 --- a/src/FrostFS.SDK.ClientV2/Services/AccountingServiceProvider.cs +++ b/src/FrostFS.SDK.Client/Services/AccountingServiceProvider.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using FrostFS.Accounting; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class AccountingServiceProvider : ContextAccessor { diff --git a/src/FrostFS.SDK.ClientV2/Services/ApeManagerServiceProvider.cs b/src/FrostFS.SDK.Client/Services/ApeManagerServiceProvider.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Services/ApeManagerServiceProvider.cs rename to src/FrostFS.SDK.Client/Services/ApeManagerServiceProvider.cs index d05e636..840223d 100644 --- a/src/FrostFS.SDK.ClientV2/Services/ApeManagerServiceProvider.cs +++ b/src/FrostFS.SDK.Client/Services/ApeManagerServiceProvider.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Frostfs.V2.Ape; using Frostfs.V2.Apemanager; -namespace FrostFS.SDK.ClientV2.Services; +namespace FrostFS.SDK.Client.Services; internal sealed class ApeManagerServiceProvider : ContextAccessor { diff --git a/src/FrostFS.SDK.ClientV2/Services/ContainerServiceProvider.cs b/src/FrostFS.SDK.Client/Services/ContainerServiceProvider.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Services/ContainerServiceProvider.cs rename to src/FrostFS.SDK.Client/Services/ContainerServiceProvider.cs index 4e00a7d..3a0379e 100644 --- a/src/FrostFS.SDK.ClientV2/Services/ContainerServiceProvider.cs +++ b/src/FrostFS.SDK.Client/Services/ContainerServiceProvider.cs @@ -5,12 +5,12 @@ using System.Threading.Tasks; using FrostFS.Container; using FrostFS.Refs; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using FrostFS.Session; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class ContainerServiceProvider(ContainerService.ContainerServiceClient service, ClientContext clientCtx) : ContextAccessor(clientCtx), ISessionProvider { diff --git a/src/FrostFS.SDK.ClientV2/Services/NetmapServiceProvider.cs b/src/FrostFS.SDK.Client/Services/NetmapServiceProvider.cs similarity index 99% rename from src/FrostFS.SDK.ClientV2/Services/NetmapServiceProvider.cs rename to src/FrostFS.SDK.Client/Services/NetmapServiceProvider.cs index 0241e31..18649d8 100644 --- a/src/FrostFS.SDK.ClientV2/Services/NetmapServiceProvider.cs +++ b/src/FrostFS.SDK.Client/Services/NetmapServiceProvider.cs @@ -7,7 +7,7 @@ using FrostFS.Netmap; using static FrostFS.Netmap.NetworkConfig.Types; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class NetmapServiceProvider : ContextAccessor { diff --git a/src/FrostFS.SDK.ClientV2/Services/ObjectServiceProvider.cs b/src/FrostFS.SDK.Client/Services/ObjectServiceProvider.cs similarity index 99% rename from src/FrostFS.SDK.ClientV2/Services/ObjectServiceProvider.cs rename to src/FrostFS.SDK.Client/Services/ObjectServiceProvider.cs index 322fb3e..7737c62 100644 --- a/src/FrostFS.SDK.ClientV2/Services/ObjectServiceProvider.cs +++ b/src/FrostFS.SDK.Client/Services/ObjectServiceProvider.cs @@ -7,14 +7,14 @@ using System.Threading.Tasks; using FrostFS.Object; using FrostFS.Refs; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using FrostFS.Session; using Google.Protobuf; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient client, ClientContext clientCtx) : ContextAccessor(clientCtx), ISessionProvider diff --git a/src/FrostFS.SDK.ClientV2/Services/SessionServiceProvider.cs b/src/FrostFS.SDK.Client/Services/SessionServiceProvider.cs similarity index 94% rename from src/FrostFS.SDK.ClientV2/Services/SessionServiceProvider.cs rename to src/FrostFS.SDK.Client/Services/SessionServiceProvider.cs index 73418d0..e9b5963 100644 --- a/src/FrostFS.SDK.ClientV2/Services/SessionServiceProvider.cs +++ b/src/FrostFS.SDK.Client/Services/SessionServiceProvider.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.Session; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class SessionServiceProvider : ContextAccessor { diff --git a/src/FrostFS.SDK.ClientV2/Services/Shared/ContextAccessor.cs b/src/FrostFS.SDK.Client/Services/Shared/ContextAccessor.cs similarity index 79% rename from src/FrostFS.SDK.ClientV2/Services/Shared/ContextAccessor.cs rename to src/FrostFS.SDK.Client/Services/Shared/ContextAccessor.cs index 70fc9c9..e127146 100644 --- a/src/FrostFS.SDK.ClientV2/Services/Shared/ContextAccessor.cs +++ b/src/FrostFS.SDK.Client/Services/Shared/ContextAccessor.cs @@ -1,4 +1,4 @@ -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal class ContextAccessor(ClientContext context) { diff --git a/src/FrostFS.SDK.ClientV2/Services/Shared/SessionProvider.cs b/src/FrostFS.SDK.Client/Services/Shared/SessionProvider.cs similarity index 95% rename from src/FrostFS.SDK.ClientV2/Services/Shared/SessionProvider.cs rename to src/FrostFS.SDK.Client/Services/Shared/SessionProvider.cs index e18de09..a8d80ac 100644 --- a/src/FrostFS.SDK.ClientV2/Services/Shared/SessionProvider.cs +++ b/src/FrostFS.SDK.Client/Services/Shared/SessionProvider.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal interface ISessionProvider { diff --git a/src/FrostFS.SDK.ClientV2/Tools/ClientContext.cs b/src/FrostFS.SDK.Client/Tools/ClientContext.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Tools/ClientContext.cs rename to src/FrostFS.SDK.Client/Tools/ClientContext.cs index c0a1db3..5f7c72e 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/ClientContext.cs +++ b/src/FrostFS.SDK.Client/Tools/ClientContext.cs @@ -6,7 +6,7 @@ using FrostFS.SDK.Cryptography; using Grpc.Net.Client; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class ClientContext(FrostFSClient client, ECDsa? key, FrostFsOwner? owner, GrpcChannel channel, FrostFsVersion version) : IDisposable { diff --git a/src/FrostFS.SDK.ClientV2/Tools/NetworkSettings.cs b/src/FrostFS.SDK.Client/Tools/NetworkSettings.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Tools/NetworkSettings.cs rename to src/FrostFS.SDK.Client/Tools/NetworkSettings.cs index 524f358..d8f5e12 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/NetworkSettings.cs +++ b/src/FrostFS.SDK.Client/Tools/NetworkSettings.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public class NetworkSettings { diff --git a/src/FrostFS.SDK.ClientV2/Tools/ObjectReader.cs b/src/FrostFS.SDK.Client/Tools/ObjectReader.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Tools/ObjectReader.cs rename to src/FrostFS.SDK.Client/Tools/ObjectReader.cs index c6af0c8..7d5dbd7 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/ObjectReader.cs +++ b/src/FrostFS.SDK.Client/Tools/ObjectReader.cs @@ -6,7 +6,7 @@ using FrostFS.Object; using Grpc.Core; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class ObjectReader(AsyncServerStreamingCall call) : IObjectReader { diff --git a/src/FrostFS.SDK.ClientV2/Tools/ObjectStreamer.cs b/src/FrostFS.SDK.Client/Tools/ObjectStreamer.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Tools/ObjectStreamer.cs rename to src/FrostFS.SDK.Client/Tools/ObjectStreamer.cs index a23c109..81a6b3b 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/ObjectStreamer.cs +++ b/src/FrostFS.SDK.Client/Tools/ObjectStreamer.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Grpc.Core; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class ObjectStreamer(AsyncClientStreamingCall call) : IDisposable { diff --git a/src/FrostFS.SDK.ClientV2/Tools/ObjectTools.cs b/src/FrostFS.SDK.Client/Tools/ObjectTools.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Tools/ObjectTools.cs rename to src/FrostFS.SDK.Client/Tools/ObjectTools.cs index 91df2ad..f20cacd 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/ObjectTools.cs +++ b/src/FrostFS.SDK.Client/Tools/ObjectTools.cs @@ -2,12 +2,12 @@ using System.Linq; using FrostFS.Object; using FrostFS.Refs; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using Google.Protobuf; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal static class ObjectTools { diff --git a/src/FrostFS.SDK.ClientV2/Tools/Range.cs b/src/FrostFS.SDK.Client/Tools/Range.cs similarity index 100% rename from src/FrostFS.SDK.ClientV2/Tools/Range.cs rename to src/FrostFS.SDK.Client/Tools/Range.cs diff --git a/src/FrostFS.SDK.ClientV2/Tools/RangeReader.cs b/src/FrostFS.SDK.Client/Tools/RangeReader.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Tools/RangeReader.cs rename to src/FrostFS.SDK.Client/Tools/RangeReader.cs index d1128c8..a92d710 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/RangeReader.cs +++ b/src/FrostFS.SDK.Client/Tools/RangeReader.cs @@ -6,7 +6,7 @@ using FrostFS.Object; using Grpc.Core; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public sealed class RangeReader(AsyncServerStreamingCall call) : IObjectReader { diff --git a/src/FrostFS.SDK.ClientV2/Tools/RequestConstructor.cs b/src/FrostFS.SDK.Client/Tools/RequestConstructor.cs similarity index 95% rename from src/FrostFS.SDK.ClientV2/Tools/RequestConstructor.cs rename to src/FrostFS.SDK.Client/Tools/RequestConstructor.cs index 6f19ad0..65d9e35 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/RequestConstructor.cs +++ b/src/FrostFS.SDK.Client/Tools/RequestConstructor.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Security.Cryptography; using FrostFS.Refs; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using FrostFS.Session; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public static class RequestConstructor { diff --git a/src/FrostFS.SDK.ClientV2/Tools/RequestSigner.cs b/src/FrostFS.SDK.Client/Tools/RequestSigner.cs similarity index 98% rename from src/FrostFS.SDK.ClientV2/Tools/RequestSigner.cs rename to src/FrostFS.SDK.Client/Tools/RequestSigner.cs index f1006a4..a45c569 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/RequestSigner.cs +++ b/src/FrostFS.SDK.Client/Tools/RequestSigner.cs @@ -3,7 +3,7 @@ using System.Security.Cryptography; using FrostFS.Refs; using FrostFS.SDK.Cryptography; -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using FrostFS.Session; using Google.Protobuf; @@ -14,7 +14,7 @@ using Org.BouncyCastle.Crypto.Parameters; using Org.BouncyCastle.Crypto.Signers; using Org.BouncyCastle.Math; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public static class RequestSigner { diff --git a/src/FrostFS.SDK.ClientV2/Tools/SearchReader.cs b/src/FrostFS.SDK.Client/Tools/SearchReader.cs similarity index 96% rename from src/FrostFS.SDK.ClientV2/Tools/SearchReader.cs rename to src/FrostFS.SDK.Client/Tools/SearchReader.cs index ceed0da..c2e7607 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/SearchReader.cs +++ b/src/FrostFS.SDK.Client/Tools/SearchReader.cs @@ -9,7 +9,7 @@ using FrostFS.Refs; using Grpc.Core; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; internal sealed class SearchReader(AsyncServerStreamingCall call) : IDisposable { diff --git a/src/FrostFS.SDK.ClientV2/Tools/Verifier.cs b/src/FrostFS.SDK.Client/Tools/Verifier.cs similarity index 97% rename from src/FrostFS.SDK.ClientV2/Tools/Verifier.cs rename to src/FrostFS.SDK.Client/Tools/Verifier.cs index c87ef0a..bc8dd31 100644 --- a/src/FrostFS.SDK.ClientV2/Tools/Verifier.cs +++ b/src/FrostFS.SDK.Client/Tools/Verifier.cs @@ -2,9 +2,9 @@ using System; using System.Security.Cryptography; using FrostFS.Refs; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using FrostFS.Session; using Google.Protobuf; @@ -15,7 +15,7 @@ using Org.BouncyCastle.Crypto.Parameters; using Org.BouncyCastle.Crypto.Signers; using Org.BouncyCastle.Math; -namespace FrostFS.SDK.ClientV2; +namespace FrostFS.SDK.Client; public static class Verifier { diff --git a/src/FrostFS.SDK.ClientV2/Ростелеком.txt b/src/FrostFS.SDK.ClientV2/Ростелеком.txt deleted file mode 100644 index d3687ed..0000000 --- a/src/FrostFS.SDK.ClientV2/Ростелеком.txt +++ /dev/null @@ -1,8 +0,0 @@ -Для возврата денег потребуются документы: -1. Заполненное заявление -Форму заявления можно скачать с сайта -Шаблон заявления скачайте на сайте rt.ru. Внизу страницы перейдите в Договоры и соглашения -> «Бланки и заявления» -2. Скан-фото паспорта владельца договора (2, 3, 5 страница: кем и когда выдан, адрес регистрации) -3. Реквизиты счета владельца, выданные банком, на которые будет выполнен возврат -4. Чек об оплате -Сканы документов должны быть хорошо читаемые diff --git a/src/FrostFS.SDK.Cryptography/FrostFS.SDK.Cryptography.csproj b/src/FrostFS.SDK.Cryptography/FrostFS.SDK.Cryptography.csproj index 59bde16..148ae78 100644 --- a/src/FrostFS.SDK.Cryptography/FrostFS.SDK.Cryptography.csproj +++ b/src/FrostFS.SDK.Cryptography/FrostFS.SDK.Cryptography.csproj @@ -6,9 +6,13 @@ enable - - true - + + true + + + + true + diff --git a/src/FrostFS.SDK.ModelsV2/Client/ClientSettings.cs b/src/FrostFS.SDK.ModelsV2/Client/ClientSettings.cs deleted file mode 100644 index 80ba47a..0000000 --- a/src/FrostFS.SDK.ModelsV2/Client/ClientSettings.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace FrostFS.SDK; - -public class ClientSettings -{ - protected static readonly string errorTemplate = "{0} is required parameter"; - - public string Host { get; set; } = string.Empty; - - public virtual void Validate() - { - var errors = CheckFields(); - if (errors != null) - ThrowException(errors); - } - - protected List? CheckFields() - { - List? errors = null; - - if (string.IsNullOrWhiteSpace(Host)) - (errors ??= []).Add(string.Format(errorTemplate, nameof(Host))); - - return errors; - } - - protected static void ThrowException(List errors) - { - StringBuilder messages = new(); - - foreach (var error in errors) - { - messages.AppendLine(error); - } - - throw new ArgumentException(messages.ToString()); - } -} - -public class SingleOwnerClientSettings : ClientSettings -{ - public string Key { get; set; } = string.Empty; - - public override void Validate() - { - var errors = CheckFields(); - if (errors != null) - ThrowException(errors); - } - - protected List? CheckFields() - { - List? errors = base.CheckFields(); - - if (string.IsNullOrWhiteSpace(Key)) - (errors ??= []).Add(string.Format(errorTemplate, nameof(Key))); - - return errors; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Containers/ContainerId.cs b/src/FrostFS.SDK.ModelsV2/Containers/ContainerId.cs deleted file mode 100644 index 4543dcd..0000000 --- a/src/FrostFS.SDK.ModelsV2/Containers/ContainerId.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace FrostFS.SDK; - -public class ContainerId(string id) -{ - public string Value { get; set; } = id; - - public override string ToString() - { - return Value; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Containers/FrostFsContainer.cs b/src/FrostFS.SDK.ModelsV2/Containers/FrostFsContainer.cs deleted file mode 100644 index 45d3b58..0000000 --- a/src/FrostFS.SDK.ModelsV2/Containers/FrostFsContainer.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace FrostFS.SDK; - -public class FrostFsContainer(BasicAcl basicAcl, FrostFsPlacementPolicy placementPolicy) -{ - public Guid Nonce { get; set; } = Guid.NewGuid(); - public BasicAcl BasicAcl { get; set; } = basicAcl; - public FrostFsPlacementPolicy PlacementPolicy { get; set; } = placementPolicy; - public FrostFsVersion? Version { get; set; } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Enums/BasicAcl.cs b/src/FrostFS.SDK.ModelsV2/Enums/BasicAcl.cs deleted file mode 100644 index dd3252b..0000000 --- a/src/FrostFS.SDK.ModelsV2/Enums/BasicAcl.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel; - -namespace FrostFS.SDK; - -public enum BasicAcl -{ - [Description("Not defined ACL")] - NotDefined = 0x00000000, - - [Description("Basic ACL for private container")] - Private = 0x1C8C8CCC, - - [Description("Basic ACL for public RO container")] - PublicRO = 0x1FBF8CFF, - - [Description("Basic ACL for public RW container")] - PublicRW = 0x1FBFBFFF, - - [Description("Basic ACL for public append container")] - PublicAppend = 0x1FBF9FFF, -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Enums/FrostFsObjectMatchType.cs b/src/FrostFS.SDK.ModelsV2/Enums/FrostFsObjectMatchType.cs deleted file mode 100644 index 1fdeb60..0000000 --- a/src/FrostFS.SDK.ModelsV2/Enums/FrostFsObjectMatchType.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FrostFS.SDK; - -public enum FrostFsObjectMatchType -{ - Unspecified = 0, - Equals = 1, - NotEquals = 2, - KeyAbsent = 3, - StartsWith = 4 -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Enums/FrostFsObjectType.cs b/src/FrostFS.SDK.ModelsV2/Enums/FrostFsObjectType.cs deleted file mode 100644 index 793fe2e..0000000 --- a/src/FrostFS.SDK.ModelsV2/Enums/FrostFsObjectType.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace FrostFS.SDK; - -public enum FrostFsObjectType -{ - Regular = 0, - Tombstone = 1, - Lock = 3 -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Enums/FrostFsStatusCode.cs b/src/FrostFS.SDK.ModelsV2/Enums/FrostFsStatusCode.cs deleted file mode 100644 index 7eb185c..0000000 --- a/src/FrostFS.SDK.ModelsV2/Enums/FrostFsStatusCode.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace FrostFS.SDK; - -public enum FrostFsStatusCode -{ - Success = 0, - Internal = 1024, - WrongMagicNumber = 1025, - SignatureVerificationFailure = 1026, - NodeUnderMaintenance = 1027, - ObjectAccessDenied = 2048, - ObjectNotFound = 2049, - ObjectLocked = 2050, - LockNotRegularObject = 2051, - ObjectAlreadyRemoved = 2052, - OutOfRange = 2053, - ContainerNotFound = 3072, - EAclNotFound = 3073, - ContainerAccessDenied = 3074, - TokenNotFound = 4096, - TokenExpired = 4097, - ApeManagerAccessDenied = 5120 -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Enums/NodeState.cs b/src/FrostFS.SDK.ModelsV2/Enums/NodeState.cs deleted file mode 100644 index 2821e55..0000000 --- a/src/FrostFS.SDK.ModelsV2/Enums/NodeState.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace FrostFS.SDK; - -public enum NodeState -{ - Unspecified = 0, - Online = 1, - Offline = 2, - Maintenance = 3 -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Enums/SignatureScheme.cs b/src/FrostFS.SDK.ModelsV2/Enums/SignatureScheme.cs deleted file mode 100644 index 4b5634c..0000000 --- a/src/FrostFS.SDK.ModelsV2/Enums/SignatureScheme.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace FrostFS.SDK; - -public enum SignatureScheme -{ - EcdsaSha512, - EcdsaRfc6979Sha256, - EcdsaRfc6979Sha256WalletConnect -} diff --git a/src/FrostFS.SDK.ModelsV2/FrostFS.SDK.ModelsV2.csproj b/src/FrostFS.SDK.ModelsV2/FrostFS.SDK.ModelsV2.csproj deleted file mode 100644 index 1b4ad74..0000000 --- a/src/FrostFS.SDK.ModelsV2/FrostFS.SDK.ModelsV2.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - netstandard2.0 - 12.0 - enable - - - - true - - - - - - - - - - - - diff --git a/src/FrostFS.SDK.ModelsV2/Misc/CallStatistics.cs b/src/FrostFS.SDK.ModelsV2/Misc/CallStatistics.cs deleted file mode 100644 index 706b3f2..0000000 --- a/src/FrostFS.SDK.ModelsV2/Misc/CallStatistics.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FrostFS.SDK; - -public class CallStatistics -{ - public string? MethodName { get; set; } - public long ElapsedMicroSeconds { get; set; } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Misc/CheckSum.cs b/src/FrostFS.SDK.ModelsV2/Misc/CheckSum.cs deleted file mode 100644 index 82017f9..0000000 --- a/src/FrostFS.SDK.ModelsV2/Misc/CheckSum.cs +++ /dev/null @@ -1,20 +0,0 @@ -using FrostFS.SDK.Cryptography; -using System; - -namespace FrostFS.SDK; - -public class CheckSum -{ - // type is always Sha256 - public byte[]? Hash { get; set; } - - public static CheckSum CreateCheckSum(byte[] content) - { - return new CheckSum { Hash = content.Sha256() }; - } - - public override string ToString() - { - return BitConverter.ToString(Hash).Replace("-", ""); - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Misc/Constants.cs b/src/FrostFS.SDK.ModelsV2/Misc/Constants.cs deleted file mode 100644 index 332a3e3..0000000 --- a/src/FrostFS.SDK.ModelsV2/Misc/Constants.cs +++ /dev/null @@ -1,52 +0,0 @@ -namespace FrostFS.SDK; - -public class Constants -{ - public const int ObjectChunkSize = 3 * (1 << 20); - public const int Sha256HashLength = 32; - - // HeaderPrefix is a prefix of key to object header value or property. - public const string HeaderPrefix = "$Object:"; - - // FilterHeaderVersion is a filter key to "version" field of the object header. - public const string FilterHeaderVersion = HeaderPrefix + "version"; - - // FilterHeaderObjectID is a filter key to "object_id" field of the object. - public const string FilterHeaderObjectID = HeaderPrefix + "objectID"; - - // FilterHeaderContainerID is a filter key to "container_id" field of the object header. - public const string FilterHeaderContainerID = HeaderPrefix + "containerID"; - - // FilterHeaderOwnerID is a filter key to "owner_id" field of the object header. - public const string FilterHeaderOwnerID = HeaderPrefix + "ownerID"; - - // FilterHeaderCreationEpoch is a filter key to "creation_epoch" field of the object header. - public const string FilterHeaderCreationEpoch = HeaderPrefix + "creationEpoch"; - - // FilterHeaderPayloadLength is a filter key to "payload_length" field of the object header. - public const string FilterHeaderPayloadLength = HeaderPrefix + "payloadLength"; - - // FilterHeaderPayloadHash is a filter key to "payload_hash" field of the object header. - public const string FilterHeaderPayloadHash = HeaderPrefix + "payloadHash"; - - // FilterHeaderObjectType is a filter key to "object_type" field of the object header. - public const string FilterHeaderObjectType = HeaderPrefix + "objectType"; - - // FilterHeaderHomomorphicHash is a filter key to "homomorphic_hash" field of the object header. - public const string FilterHeaderHomomorphicHash = HeaderPrefix + "homomorphicHash"; - - // FilterHeaderParent is a filter key to "split.parent" field of the object header. - public const string FilterHeaderParent = HeaderPrefix + "split.parent"; - - // FilterHeaderSplitID is a filter key to "split.splitID" field of the object header. - public const string FilterHeaderSplitID = HeaderPrefix + "split.splitID"; - - // FilterHeaderECParent is a filter key to "ec.parent" field of the object header. - public const string FilterHeaderECParent = HeaderPrefix + "ec.parent"; - - // FilterPropertyRoot is a filter key to check if regular object is on top of split hierarchy. - public const string FilterHeaderRoot = HeaderPrefix + "ROOT"; - - // FilterPropertyPhy is a filter key to check if an object physically stored on a node. - public const string FilterHeaderPhy = HeaderPrefix + "PHY"; -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsNodeInfo.cs b/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsNodeInfo.cs deleted file mode 100644 index 9581b21..0000000 --- a/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsNodeInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace FrostFS.SDK; - -public class FrostFsNodeInfo( - FrostFsVersion version, - NodeState state, - IReadOnlyCollection addresses, - IReadOnlyDictionary attributes, - ReadOnlyMemory publicKey) -{ - public NodeState State { get; private set; } = state; - public FrostFsVersion Version { get; private set; } = version; - public IReadOnlyCollection Addresses { get; private set; } = addresses; - public IReadOnlyDictionary Attributes { get; private set; } = attributes; - public ReadOnlyMemory PublicKey { get; private set; } = publicKey; -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsPlacementPolicy.cs b/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsPlacementPolicy.cs deleted file mode 100644 index 410598c..0000000 --- a/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsPlacementPolicy.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Linq; - -namespace FrostFS.SDK; - -public class FrostFsPlacementPolicy(bool unique, params FrostFsReplica[] replicas) : IComparable -{ - public FrostFsReplica[] Replicas { get; private set; } = replicas; - public bool Unique { get; private set; } = unique; - - public int CompareTo(FrostFsPlacementPolicy other) - { - var notEqual = other == null - || Unique != other.Unique - || Replicas.Length != other.Replicas.Length; - - if (notEqual) - return 1; - - foreach (var replica in Replicas) - { - if (!other!.Replicas.Any(r => r.Count == replica.Count && r.Selector == replica.Selector)) - return 1; - } - - return 0; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsReplica.cs b/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsReplica.cs deleted file mode 100644 index 8fd1bd9..0000000 --- a/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsReplica.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace FrostFS.SDK; - -public class FrostFsReplica -{ - public int Count { get; set; } - public string Selector { get; set; } - - public FrostFsReplica(int count, string? selector = null) - { - selector ??= string.Empty; - - Count = count; - Selector = selector; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsVersion.cs b/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsVersion.cs deleted file mode 100644 index 06c3ca2..0000000 --- a/src/FrostFS.SDK.ModelsV2/Netmap/FrostFsVersion.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace FrostFS.SDK; - -public class FrostFsVersion(int major, int minor) -{ - public int Major { get; set; } = major; - public int Minor { get; set; } = minor; - - public bool IsSupported(FrostFsVersion version) - { - return Major == version.Major; - } - - public override string ToString() - { - return $"v{Major}.{Minor}"; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Netmap/NetmapInfo.cs b/src/FrostFS.SDK.ModelsV2/Netmap/NetmapInfo.cs deleted file mode 100644 index a371564..0000000 --- a/src/FrostFS.SDK.ModelsV2/Netmap/NetmapInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; - -namespace FrostFS.SDK; - -public class NetmapSnapshot(ulong epoch, IReadOnlyList nodeInfoCollection) -{ - public ulong Epoch { get; private set; } = epoch; - - public IReadOnlyList NodeInfoCollection { get; private set; } = nodeInfoCollection; -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Object/FrostFsObject.cs b/src/FrostFS.SDK.ModelsV2/Object/FrostFsObject.cs deleted file mode 100644 index e382ec5..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/FrostFsObject.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; - -namespace FrostFS.SDK; - -public class FrostFsObject -{ - /// - /// Creates new instance from ObjectHeader - /// - /// - public FrostFsObject(ObjectHeader header) - { - Header = header; - } - - /// - /// Creates new instance with specified parameters - /// - /// - /// - public FrostFsObject(ContainerId container, FrostFsObjectType objectType = FrostFsObjectType.Regular) - { - Header = new ObjectHeader(containerId: container, type: objectType); - } - - /// - /// Header contains metadata for the object - /// - /// - public ObjectHeader Header { get; set; } - - /// - /// The value is calculated internally as a hash of ObjectHeader. Do not use pre-calculated value is the object has been changed. - /// - public ObjectId? ObjectId - { - get; set; - } - - /// - /// The size of payload cannot exceed MaxObjectSize value from NetworkSettings - /// Used only for PutSingleObject method - /// - /// Buffer for output data - public byte[] Payload { get; set; } = []; - - /// - /// A payload is obtained via stream reader - /// - /// Reader for received data - public IObjectReader? ObjectReader { get; set; } - - /// - /// Applied only for the last Object in chain in case of manual multipart uploading - /// - /// Parent for multipart object - public void SetParent(ObjectHeader largeObjectHeader) - { - if (Header?.Split == null) - throw new Exception("The object is not initialized properly"); - - Header.Split.ParentHeader = largeObjectHeader; - } -} - -public class LargeObject(ContainerId container) : FrostFsObject(container) -{ - public ulong PayloadLength - { - get { return Header!.PayloadLength; } - } -} - -public class LinkObject : FrostFsObject -{ - public LinkObject(ContainerId containerId, SplitId splitId, ObjectHeader largeObjectHeader) : base(containerId) - { - Header!.Split = new Split(splitId) - { - ParentHeader = largeObjectHeader - }; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Object/IObjectReader.cs b/src/FrostFS.SDK.ModelsV2/Object/IObjectReader.cs deleted file mode 100644 index 51211fd..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/IObjectReader.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace FrostFS.SDK; - -public interface IObjectReader : IDisposable -{ - Task?> ReadChunk(CancellationToken cancellationToken = default); -} diff --git a/src/FrostFS.SDK.ModelsV2/Object/ObjectAttribute.cs b/src/FrostFS.SDK.ModelsV2/Object/ObjectAttribute.cs deleted file mode 100644 index 110db12..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/ObjectAttribute.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FrostFS.SDK; - -public class ObjectAttribute(string key, string value) -{ - public string Key { get; set; } = key; - public string Value { get; set; } = value; -} diff --git a/src/FrostFS.SDK.ModelsV2/Object/ObjectFilter.cs b/src/FrostFS.SDK.ModelsV2/Object/ObjectFilter.cs deleted file mode 100644 index 40f654d..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/ObjectFilter.cs +++ /dev/null @@ -1,111 +0,0 @@ -namespace FrostFS.SDK; - -public interface IObjectFilter -{ - public FrostFsObjectMatchType MatchType { get; set; } - public string Key { get; set; } - - string? GetSerializedValue(); -} - -public abstract class ObjectFilter(FrostFsObjectMatchType matchType, string key, T value) : IObjectFilter -{ - public FrostFsObjectMatchType MatchType { get; set; } = matchType; - public string Key { get; set; } = key; - - public T Value { get; set; } = value; - - public string? GetSerializedValue() - { - return Value?.ToString(); - } -} - -/// -/// Creates filter to search by Attribute -/// -/// Match type -/// Attribute key -/// Attribute value -public class FilterByAttribute(FrostFsObjectMatchType matchType, string key, string value) : ObjectFilter(matchType, key, value) { } - -/// -/// Creates filter to search by ObjectId -/// -/// Match type -/// ObjectId -public class FilterByObjectId(FrostFsObjectMatchType matchType, ObjectId objectId) : ObjectFilter(matchType, Constants.FilterHeaderObjectID, objectId) { } - -/// -/// Creates filter to search by OwnerId -/// -/// Match type -/// ObjectId -public class FilterByOwnerId(FrostFsObjectMatchType matchType, OwnerId ownerId) : ObjectFilter(matchType, Constants.FilterHeaderOwnerID, ownerId) { } - -/// -/// Creates filter to search by Version -/// -/// Match type -/// Version -public class FilterByVersion(FrostFsObjectMatchType matchType, FrostFsVersion version) : ObjectFilter(matchType, Constants.FilterHeaderVersion, version) { } - -/// -/// Creates filter to search by ContainerId -/// -/// Match type -/// ContainerId -public class FilterByContainerId(FrostFsObjectMatchType matchType, ContainerId containerId) : ObjectFilter(matchType, Constants.FilterHeaderContainerID, containerId) { } - -/// -/// Creates filter to search by creation Epoch -/// -/// Match type -/// Creation Epoch -public class FilterByEpoch(FrostFsObjectMatchType matchType, ulong epoch) : ObjectFilter(matchType, Constants.FilterHeaderCreationEpoch, epoch) { } - -/// -/// Creates filter to search by Payload Length -/// -/// Match type -/// Payload Length -public class FilterByPayloadLength(FrostFsObjectMatchType matchType, ulong payloadLength) : ObjectFilter(matchType, Constants.FilterHeaderPayloadLength, payloadLength) { } - -/// -/// Creates filter to search by Payload Hash -/// -/// Match type -/// Payload Hash -public class FilterByPayloadHash(FrostFsObjectMatchType matchType, CheckSum payloadHash) : ObjectFilter(matchType, Constants.FilterHeaderPayloadHash, payloadHash) { } - -/// -/// Creates filter to search by Parent -/// -/// Match type -/// Parent -public class FilterByParent(FrostFsObjectMatchType matchType, ObjectId parentId) : ObjectFilter(matchType, Constants.FilterHeaderParent, parentId) { } - -/// -/// Creates filter to search by SplitId -/// -/// Match type -/// SplitId -public class FilterBySplitId(FrostFsObjectMatchType matchType, SplitId splitId) : ObjectFilter(matchType, Constants.FilterHeaderSplitID, splitId) { } - -/// -/// Creates filter to search by Payload Hash -/// -/// Match type -/// Payload Hash -public class FilterByECParent(FrostFsObjectMatchType matchType, ObjectId ecParentId) : ObjectFilter(matchType, Constants.FilterHeaderECParent, ecParentId) { } - -/// -/// Creates filter to search Root objects -/// -public class FilterByRootObject() : ObjectFilter(FrostFsObjectMatchType.Unspecified, Constants.FilterHeaderRoot, string.Empty) { } - -/// -/// Creates filter to search objects that are physically stored on the server -/// (FrostFsObjectMatchType.Unspecified, Constants.FilterHeaderPhy, string.Empty) { } - diff --git a/src/FrostFS.SDK.ModelsV2/Object/ObjectHeader.cs b/src/FrostFS.SDK.ModelsV2/Object/ObjectHeader.cs deleted file mode 100644 index 3e3ecd3..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/ObjectHeader.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; - -namespace FrostFS.SDK; - -public class ObjectHeader( - ContainerId containerId, - FrostFsObjectType type = FrostFsObjectType.Regular, - params ObjectAttribute[] attributes - ) -{ - public OwnerId? OwnerId { get; set; } - - public List Attributes { get; set; } = [.. attributes]; - - public ContainerId ContainerId { get; set; } = containerId; - - public ulong PayloadLength { get; set; } - - public byte[]? PayloadCheckSum { get; set; } - - public FrostFsObjectType ObjectType { get; set; } = type; - - public FrostFsVersion? Version { get; set; } - - public Split? Split { get; set; } -} diff --git a/src/FrostFS.SDK.ModelsV2/Object/ObjectId.cs b/src/FrostFS.SDK.ModelsV2/Object/ObjectId.cs deleted file mode 100644 index 9072361..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/ObjectId.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; - -using FrostFS.SDK.Cryptography; - -namespace FrostFS.SDK; - -public class ObjectId(string id) -{ - public string Value { get; } = id; - - public static ObjectId FromHash(byte[] hash) - { - if (hash.Length != Constants.Sha256HashLength) - throw new FormatException("ObjectID must be a sha256 hash."); - - return new ObjectId(Base58.Encode(hash)); - } - - public byte[] ToHash() - { - return Base58.Decode(Value); - } - - public override string ToString() - { - return Value; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Object/OwnerId.cs b/src/FrostFS.SDK.ModelsV2/Object/OwnerId.cs deleted file mode 100644 index 5da87ef..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/OwnerId.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Security.Cryptography; - -using FrostFS.SDK.Cryptography; - -namespace FrostFS.SDK; - -public class OwnerId(string id) -{ - public string Value { get; } = id; - - public static OwnerId FromKey(ECDsa key) - { - return new OwnerId(key.PublicKey().PublicKeyToAddress()); - } - - public byte[] ToHash() - { - return Base58.Decode(Value); - } - - public override string ToString() - { - return Value; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Object/SplitId.cs b/src/FrostFS.SDK.ModelsV2/Object/SplitId.cs deleted file mode 100644 index 8af45c1..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/SplitId.cs +++ /dev/null @@ -1,62 +0,0 @@ -using FrostFS.SDK.Cryptography; - -using Google.Protobuf; - -using System; - -namespace FrostFS.SDK; - -public class SplitId -{ - private readonly Guid id; - - ByteString? _message; - - public SplitId() - { - id = Guid.NewGuid(); - } - - public SplitId(Guid guid) - { - id = guid; - } - - private SplitId(byte[] binary) - { - id = new Guid(binary); - } - - private SplitId(string str) - { - id = new Guid(str); - } - - public static SplitId CreateFromBinary(byte[] binaryData) - { - return new SplitId(binaryData); - } - - public static SplitId CreateFromString(string stringData) - { - return new SplitId(stringData); - } - - public override string ToString() - { - return id.ToString(); - } - - public byte[]? ToBinary() - { - if (id == Guid.Empty) - return null; - - return id.ToBytes(); - } - - public ByteString? GetMessage() - { - return _message ??= ByteString.CopyFrom(ToBinary()); - } -} diff --git a/src/FrostFS.SDK.ModelsV2/Object/Splitter.cs b/src/FrostFS.SDK.ModelsV2/Object/Splitter.cs deleted file mode 100644 index 64b3515..0000000 --- a/src/FrostFS.SDK.ModelsV2/Object/Splitter.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; - -namespace FrostFS.SDK; - -public class Split(SplitId splitId) -{ - public Split() : this(new SplitId()) - { - } - - public SplitId SplitId { get; private set; } = splitId; - - public ObjectId? Parent { get; set; } - - public ObjectId? Previous { get; set; } - - public FrostFsSignature? ParentSignature { get; set; } - - public ObjectHeader? ParentHeader { get; set; } - - public List Children { get; } = []; - - public Refs.Signature ParentSignatureGrpc { get; set; } -} diff --git a/src/FrostFS.SDK.ModelsV2/Response/FrostFsResponseStatus.cs b/src/FrostFS.SDK.ModelsV2/Response/FrostFsResponseStatus.cs deleted file mode 100644 index b5e5831..0000000 --- a/src/FrostFS.SDK.ModelsV2/Response/FrostFsResponseStatus.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace FrostFS.SDK; - -public class FrostFsResponseStatus(FrostFsStatusCode code, string? message = null) -{ - public FrostFsStatusCode Code { get; set; } = code; - public string Message { get; set; } = message ?? string.Empty; - - public bool IsSuccess => Code == FrostFsStatusCode.Success; - - public override string ToString() - { - return $"Response status: {Code}. Message: {Message}."; - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Response/FrostFsSignature.cs b/src/FrostFS.SDK.ModelsV2/Response/FrostFsSignature.cs deleted file mode 100644 index d7ca6b6..0000000 --- a/src/FrostFS.SDK.ModelsV2/Response/FrostFsSignature.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FrostFS.SDK; - -public class FrostFsSignature -{ - public byte[]? Key { get; set; } - - public byte[]? Sign { get; set; } - - public SignatureScheme Scheme { get; set; } -} diff --git a/src/FrostFS.SDK.ModelsV2/Response/MetaHeader.cs b/src/FrostFS.SDK.ModelsV2/Response/MetaHeader.cs deleted file mode 100644 index 36dad09..0000000 --- a/src/FrostFS.SDK.ModelsV2/Response/MetaHeader.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace FrostFS.SDK; - -public class MetaHeader(FrostFsVersion version, int epoch, int ttl) -{ - public FrostFsVersion Version { get; set; } = version; - public int Epoch { get; set; } = epoch; - public int Ttl { get; set; } = ttl; - - public static MetaHeader Default() - { - return new MetaHeader( - new FrostFsVersion( - major: 2, - minor: 13 - ), - epoch: 0, - ttl: 2 - ); - } -} \ No newline at end of file diff --git a/src/FrostFS.SDK.ModelsV2/Session/FrostFsSessionToken.cs b/src/FrostFS.SDK.ModelsV2/Session/FrostFsSessionToken.cs deleted file mode 100644 index 8954780..0000000 --- a/src/FrostFS.SDK.ModelsV2/Session/FrostFsSessionToken.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace FrostFS.SDK; - -public class FrostFsSessionToken(byte[] token) -{ - public byte[] Token { get; private set; } = token; -} diff --git a/src/FrostFS.SDK.ProtosV2/FrostFS.SDK.ProtosV2.csproj b/src/FrostFS.SDK.Protos/FrostFS.SDK.Protos.csproj similarity index 88% rename from src/FrostFS.SDK.ProtosV2/FrostFS.SDK.ProtosV2.csproj rename to src/FrostFS.SDK.Protos/FrostFS.SDK.Protos.csproj index 093351c..0bf48d5 100644 --- a/src/FrostFS.SDK.ProtosV2/FrostFS.SDK.ProtosV2.csproj +++ b/src/FrostFS.SDK.Protos/FrostFS.SDK.Protos.csproj @@ -6,9 +6,13 @@ enable - - true - + + true + + + + true + diff --git a/src/FrostFS.SDK.ProtosV2/Interfaces/IMetaHeader.cs b/src/FrostFS.SDK.Protos/Interfaces/IMetaHeader.cs similarity index 100% rename from src/FrostFS.SDK.ProtosV2/Interfaces/IMetaHeader.cs rename to src/FrostFS.SDK.Protos/Interfaces/IMetaHeader.cs diff --git a/src/FrostFS.SDK.ProtosV2/Interfaces/IRequest.cs b/src/FrostFS.SDK.Protos/Interfaces/IRequest.cs similarity index 80% rename from src/FrostFS.SDK.ProtosV2/Interfaces/IRequest.cs rename to src/FrostFS.SDK.Protos/Interfaces/IRequest.cs index 42129c3..a3a269f 100644 --- a/src/FrostFS.SDK.ProtosV2/Interfaces/IRequest.cs +++ b/src/FrostFS.SDK.Protos/Interfaces/IRequest.cs @@ -1,6 +1,6 @@ using FrostFS.Session; -namespace FrostFS.SDK.ProtosV2.Interfaces; +namespace FrostFS.SDK.Proto.Interfaces; public interface IRequest : IVerifiableMessage { diff --git a/src/FrostFS.SDK.ProtosV2/Interfaces/IResponse.cs b/src/FrostFS.SDK.Protos/Interfaces/IResponse.cs similarity index 100% rename from src/FrostFS.SDK.ProtosV2/Interfaces/IResponse.cs rename to src/FrostFS.SDK.Protos/Interfaces/IResponse.cs diff --git a/src/FrostFS.SDK.ProtosV2/Interfaces/IVerifiableMessage.cs b/src/FrostFS.SDK.Protos/Interfaces/IVerifiableMessage.cs similarity index 100% rename from src/FrostFS.SDK.ProtosV2/Interfaces/IVerifiableMessage.cs rename to src/FrostFS.SDK.Protos/Interfaces/IVerifiableMessage.cs diff --git a/src/FrostFS.SDK.ProtosV2/Interfaces/IVerificationHeader.cs b/src/FrostFS.SDK.Protos/Interfaces/IVerificationHeader.cs similarity index 100% rename from src/FrostFS.SDK.ProtosV2/Interfaces/IVerificationHeader.cs rename to src/FrostFS.SDK.Protos/Interfaces/IVerificationHeader.cs diff --git a/src/FrostFS.SDK.ProtosV2/accounting/Extension.Message.cs b/src/FrostFS.SDK.Protos/accounting/Extension.Message.cs similarity index 97% rename from src/FrostFS.SDK.ProtosV2/accounting/Extension.Message.cs rename to src/FrostFS.SDK.Protos/accounting/Extension.Message.cs index af77424..82b7c78 100644 --- a/src/FrostFS.SDK.ProtosV2/accounting/Extension.Message.cs +++ b/src/FrostFS.SDK.Protos/accounting/Extension.Message.cs @@ -1,4 +1,4 @@ -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using FrostFS.Session; using Google.Protobuf; diff --git a/src/FrostFS.SDK.ProtosV2/accounting/service.proto b/src/FrostFS.SDK.Protos/accounting/service.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/accounting/service.proto rename to src/FrostFS.SDK.Protos/accounting/service.proto diff --git a/src/FrostFS.SDK.ProtosV2/accounting/types.proto b/src/FrostFS.SDK.Protos/accounting/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/accounting/types.proto rename to src/FrostFS.SDK.Protos/accounting/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/acl/types.proto b/src/FrostFS.SDK.Protos/acl/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/acl/types.proto rename to src/FrostFS.SDK.Protos/acl/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/ape/types.proto b/src/FrostFS.SDK.Protos/ape/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/ape/types.proto rename to src/FrostFS.SDK.Protos/ape/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/apemanager/Extension.Message.cs b/src/FrostFS.SDK.Protos/apemanager/Extension.Message.cs similarity index 98% rename from src/FrostFS.SDK.ProtosV2/apemanager/Extension.Message.cs rename to src/FrostFS.SDK.Protos/apemanager/Extension.Message.cs index 408622d..53b7fdb 100644 --- a/src/FrostFS.SDK.ProtosV2/apemanager/Extension.Message.cs +++ b/src/FrostFS.SDK.Protos/apemanager/Extension.Message.cs @@ -1,4 +1,4 @@ -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using FrostFS.Session; using Google.Protobuf; diff --git a/src/FrostFS.SDK.ProtosV2/apemanager/service.proto b/src/FrostFS.SDK.Protos/apemanager/service.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/apemanager/service.proto rename to src/FrostFS.SDK.Protos/apemanager/service.proto diff --git a/src/FrostFS.SDK.ProtosV2/container/Extension.Message.cs b/src/FrostFS.SDK.Protos/container/Extension.Message.cs similarity index 99% rename from src/FrostFS.SDK.ProtosV2/container/Extension.Message.cs rename to src/FrostFS.SDK.Protos/container/Extension.Message.cs index 010072e..7cb69a8 100644 --- a/src/FrostFS.SDK.ProtosV2/container/Extension.Message.cs +++ b/src/FrostFS.SDK.Protos/container/Extension.Message.cs @@ -1,4 +1,4 @@ -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using FrostFS.Session; using Google.Protobuf; diff --git a/src/FrostFS.SDK.ProtosV2/container/service.proto b/src/FrostFS.SDK.Protos/container/service.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/container/service.proto rename to src/FrostFS.SDK.Protos/container/service.proto diff --git a/src/FrostFS.SDK.ProtosV2/container/types.proto b/src/FrostFS.SDK.Protos/container/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/container/types.proto rename to src/FrostFS.SDK.Protos/container/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/lock/types.proto b/src/FrostFS.SDK.Protos/lock/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/lock/types.proto rename to src/FrostFS.SDK.Protos/lock/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/netmap/Extension.Message.cs b/src/FrostFS.SDK.Protos/netmap/Extension.Message.cs similarity index 98% rename from src/FrostFS.SDK.ProtosV2/netmap/Extension.Message.cs rename to src/FrostFS.SDK.Protos/netmap/Extension.Message.cs index 1001bce..8579baf 100644 --- a/src/FrostFS.SDK.ProtosV2/netmap/Extension.Message.cs +++ b/src/FrostFS.SDK.Protos/netmap/Extension.Message.cs @@ -1,4 +1,4 @@ -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using FrostFS.Session; using Google.Protobuf; diff --git a/src/FrostFS.SDK.ProtosV2/netmap/service.proto b/src/FrostFS.SDK.Protos/netmap/service.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/netmap/service.proto rename to src/FrostFS.SDK.Protos/netmap/service.proto diff --git a/src/FrostFS.SDK.ProtosV2/netmap/types.proto b/src/FrostFS.SDK.Protos/netmap/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/netmap/types.proto rename to src/FrostFS.SDK.Protos/netmap/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/object/Extension.Message.cs b/src/FrostFS.SDK.Protos/object/Extension.Message.cs similarity index 99% rename from src/FrostFS.SDK.ProtosV2/object/Extension.Message.cs rename to src/FrostFS.SDK.Protos/object/Extension.Message.cs index 6691400..f9348ff 100644 --- a/src/FrostFS.SDK.ProtosV2/object/Extension.Message.cs +++ b/src/FrostFS.SDK.Protos/object/Extension.Message.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using FrostFS.Session; using Google.Protobuf; diff --git a/src/FrostFS.SDK.ProtosV2/object/service.proto b/src/FrostFS.SDK.Protos/object/service.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/object/service.proto rename to src/FrostFS.SDK.Protos/object/service.proto diff --git a/src/FrostFS.SDK.ProtosV2/object/types.proto b/src/FrostFS.SDK.Protos/object/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/object/types.proto rename to src/FrostFS.SDK.Protos/object/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/refs/types.proto b/src/FrostFS.SDK.Protos/refs/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/refs/types.proto rename to src/FrostFS.SDK.Protos/refs/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/session/Extension.Message.cs b/src/FrostFS.SDK.Protos/session/Extension.Message.cs similarity index 96% rename from src/FrostFS.SDK.ProtosV2/session/Extension.Message.cs rename to src/FrostFS.SDK.Protos/session/Extension.Message.cs index 4f0850b..b7ca64e 100644 --- a/src/FrostFS.SDK.ProtosV2/session/Extension.Message.cs +++ b/src/FrostFS.SDK.Protos/session/Extension.Message.cs @@ -1,4 +1,4 @@ -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using Google.Protobuf; diff --git a/src/FrostFS.SDK.ProtosV2/session/Extension.MetaHeader.cs b/src/FrostFS.SDK.Protos/session/Extension.MetaHeader.cs similarity index 100% rename from src/FrostFS.SDK.ProtosV2/session/Extension.MetaHeader.cs rename to src/FrostFS.SDK.Protos/session/Extension.MetaHeader.cs diff --git a/src/FrostFS.SDK.ProtosV2/session/Extension.VerificationHeader.cs b/src/FrostFS.SDK.Protos/session/Extension.VerificationHeader.cs similarity index 100% rename from src/FrostFS.SDK.ProtosV2/session/Extension.VerificationHeader.cs rename to src/FrostFS.SDK.Protos/session/Extension.VerificationHeader.cs diff --git a/src/FrostFS.SDK.ProtosV2/session/Extension.XHeader.cs b/src/FrostFS.SDK.Protos/session/Extension.XHeader.cs similarity index 100% rename from src/FrostFS.SDK.ProtosV2/session/Extension.XHeader.cs rename to src/FrostFS.SDK.Protos/session/Extension.XHeader.cs diff --git a/src/FrostFS.SDK.ProtosV2/session/service.proto b/src/FrostFS.SDK.Protos/session/service.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/session/service.proto rename to src/FrostFS.SDK.Protos/session/service.proto diff --git a/src/FrostFS.SDK.ProtosV2/session/types.proto b/src/FrostFS.SDK.Protos/session/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/session/types.proto rename to src/FrostFS.SDK.Protos/session/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/status/types.proto b/src/FrostFS.SDK.Protos/status/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/status/types.proto rename to src/FrostFS.SDK.Protos/status/types.proto diff --git a/src/FrostFS.SDK.ProtosV2/tombstone/types.proto b/src/FrostFS.SDK.Protos/tombstone/types.proto similarity index 100% rename from src/FrostFS.SDK.ProtosV2/tombstone/types.proto rename to src/FrostFS.SDK.Protos/tombstone/types.proto diff --git a/src/FrostFS.SDK.Tests/ContainerTest.cs b/src/FrostFS.SDK.Tests/ContainerTest.cs index 8f4e868..0d12107 100644 --- a/src/FrostFS.SDK.Tests/ContainerTest.cs +++ b/src/FrostFS.SDK.Tests/ContainerTest.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using Google.Protobuf; diff --git a/src/FrostFS.SDK.Tests/ContainerTestsBase.cs b/src/FrostFS.SDK.Tests/ContainerTestsBase.cs index f9bfc9a..55f548d 100644 --- a/src/FrostFS.SDK.Tests/ContainerTestsBase.cs +++ b/src/FrostFS.SDK.Tests/ContainerTestsBase.cs @@ -1,4 +1,4 @@ -using FrostFS.SDK.ClientV2.Interfaces; +using FrostFS.SDK.Client.Interfaces; using Microsoft.Extensions.Options; @@ -29,7 +29,7 @@ public abstract class ContainerTestsBase protected IFrostFSClient GetClient() { - return ClientV2.FrostFSClient.GetTestInstance( + return Client.FrostFSClient.GetTestInstance( Settings, null, new NetworkMocker(this.key).GetMock().Object, diff --git a/src/FrostFS.SDK.Tests/FrostFS.SDK.Tests.csproj b/src/FrostFS.SDK.Tests/FrostFS.SDK.Tests.csproj index 2b74f0f..d5cb78f 100644 --- a/src/FrostFS.SDK.Tests/FrostFS.SDK.Tests.csproj +++ b/src/FrostFS.SDK.Tests/FrostFS.SDK.Tests.csproj @@ -9,6 +9,14 @@ true + + true + + + + true + + @@ -22,11 +30,11 @@ - + - + diff --git a/src/FrostFS.SDK.Tests/Mocks/AsyncStreamRangeReaderMock.cs b/src/FrostFS.SDK.Tests/Mocks/AsyncStreamRangeReaderMock.cs index e60b600..d1366c7 100644 --- a/src/FrostFS.SDK.Tests/Mocks/AsyncStreamRangeReaderMock.cs +++ b/src/FrostFS.SDK.Tests/Mocks/AsyncStreamRangeReaderMock.cs @@ -1,8 +1,8 @@ using System.Security.Cryptography; using FrostFS.Object; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using FrostFS.Session; diff --git a/src/FrostFS.SDK.Tests/Mocks/AsyncStreamReaderMock.cs b/src/FrostFS.SDK.Tests/Mocks/AsyncStreamReaderMock.cs index 63e3d64..c09df83 100644 --- a/src/FrostFS.SDK.Tests/Mocks/AsyncStreamReaderMock.cs +++ b/src/FrostFS.SDK.Tests/Mocks/AsyncStreamReaderMock.cs @@ -1,8 +1,8 @@ using System.Security.Cryptography; using FrostFS.Object; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using FrostFS.Session; diff --git a/src/FrostFS.SDK.Tests/Mocks/ClientStreamWriter.cs b/src/FrostFS.SDK.Tests/Mocks/ClientStreamWriter.cs index f386468..7fba4f6 100644 --- a/src/FrostFS.SDK.Tests/Mocks/ClientStreamWriter.cs +++ b/src/FrostFS.SDK.Tests/Mocks/ClientStreamWriter.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using Grpc.Core; diff --git a/src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/ContainerServiceBase.cs b/src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/ContainerServiceBase.cs index e727cfb..ca1c670 100644 --- a/src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/ContainerServiceBase.cs +++ b/src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/ContainerServiceBase.cs @@ -2,8 +2,8 @@ using System.Security.Cryptography; using FrostFS.Container; using FrostFS.Object; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using FrostFS.Session; diff --git a/src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/GetContainerMock.cs b/src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/GetContainerMock.cs index aa4d048..0ad6ab0 100644 --- a/src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/GetContainerMock.cs +++ b/src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/GetContainerMock.cs @@ -2,8 +2,8 @@ using System.Collections.ObjectModel; using FrostFS.Container; using FrostFS.Refs; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using FrostFS.Session; diff --git a/src/FrostFS.SDK.Tests/Mocks/ObjectMock.cs b/src/FrostFS.SDK.Tests/Mocks/ObjectMock.cs index 7c44fc8..4b2b5c1 100644 --- a/src/FrostFS.SDK.Tests/Mocks/ObjectMock.cs +++ b/src/FrostFS.SDK.Tests/Mocks/ObjectMock.cs @@ -2,8 +2,8 @@ using System.Collections.ObjectModel; using System.Security.Cryptography; using FrostFS.Object; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using FrostFS.Session; diff --git a/src/FrostFS.SDK.Tests/Mocks/PatchStreamWriter.cs b/src/FrostFS.SDK.Tests/Mocks/PatchStreamWriter.cs index a2672c8..7eb53bc 100644 --- a/src/FrostFS.SDK.Tests/Mocks/PatchStreamWriter.cs +++ b/src/FrostFS.SDK.Tests/Mocks/PatchStreamWriter.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -using FrostFS.SDK.ProtosV2.Interfaces; +using FrostFS.SDK.Proto.Interfaces; using Grpc.Core; diff --git a/src/FrostFS.SDK.Tests/NetworkTest.cs b/src/FrostFS.SDK.Tests/NetworkTest.cs index 99fa2b2..2123460 100644 --- a/src/FrostFS.SDK.Tests/NetworkTest.cs +++ b/src/FrostFS.SDK.Tests/NetworkTest.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using FrostFS.Netmap; -using FrostFS.SDK.ClientV2; +using FrostFS.SDK.Client; using Google.Protobuf; diff --git a/src/FrostFS.SDK.Tests/NetworkTestsBase.cs b/src/FrostFS.SDK.Tests/NetworkTestsBase.cs index 071b425..8090ecd 100644 --- a/src/FrostFS.SDK.Tests/NetworkTestsBase.cs +++ b/src/FrostFS.SDK.Tests/NetworkTestsBase.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.Security.Cryptography; -using FrostFS.SDK.ClientV2.Interfaces; +using FrostFS.SDK.Client.Interfaces; using FrostFS.SDK.Cryptography; using Microsoft.Extensions.Options; @@ -37,7 +37,7 @@ public abstract class NetworkTestsBase protected IFrostFSClient GetClient() { - return ClientV2.FrostFSClient.GetTestInstance( + return Client.FrostFSClient.GetTestInstance( Settings, null, Mocker.GetMock().Object, diff --git a/src/FrostFS.SDK.Tests/ObjectTest.cs b/src/FrostFS.SDK.Tests/ObjectTest.cs index 3f3a404..dabbbc8 100644 --- a/src/FrostFS.SDK.Tests/ObjectTest.cs +++ b/src/FrostFS.SDK.Tests/ObjectTest.cs @@ -4,8 +4,8 @@ using System.Security.Cryptography; using System.Text; using FrostFS.Refs; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; using FrostFS.SDK.Cryptography; using Google.Protobuf; diff --git a/src/FrostFS.SDK.Tests/ObjectTestsBase.cs b/src/FrostFS.SDK.Tests/ObjectTestsBase.cs index 543bda6..ba68e6f 100644 --- a/src/FrostFS.SDK.Tests/ObjectTestsBase.cs +++ b/src/FrostFS.SDK.Tests/ObjectTestsBase.cs @@ -1,5 +1,5 @@ -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Interfaces; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Interfaces; using FrostFS.SDK.Cryptography; using Microsoft.Extensions.Options; diff --git a/src/FrostFS.SDK.Tests/PoolSmokeTests.cs b/src/FrostFS.SDK.Tests/PoolSmokeTests.cs index 01320b5..efc4802 100644 --- a/src/FrostFS.SDK.Tests/PoolSmokeTests.cs +++ b/src/FrostFS.SDK.Tests/PoolSmokeTests.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.Security.Cryptography; -using FrostFS.SDK.ClientV2; +using FrostFS.SDK.Client; using FrostFS.SDK.Cryptography; using Microsoft.Extensions.Options; diff --git a/src/FrostFS.SDK.Tests/SessionTests.cs b/src/FrostFS.SDK.Tests/SessionTests.cs index 8009f5c..4cf03ba 100644 --- a/src/FrostFS.SDK.Tests/SessionTests.cs +++ b/src/FrostFS.SDK.Tests/SessionTests.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Mappers.GRPC; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Mappers.GRPC; namespace FrostFS.SDK.Tests; diff --git a/src/FrostFS.SDK.Tests/SessionTestsBase.cs b/src/FrostFS.SDK.Tests/SessionTestsBase.cs index a8fbdaf..93bc140 100644 --- a/src/FrostFS.SDK.Tests/SessionTestsBase.cs +++ b/src/FrostFS.SDK.Tests/SessionTestsBase.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography; -using FrostFS.SDK.ClientV2.Interfaces; +using FrostFS.SDK.Client.Interfaces; using FrostFS.SDK.Cryptography; using Microsoft.Extensions.Options; @@ -37,7 +37,7 @@ public abstract class SessionTestsBase protected IFrostFSClient GetClient() { - return ClientV2.FrostFSClient.GetTestInstance( + return Client.FrostFSClient.GetTestInstance( Settings, null, new NetworkMocker(this.key).GetMock().Object, diff --git a/src/FrostFS.SDK.Tests/SmokeClientTests.cs b/src/FrostFS.SDK.Tests/SmokeClientTests.cs index 56acfc3..ba822c7 100644 --- a/src/FrostFS.SDK.Tests/SmokeClientTests.cs +++ b/src/FrostFS.SDK.Tests/SmokeClientTests.cs @@ -1,8 +1,8 @@ using System.Diagnostics.CodeAnalysis; using System.Security.Cryptography; -using FrostFS.SDK.ClientV2; -using FrostFS.SDK.ClientV2.Interfaces; +using FrostFS.SDK.Client; +using FrostFS.SDK.Client.Interfaces; using FrostFS.SDK.Cryptography; using Microsoft.Extensions.Options; diff --git a/src/FrostFS.SDK.Tests/SmokeTestsBase.cs b/src/FrostFS.SDK.Tests/SmokeTestsBase.cs index e0d53d7..5d67029 100644 --- a/src/FrostFS.SDK.Tests/SmokeTestsBase.cs +++ b/src/FrostFS.SDK.Tests/SmokeTestsBase.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography; -using FrostFS.SDK.ClientV2; +using FrostFS.SDK.Client; using FrostFS.SDK.Cryptography; namespace FrostFS.SDK.SmokeTests;