优化代码

Author: Yurunsoft

src/Contract/IMessage.php

@@ -11,7 +11,7 @@ interface IMessage extends IArrayable
     /**
      * 获取消息 ID
      *
-     * @return string
+     * @return string|null
      */
     public function getMessageId(): string;
 
@@ -28,7 +28,7 @@ public function setMessageId(string $messageId);
      *
      * @return string
      */
-    public function getMessage(): string;
+    public function getMessage(): ?string;
 
     /**
      * 设置消息内容
@@ -53,6 +53,36 @@ public function getWorkingTimeout(): float;
      */
     public function setWorkingTimeout(float $workingTimeout);
 
+    /**
+     * 获取已重试次数
+     *
+     * @return integer
+     */
+    public function getRetryCount(): int;
+
+    /**
+     * 获取重试次数
+     *
+     * @param integer $retryCount
+     * @return void
+     */
+    public function setRetryCount(int $retryCount);
+
+    /**
+     * 获取最大重试次数
+     *
+     * @return integer
+     */
+    public function getMaxRetryCount(): int;
+
+    /**
+     * 获取最大重试次数
+     *
+     * @param integer $maxRetryCount
+     * @return void
+     */
+    public function setMaxRetryCount(int $maxRetryCount);
+
     /**
      * 从数组加载数据
      *

src/Model/Message.php

@@ -13,7 +13,7 @@ class Message implements IMessage
      *
      * @var string
      */
-    protected $messageId;
+    protected $messageId = '';
 
     /**
      * 已重试次数
@@ -106,18 +106,60 @@ public function setWorkingTimeout(float $workingTimeout)
         $this->workingTimeout = $workingTimeout;
     }
 
+    /**
+     * 获取已重试次数
+     *
+     * @return integer
+     */
+    public function getRetryCount(): int
+    {
+        return $this->retryCount;
+    }
+
+    /**
+     * 获取重试次数
+     *
+     * @param integer $retryCount
+     * @return void
+     */
+    public function setRetryCount(int $retryCount)
+    {
+        $this->retryCount = $retryCount;
+    }
+
+    /**
+     * 获取最大重试次数
+     *
+     * @return integer
+     */
+    public function getMaxRetryCount(): int
+    {
+        return $this->maxRetryCount;
+    }
+
+    /**
+     * 获取最大重试次数
+     *
+     * @param integer $maxRetryCount
+     * @return void
+     */
+    public function setMaxRetryCount(int $maxRetryCount)
+    {
+        $this->maxRetryCount = $maxRetryCount;
+    }
+
     /**
      * 将当前对象作为数组返回
      * @return array
      */
     public function toArray(): array
     {
         return [
-            'messageId'     =>  $this->messageId,
-            'retryCount'    =>  $this->retryCount,
-            'maxRetryCount' =>  $this->maxRetryCount,
-            'message'       =>  $this->message,
-            'workingTimeout'=>  $this->workingTimeout,
+            'messageId'     =>  $this->getMessageId(),
+            'retryCount'    =>  $this->getRetryCount(),
+            'maxRetryCount' =>  $this->getMaxRetryCount(),
+            'message'       =>  $this->getMessage(),
+            'workingTimeout'=>  $this->getWorkingTimeout(),
         ];
     }