Renamed Azure::Core::Amqp::Value to Azure::Core::Amqp::AmqpValue beca…

…use Value is too generic a type name when you have 'using namespace' directives
Azure · Mar 31, 2023 · 6716fa1 · 6716fa1
1 parent 513c796
commit 6716fa1
Show file tree

Hide file tree

Showing 34 changed files with 410 additions and 452 deletions.
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp
@@ -26,7 +26,7 @@ namespace Azure { namespace Core { namespace Amqp {
       uint32_t MaxFrameSize{512};
       uint16_t MaxSessions{65535};
 
-      Azure::Core::Amqp::Models::Value Properties;
+      Azure::Core::Amqp::Models::AmqpValue Properties;
 
       std::chrono::seconds Timeout{0};
 
@@ -78,7 +78,7 @@ namespace Azure { namespace Core { namespace Amqp {
     {
       virtual void OnEndpointFrameReceived(
           Connection const& connection,
-          Azure::Core::Amqp::Models::Value const& value,
+          Azure::Core::Amqp::Models::AmqpValue const& value,
           uint32_t framePayloadSize,
           uint8_t* payloadBytes)
           = 0;
@@ -120,7 +120,7 @@ namespace Azure { namespace Core { namespace Amqp {
       void Close(
           std::string const& condition,
           std::string const& description,
-          Azure::Core::Amqp::Models::Value info);
+          Azure::Core::Amqp::Models::AmqpValue info);
 
       void Poll() const;
 
@@ -133,8 +133,8 @@ namespace Azure { namespace Core { namespace Amqp {
       void SetIdleTimeout(std::chrono::milliseconds timeout);
       void SetRemoteIdleTimeoutEmptyFrameSendRatio(double idleTimeoutEmptyFrameSendRatio);
 
-      void SetProperties(Azure::Core::Amqp::Models::Value properties);
-      Azure::Core::Amqp::Models::Value GetProperties() const;
+      void SetProperties(Azure::Core::Amqp::Models::AmqpValue properties);
+      Azure::Core::Amqp::Models::AmqpValue GetProperties() const;
       uint64_t HandleDeadlines(); // ???
       Endpoint CreateEndpoint();
       void StartEndpoint(Endpoint const& endpoint);

diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/link.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/link.hpp
@@ -103,7 +103,7 @@ namespace Azure { namespace Core { namespace Amqp {
 
       uint64_t GetPeerMaxMessageSize() const;
 
-      void SetAttachProperties(Azure::Core::Amqp::Models::Value attachProperties);
+      void SetAttachProperties(Azure::Core::Amqp::Models::AmqpValue attachProperties);
       void SetMaxLinkCredit(uint32_t maxLinkCredit);
 
       std::string GetName() const;
@@ -119,7 +119,7 @@ namespace Azure { namespace Core { namespace Amqp {
           bool close,
           std::string const& errorCondition,
           std::string const& errorDescription,
-          Azure::Core::Amqp::Models::Value& info);
+          Azure::Core::Amqp::Models::AmqpValue& info);
 
     private:
       std::shared_ptr<Azure::Core::Amqp::_detail::LinkImpl> m_impl;

diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp
@@ -58,7 +58,7 @@ namespace Azure { namespace Core { namespace Amqp {
       std::chrono::seconds ExpiryTimeout{std::chrono::seconds(0)};
       // LinkFilter
       bool ManualCredits{};
-      Azure::Core::Amqp::Models::Value Properties;
+      Azure::Core::Amqp::Models::AmqpValue Properties;
 
       std::vector<std::string> SenderCapabilities;
       LinkDurability SenderDurability{};
@@ -72,7 +72,7 @@ namespace Azure { namespace Core { namespace Amqp {
           MessageReceiverState newState,
           MessageReceiverState oldState)
           = 0;
-      virtual Azure::Core::Amqp::Models::Value OnMessageReceived(
+      virtual Azure::Core::Amqp::Models::AmqpValue OnMessageReceived(
           Azure::Core::Amqp::Models::Message message)
           = 0;
     };
@@ -126,7 +126,7 @@ namespace Azure { namespace Core { namespace Amqp {
       void SendMessageDisposition(
           const char* linkName,
           uint32_t messageNumber,
-          Azure::Core::Amqp::Models::Value deliveryState);
+          Azure::Core::Amqp::Models::AmqpValue deliveryState);
       void SetTrace(bool traceEnabled);
 
       Azure::Core::Amqp::Models::Message WaitForIncomingMessage(

diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp
@@ -71,7 +71,7 @@ namespace Azure { namespace Core { namespace Amqp {
       std::chrono::seconds ExpiryTimeout{std::chrono::seconds(0)};
       bool IgnoreDispositionErrors{false};
 
-      Azure::Core::Amqp::Models::Value Properties;
+      Azure::Core::Amqp::Models::AmqpValue Properties;
 
       ReceiverSettleMode RequestedReceiverSettleMode{};
 
@@ -85,7 +85,7 @@ namespace Azure { namespace Core { namespace Amqp {
     public:
       using MessageSendCompleteCallback = std::function<void(
           MessageSendResult sendResult,
-          Azure::Core::Amqp::Models::Value const& deliveryState)>;
+          Azure::Core::Amqp::Models::AmqpValue const& deliveryState)>;
 
       MessageSender(
           Session const& session,
@@ -134,7 +134,7 @@ namespace Azure { namespace Core { namespace Amqp {
 
       void Open();
       void Close();
-      std::tuple<MessageSendResult, Azure::Core::Amqp::Models::Value> Send(
+      std::tuple<MessageSendResult, Azure::Core::Amqp::Models::AmqpValue> Send(
           Azure::Core::Amqp::Models::Message const& message,
           Azure::Core::Context context = {});
       void SendAsync(

diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_message.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_message.hpp
@@ -39,37 +39,37 @@ namespace Azure { namespace Core { namespace Amqp { namespace Models {
     void SetHeader(Header const& header);
     Header const GetHeader() const;
 
-    void SetFooter(Value const& header);
-    Value const GetFooter() const;
+    void SetFooter(AmqpValue const& header);
+    AmqpValue const GetFooter() const;
 
-    void SetDeliveryAnnotations(Value const& annotations);
-    Value const GetDeliveryAnnotations() const;
+    void SetDeliveryAnnotations(AmqpValue const& annotations);
+    AmqpValue const GetDeliveryAnnotations() const;
 
     void SetFormat(uint32_t messageFormat);
     uint32_t GetFormat() const;
 
-    void SetMessageAnnotations(Value const& annotations);
-    Value const GetMessageAnnotations() const;
+    void SetMessageAnnotations(AmqpValue const& annotations);
+    AmqpValue const GetMessageAnnotations() const;
 
     void SetProperties(Properties const& properties);
     Properties const GetProperties() const;
 
-    void SetApplicationProperties(Value const& value);
-    Value const GetApplicationProperties() const;
+    void SetApplicationProperties(AmqpValue const& value);
+    AmqpValue const GetApplicationProperties() const;
 
     MessageBodyType GetBodyType() const;
 
-    void AddBodyAmqpSequence(Value const& value);
+    void AddBodyAmqpSequence(AmqpValue const& value);
     size_t GetBodyAmqpSequenceCount() const;
-    Value const GetBodyAmqpSequence(uint32_t index) const;
+    AmqpValue const GetBodyAmqpSequence(uint32_t index) const;
 
     void AddBodyAmqpData(BinaryData binaryData);
 
     BinaryData GetBodyAmqpData(size_t index) const;
     size_t GetBodyAmqpDataCount() const;
 
-    void SetBodyAmqpValue(Value value);
-    Value GetBodyAmqpValue() const;
+    void SetBodyAmqpValue(AmqpValue value);
+    AmqpValue GetBodyAmqpValue() const;
 
     friend std::ostream& operator<<(std::ostream&, Message const&);
   };

diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_properties.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_properties.hpp
@@ -26,23 +26,23 @@ namespace Azure { namespace Core { namespace Amqp { namespace Models {
 
     ~Properties();
 
-    Value GetMessageId() const;
-    void SetMessageId(Value const& messageId);
+    AmqpValue GetMessageId() const;
+    void SetMessageId(AmqpValue const& messageId);
 
-    Value GetCorrelationId() const;
-    void SetCorrelationId(Value const& correlationId);
+    AmqpValue GetCorrelationId() const;
+    void SetCorrelationId(AmqpValue const& correlationId);
 
     BinaryData GetUserId() const;
     void SetUserId(BinaryData const& userId);
 
-    Value GetTo() const;
-    void SetTo(Value replyTo);
+    AmqpValue GetTo() const;
+    void SetTo(AmqpValue replyTo);
 
     std::string GetSubject() const;
     void SetSubject(std::string const& replyTo);
 
-    Value GetReplyTo() const;
-    void SetReplyTo(Value replyTo);
+    AmqpValue GetReplyTo() const;
+    void SetReplyTo(AmqpValue replyTo);
 
     std::string GetContentType() const;
     void SetContentType(std::string const& contentType);
@@ -68,9 +68,4 @@ namespace Azure { namespace Core { namespace Amqp { namespace Models {
     friend std::ostream& operator<<(std::ostream&, Properties const&);
   };
 
-#if 0
-
-	// Move to AMQPValue:
-
-#endif
 }}}} // namespace Azure::Core::Amqp::Models