Fix Bug Illegal taskname in deleteReminderTask(). fixes #291 @1h

mizo0203 · Jan 21, 2018 · 61d683e · 61d683e
1 parent 8786065
commit 61d683e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/lily-white-line-bot.iml b/lily-white-line-bot.iml
@@ -24,5 +24,6 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.9" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.9" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -76,6 +76,12 @@ Copyright 2015 Google Inc.
         </dependency>
         <!-- [END Jackson] -->
 
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
     </dependencies>
     <build>
         <!-- for hot reload of the web application -->

diff --git a/src/main/java/com/mizo0203/lilywhite/repo/PushQueueRepository.java b/src/main/java/com/mizo0203/lilywhite/repo/PushQueueRepository.java
@@ -5,6 +5,7 @@
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.mizo0203.lilywhite.push_task.ReminderTaskServlet;
 
+import javax.annotation.Nonnull;
 import java.util.logging.Logger;
 
 /* package */ class PushQueueRepository {
@@ -43,7 +44,7 @@ protected String enqueueReminderTask(String source_id, long etaMillis, String me
         .getName();
   }
 
-  public void deleteReminderTask(String taskName) {
+  public void deleteReminderTask(@Nonnull String taskName) {
     // Delete an individual task...
     mQueue.deleteTask(taskName);
   }

diff --git a/src/main/java/com/mizo0203/lilywhite/repo/Repository.java b/src/main/java/com/mizo0203/lilywhite/repo/Repository.java
@@ -55,7 +55,11 @@ public void clearEvent(String sourceId) {
   }
 
   private void deleteReminderTask(LineTalkRoomConfig config) {
-    mPushQueueRepository.deleteReminderTask(config.getReminderEnqueuedTaskName());
+    String taskName = config.getReminderEnqueuedTaskName();
+    if (taskName == null || taskName.isEmpty()) {
+      return;
+    }
+    mPushQueueRepository.deleteReminderTask(taskName);
     config.setReminderEnqueuedTaskName(null);
   }
 

diff --git a/src/main/java/com/mizo0203/lilywhite/repo/objectify/entity/LineTalkRoomConfig.java b/src/main/java/com/mizo0203/lilywhite/repo/objectify/entity/LineTalkRoomConfig.java
@@ -4,6 +4,8 @@
 import com.googlecode.objectify.annotation.Id;
 import com.mizo0203.lilywhite.repo.objectify.OfyHelper;
 
+import javax.annotation.Nullable;
+
 /**
  * The @Entity tells Objectify about our entity. We also register it in {@link OfyHelper} Our
  * primary key @Id is set automatically by the Google Datastore for us.
@@ -50,6 +52,7 @@ public boolean isReminderEnqueued() {
     return reminderEnqueuedTaskName != null;
   }
 
+  @Nullable
   public String getReminderEnqueuedTaskName() {
     return reminderEnqueuedTaskName;
   }