Skip to content

Commit 1f0ad95

Browse files
jan-elasticjan-elastic
committed
refactor
1 parent 04a867a commit 1f0ad95

File tree

14 files changed

+73
-85
lines changed

14 files changed

+73
-85
lines changed

‎x-pack/plugin/core/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ dependencies {
9494
testImplementation(project(':x-pack:license-tools')) {
9595
transitive = false
9696
}
97+
testImplementation(project(':x-pack:plugin:transform'))
9798

9899
yamlRestTestImplementation project(':x-pack:plugin:core')
99100
javaRestTestImplementation(testArtifact(project(xpackModule('core'))))

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ public Request(StreamInput in) throws IOException {
8181

8282
@Override
8383
public boolean match(Task task) {
84-
// Only get tasks that we have expanded to
85-
return PutTransformAction.TransformTaskMatcher.match(task, expandedIds);
84+
return task instanceof TransformTaskMatcher matcher && matcher.match(expandedIds);
8685
}
8786

8887
public String getId() {

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.elasticsearch.xpack.core.transform.utils.TransformStrings;
2626

2727
import java.io.IOException;
28-
import java.util.Collection;
2928
import java.util.Map;
3029
import java.util.Objects;
3130

@@ -165,20 +164,4 @@ public Task createTask(long id, String type, String action, TaskId parentTaskId,
165164
return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers);
166165
}
167166
}
168-
169-
public interface TransformTaskMatcher {
170-
static boolean match(Task task, String expectedTransformId) {
171-
return task instanceof TransformTaskMatcher
172-
&& expectedTransformId != null
173-
&& task.getDescription().equals(TransformField.PERSISTENT_TASK_DESCRIPTION_PREFIX + expectedTransformId);
174-
}
175-
176-
static boolean match(Task task, Collection<String> expectedTransformIds) {
177-
return task instanceof TransformTaskMatcher
178-
&& expectedTransformIds != null
179-
&& expectedTransformIds.stream()
180-
.anyMatch(transformId -> task.getDescription().equals(TransformField.PERSISTENT_TASK_DESCRIPTION_PREFIX + transformId));
181-
}
182-
}
183-
184167
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public boolean equals(Object obj) {
9898

9999
@Override
100100
public boolean match(Task task) {
101-
return PutTransformAction.TransformTaskMatcher.match(task, id);
101+
return task instanceof TransformTaskMatcher matcher && matcher.match(id);
102102
}
103103
}
104104

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public boolean equals(Object obj) {
170170

171171
@Override
172172
public boolean match(Task task) {
173-
return PutTransformAction.TransformTaskMatcher.match(task, expandedIds);
173+
return task instanceof TransformTaskMatcher matcher && matcher.match(expandedIds);
174174
}
175175
}
176176

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
package org.elasticsearch.xpack.core.transform.action;
9+
10+
import java.util.Collection;
11+
12+
public interface TransformTaskMatcher {
13+
boolean match(String transformId);
14+
15+
boolean match(Collection<String> transformIds);
16+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public boolean equals(Object obj) {
185185

186186
@Override
187187
public boolean match(Task task) {
188-
return PutTransformAction.TransformTaskMatcher.match(task, id);
188+
return task instanceof TransformTaskMatcher matcher && matcher.match(id);
189189
}
190190
}
191191

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,22 @@
1414
import org.elasticsearch.common.io.stream.StreamInput;
1515
import org.elasticsearch.common.io.stream.Writeable;
1616
import org.elasticsearch.common.settings.Settings;
17+
import org.elasticsearch.core.TimeValue;
1718
import org.elasticsearch.search.SearchModule;
19+
import org.elasticsearch.tasks.Task;
20+
import org.elasticsearch.tasks.TaskId;
1821
import org.elasticsearch.test.AbstractWireSerializingTestCase;
1922
import org.elasticsearch.xcontent.NamedXContentRegistry;
23+
import org.elasticsearch.xpack.core.transform.TransformConfigVersion;
2024
import org.elasticsearch.xpack.core.transform.TransformField;
2125
import org.elasticsearch.xpack.core.transform.TransformNamedXContentProvider;
2226
import org.elasticsearch.xpack.core.transform.transforms.NullRetentionPolicyConfig;
2327
import org.elasticsearch.xpack.core.transform.transforms.RetentionPolicyConfig;
2428
import org.elasticsearch.xpack.core.transform.transforms.SyncConfig;
2529
import org.elasticsearch.xpack.core.transform.transforms.TimeRetentionPolicyConfig;
2630
import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig;
31+
import org.elasticsearch.xpack.core.transform.transforms.TransformTaskParams;
32+
import org.elasticsearch.xpack.transform.transforms.TransformTask;
2733
import org.junit.Before;
2834

2935
import java.io.IOException;
@@ -95,4 +101,20 @@ protected <X extends Writeable, Y extends Writeable> Y writeAndReadBWCObject(
95101
}
96102
}
97103
}
104+
105+
Task createTransformTask(String transformId) {
106+
return new TransformTask(
107+
1L,
108+
"persistent",
109+
"action",
110+
TaskId.EMPTY_TASK_ID,
111+
new TransformTaskParams(transformId, TransformConfigVersion.CURRENT, TimeValue.timeValueSeconds(10), false),
112+
null,
113+
null,
114+
null,
115+
null,
116+
null,
117+
null
118+
);
119+
}
98120
}

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.tasks.CancellableTask;
1313
import org.elasticsearch.tasks.Task;
1414
import org.elasticsearch.tasks.TaskId;
15-
import org.elasticsearch.test.AbstractWireSerializingTestCase;
1615
import org.elasticsearch.xpack.core.transform.action.GetTransformStatsAction.Request;
1716

1817
import java.util.Map;
@@ -21,7 +20,7 @@
2120
import static org.hamcrest.Matchers.instanceOf;
2221
import static org.hamcrest.Matchers.is;
2322

24-
public class GetTransformStatsActionRequestTests extends AbstractWireSerializingTestCase<Request> {
23+
public class GetTransformStatsActionRequestTests extends AbstractWireSerializingTransformTestCase<Request> {
2524
@Override
2625
protected Request createTestInstance() {
2726
return new Request(
@@ -50,8 +49,8 @@ public void testCreateTask() {
5049

5150
public void testMatch() {
5251
Request request = new Request("some-transform", null, false);
53-
assertTrue(request.match(new FakeTransformTask(123, "", "", "data_frame_some-transform", null, null)));
54-
assertFalse(request.match(new FakeTransformTask(123, "", "", "some-transform", null, null)));
52+
assertTrue(request.match(createTransformTask("some-transform")));
53+
assertFalse(request.match(createTransformTask("data_frame_some-transform")));
5554
assertFalse(request.match(new Task(123, "", "", "data_frame_some-transform", null, null)));
5655
}
5756
}

0 commit comments

Comments
 (0)