[#8] In MessageOperator, temporary failure occurred. Try again.

Author: WikiDru

src/main/java/org/code13k/perri/business/message/MessageOperator.java

@@ -1,20 +1,26 @@
 package org.code13k.perri.business.message;
 
-import org.code13k.perri.app.Status;
+
 import org.code13k.perri.business.message.sender.BasicSender;
 import org.code13k.perri.business.message.sender.SenderFactory;
 import org.code13k.perri.model.MessageOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.function.Consumer;
 
 public class MessageOperator {
     // Logger
     private static final Logger mLogger = LoggerFactory.getLogger(MessageOperator.class);
 
+    // Const
+    private static final int MAX_RETRY_COUNT = 5;
+
     // Data
+    private Timer mRetryTimer = new Timer("perri-retry-timer");
     private ArrayList<MessageOperation> mQueue = new ArrayList<>();
     private long mSentMessageCount = 0;
 
@@ -57,14 +63,14 @@ public void add(MessageOperation messageOperation) {
     /**
      * Number of ready message
      */
-    public int getReadyMessageCount(){
+    public int getReadyMessageCount() {
         return mQueue.size();
     }
 
     /**
      * Number of sent message
      */
-    public long getSentMessageCount(){
+    public long getSentMessageCount() {
         return mSentMessageCount;
     }
 
@@ -85,7 +91,21 @@ public void accept(Integer result) {
                         mLogger.error("The operation has failed. (" + type + ")");
                     } else if (result == BasicSender.SendResult.TEMPORARY_FAILURE) {
                         mLogger.error("The operation has failed. But it's temporary. Try again. (" + type + ")");
-                        // TODO Impl
+
+                        // Retry operation
+                        if (messageOperation.getRetryCount() < MAX_RETRY_COUNT) {
+                            messageOperation.increaseRetryCount();
+                            mLogger.info("messageOperation = " + messageOperation);
+                            mRetryTimer.schedule(new TimerTask() {
+                                @Override
+                                public void run() {
+                                    add(messageOperation);
+                                }
+                            }, 3000 * messageOperation.getRetryCount());
+                        } else {
+                            // FAILURE
+                            mLogger.error("Failed to retry. The operation has failed. (" + type + ")");
+                        }
                     }
                 }
             });

src/main/java/org/code13k/perri/model/BasicModel.java

@@ -1,27 +1,12 @@
 package org.code13k.perri.model;
 
 import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
 public class BasicModel implements Cloneable {
-    // Logger
-    private Logger mLogger = null;
-
-    /**
-     * getLogger();
-     */
-    public Logger getLogger() {
-        if (mLogger == null) {
-            mLogger = LoggerFactory.getLogger(this.getClass());
-        }
-        return mLogger;
-    }
-
     /**
      * toMap()
      */
@@ -31,11 +16,9 @@ public Map<String, Object> toMap() {
             Field[] fields = ((Object) this).getClass().getDeclaredFields();
             for (Field field : fields) {
                 try {
-                    if (field.getName().equals("mLogger") == false) {
-                        field.setAccessible(true);
-                        result.put(field.getName(), field.get(this));
-                        field.setAccessible(false);
-                    }
+                    field.setAccessible(true);
+                    result.put(field.getName(), field.get(this));
+                    field.setAccessible(false);
                 } catch (IllegalAccessException ex) {
                     // Nothing
                 }

src/main/java/org/code13k/perri/model/MessageOperation.java

@@ -6,6 +6,7 @@ public class MessageOperation extends BasicModel {
     private ChannelInfo channelInfo;
     private Message message;
     private int messageCount = 1;
+    private int retryCount = 0;
 
     @Override
     public boolean equals(Object object) {
@@ -42,4 +43,12 @@ public int getMessageCount() {
     public void increaseMessageCount() {
         this.messageCount++;
     }
+
+    public int getRetryCount(){
+        return retryCount;
+    }
+
+    public void increaseRetryCount(){
+        this.retryCount++;
+    }
 }