diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp index 7ffcf7269..d336def65 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp @@ -37,8 +37,8 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace Cryptography { namespace _detail { - struct CryptographyProvider; - struct RemoteCryptographyClient; + class CryptographyProvider; + class RemoteCryptographyClient; } // namespace _detail /** diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_provider.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_provider.hpp index 05749d17f..f2181d3ae 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_provider.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_provider.hpp @@ -34,8 +34,8 @@ namespace Azure { namespace Cryptography { namespace _detail { - struct CryptographyProvider - { + class CryptographyProvider { + public: virtual ~CryptographyProvider() = default; virtual bool CanRemote() const noexcept = 0; diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp index 7cfc2713f..82126f4f9 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp @@ -35,78 +35,78 @@ namespace Azure { namespace _detail { /***************** Encrypt Result *****************/ - struct EncryptResultSerializer final - { + class EncryptResultSerializer final { + public: static EncryptResult EncryptResultDeserialize( Azure::Core::Http::RawResponse const& rawResponse); }; /***************** Encrypt Parameters *****************/ - struct EncryptParametersSerializer final - { + class EncryptParametersSerializer final { + public: static std::string EncryptParametersSerialize( Azure::Security::KeyVault::Keys::Cryptography::EncryptParameters const& parameters); }; /***************** Decrypt Result *****************/ - struct DecryptResultSerializer final - { + class DecryptResultSerializer final { + public: static DecryptResult DecryptResultDeserialize( Azure::Core::Http::RawResponse const& rawResponse); }; /***************** Encrypt Parameters *****************/ - struct DecryptParametersSerializer final - { + class DecryptParametersSerializer final { + public: static std::string DecryptParametersSerialize( Azure::Security::KeyVault::Keys::Cryptography::DecryptParameters const& parameters); }; /***************** WrapKey Result *****************/ - struct WrapResultSerializer final - { + class WrapResultSerializer final { + public: static WrapResult WrapResultDeserialize(Azure::Core::Http::RawResponse const& rawResponse); }; /***************** WrapKey Parameters *****************/ - struct KeyWrapParametersSerializer final - { + class KeyWrapParametersSerializer final { + public: static std::string KeyWrapParametersSerialize( Azure::Security::KeyVault::Keys::Cryptography::_detail::KeyWrapParameters const& parameters); }; /***************** UnwrapKey Result *****************/ - struct UnwrapResultSerializer final - { + class UnwrapResultSerializer final { + public: static UnwrapResult UnwrapResultDeserialize( Azure::Core::Http::RawResponse const& rawResponse); }; /***************** Sign Result *****************/ - struct SignResultSerializer final - { + class SignResultSerializer final { + public: static SignResult SignResultDeserialize(Azure::Core::Http::RawResponse const& rawResponse); }; /***************** Key sign Parameters *****************/ - struct KeySignParametersSerializer final - { + class KeySignParametersSerializer final { + public: static std::string KeySignParametersSerialize( Azure::Security::KeyVault::Keys::Cryptography::_detail::KeySignParameters const& parameters); }; /***************** Verify Result *****************/ - struct VerifyResultSerializer final - { + class VerifyResultSerializer final { + public: static VerifyResult VerifyResultDeserialize( Azure::Core::Http::RawResponse const& rawResponse); }; /***************** Key Verify Parameters *****************/ - struct KeyVerifyParametersSerializer final - { + class KeyVerifyParametersSerializer final { + public: static std::string KeyVerifyParametersSerialize( Azure::Security::KeyVault::Keys::Cryptography::_detail::KeyVerifyParameters const& parameters); diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_backup.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_backup.hpp index 3cf0edc9a..6f07ad847 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_backup.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_backup.hpp @@ -17,9 +17,8 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace _detail { - struct KeyBackup final : public Azure::Core::Json::_internal::JsonSerializable - { - + class KeyBackup final : public Azure::Core::Json::_internal::JsonSerializable { + public: std::vector Value; std::string Serialize() const override; diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp index 6250f9013..8db9aac80 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp @@ -20,8 +20,8 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace _detail { /***************** KeyVault Key *****************/ - struct KeyVaultKeySerializer final - { + class KeyVaultKeySerializer final { + public: // Creates a new key based on a name and an HTTP raw response. static KeyVaultKey KeyVaultKeyDeserialize( std::string const& name, @@ -83,22 +83,22 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam }; /**************** Deleted Key *******************/ - struct DeletedKeySerializer final - { + class DeletedKeySerializer final { + public: static DeletedKey DeletedKeyDeserialize( std::string const& name, Azure::Core::Http::RawResponse const& rawResponse); }; /**************** Import Key Options ***********/ - struct ImportKeyOptionsSerializer final - { + class ImportKeyOptionsSerializer final { + public: static std::string ImportKeyOptionsSerialize(ImportKeyOptions const& importKeyOptions); }; /**************** Key Properties ************/ - struct KeyPropertiesPagedResultSerializer final - { + class KeyPropertiesPagedResultSerializer final { + public: static KeyPropertiesPagedResponse KeyPropertiesPagedResultDeserialize( Azure::Core::Http::RawResponse const& rawResponse); static DeletedKeyPagedResponse DeletedKeyPagedResultDeserialize( @@ -106,8 +106,8 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam }; /**************** JWK ************/ - struct JsonWebKeySerializer final - { + class JsonWebKeySerializer final { + public: static void JsonWebKeySerialize( JsonWebKey const& jwk, Azure::Core::Json::_internal::json& destJson); diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider_factory.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider_factory.hpp index 4dce23d21..664bdc15c 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider_factory.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider_factory.hpp @@ -24,8 +24,8 @@ namespace Azure { namespace Cryptography { namespace _detail { - struct LocalCryptographyProviderFactory final - { + class LocalCryptographyProviderFactory final { + public: LocalCryptographyProviderFactory() = delete; static std::unique_ptr Create( diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/remote_cryptography_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/remote_cryptography_client.hpp index 7db3cf3a8..daf1eba4b 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/remote_cryptography_client.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/remote_cryptography_client.hpp @@ -30,10 +30,9 @@ namespace Azure { namespace Cryptography { namespace _detail { - struct RemoteCryptographyClient final - : public Azure::Security::KeyVault::Keys::Cryptography::_detail::CryptographyProvider - { - + class RemoteCryptographyClient final + : public Azure::Security::KeyVault::Keys::Cryptography::_detail::CryptographyProvider { + public: std::shared_ptr Pipeline; Azure::Core::Url KeyId; diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/rsa_cryptography_provider.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/rsa_cryptography_provider.hpp index 9deaac4d2..92e48cf0b 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/rsa_cryptography_provider.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/rsa_cryptography_provider.hpp @@ -21,8 +21,8 @@ namespace Azure { namespace Cryptography { namespace _detail { - struct RsaCryptographyProvider final : public LocalCryptographyProvider - { + class RsaCryptographyProvider final : public LocalCryptographyProvider { + public: RsaCryptographyProvider( Azure::Security::KeyVault::Keys::JsonWebKey const& keyMaterial, Azure::Security::KeyVault::Keys::KeyProperties const& keyProperties,