check for null; clean up

Author: prwhelan

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PutTransformAction.java

@@ -169,11 +169,13 @@ public Task createTask(long id, String type, String action, TaskId parentTaskId,
     public interface TransformTaskMatcher {
         static boolean match(Task task, String expectedTransformId) {
             return task instanceof TransformTaskMatcher
+                && expectedTransformId != null
                 && task.getDescription().equals(TransformField.PERSISTENT_TASK_DESCRIPTION_PREFIX + expectedTransformId);
         }
 
         static boolean match(Task task, Collection<String> expectedTransformIds) {
-            return task instanceof PutTransformAction.TransformTaskMatcher
+            return task instanceof TransformTaskMatcher
+                && expectedTransformIds != null
                 && expectedTransformIds.stream()
                     .anyMatch(transformId -> task.getDescription().equals(TransformField.PERSISTENT_TASK_DESCRIPTION_PREFIX + transformId));
         }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StopTransformActionRequestTests.java

@@ -73,8 +73,7 @@ public void testMatch() {
             TransformField.PERSISTENT_TASK_DESCRIPTION_PREFIX + transformId,
             TaskId.EMPTY_TASK_ID,
             Collections.emptyMap()
-        ) {
-        };
+        );
 
         Request request = new Request("unrelated", false, false, null, false, false);
         request.setExpandedIds(Set.of("foo", "bar"));