review comments

Author: davidkyle

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlTasks.java

@@ -35,19 +35,13 @@ public static String datafeedTaskId(String datafeedId) {
 
     @Nullable
     public static PersistentTasksCustomMetaData.PersistentTask<?> getJobTask(String jobId, @Nullable PersistentTasksCustomMetaData tasks) {
-        if (tasks == null) {
-            return null;
-        }
-        return tasks.getTask(jobTaskId(jobId));
+        return tasks == null ? null : tasks.getTask(jobTaskId(jobId));
     }
 
     @Nullable
     public static PersistentTasksCustomMetaData.PersistentTask<?> getDatafeedTask(String datafeedId,
                                                                                   @Nullable PersistentTasksCustomMetaData tasks) {
-        if (tasks == null) {
-            return null;
-        }
-        return tasks.getTask(datafeedTaskId(datafeedId));
+        return tasks == null ? null : tasks.getTask(datafeedTaskId(datafeedId));
     }
 
     public static JobState getJobState(String jobId, @Nullable PersistentTasksCustomMetaData tasks) {

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlTasksTests.java

@@ -42,4 +42,27 @@ public void testGetDatefeedState() {
         tasksBuilder.updateTaskState(MlTasks.datafeedTaskId("foo"), DatafeedState.STARTED);
         assertEquals(DatafeedState.STARTED, MlTasks.getDatafeedState("foo", tasksBuilder.build()));
     }
+
+    public void testGetJobTask() {
+        assertNull(MlTasks.getJobTask("foo", null));
+
+        PersistentTasksCustomMetaData.Builder tasksBuilder =  PersistentTasksCustomMetaData.builder();
+        tasksBuilder.addTask(MlTasks.jobTaskId("foo"), OpenJobAction.TASK_NAME, new OpenJobAction.JobParams("foo"),
+                new PersistentTasksCustomMetaData.Assignment("bar", "test assignment"));
+
+        assertNotNull(MlTasks.getJobTask("foo", tasksBuilder.build()));
+        assertNull(MlTasks.getJobTask("other", tasksBuilder.build()));
+    }
+
+    public void testGetDatafeedTask() {
+        assertNull(MlTasks.getDatafeedTask("foo", null));
+
+        PersistentTasksCustomMetaData.Builder tasksBuilder = PersistentTasksCustomMetaData.builder();
+        tasksBuilder.addTask(MlTasks.datafeedTaskId("foo"), StartDatafeedAction.TASK_NAME,
+                new StartDatafeedAction.DatafeedParams("foo", 0L),
+                new PersistentTasksCustomMetaData.Assignment("bar", "test assignment"));
+
+        assertNotNull(MlTasks.getDatafeedTask("foo", tasksBuilder.build()));
+        assertNull(MlTasks.getDatafeedTask("other", tasksBuilder.build()));
+    }
 }