Skip to content

Commit 6ace37d

Browse files
gtheagthea
committed
SplitTaskType in main
1 parent 567ca72 commit 6ace37d

59 files changed

Lines changed: 114 additions & 90 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎executor/src/main/java/io/split/android/client/service/executor/SplitTaskType.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package io.split.android.client.service.executor;
22

3-
public enum SplitTaskType {
4-
SPLITS_SYNC, MY_SEGMENTS_SYNC, EVENTS_RECORDER, IMPRESSIONS_RECORDER,
5-
LOAD_LOCAL_SPLITS, LOAD_LOCAL_MY_SEGMENTS, SSE_AUTHENTICATION_TASK,
6-
SPLIT_KILL, FILTER_SPLITS_CACHE, GENERIC_TASK,
7-
CLEAN_UP_DATABASE, IMPRESSIONS_COUNT_RECORDER, SAVE_IMPRESSIONS_COUNT,
8-
MY_SEGMENTS_UPDATE, LOAD_LOCAL_ATTRIBUTES,
9-
TELEMETRY_CONFIG_TASK, TELEMETRY_STATS_TASK,
10-
SAVE_UNIQUE_KEYS_TASK, UNIQUE_KEYS_RECORDER_TASK,
11-
MY_LARGE_SEGMENTS_UPDATE, LOAD_LOCAL_RULE_BASED_SEGMENTS,
12-
RULE_BASED_SEGMENT_SYNC,
3+
public interface SplitTaskType {
4+
SplitTaskType GENERIC_TASK = new SplitTaskType() {
5+
@Override
6+
public String toString() {
7+
return "GENERIC_TASK";
8+
}
9+
};
1310
}

‎executor/src/test/java/io/split/android/client/service/executor/SplitTaskSerialWrapperTest.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@
1212

1313
public class SplitTaskSerialWrapperTest {
1414

15+
private static final SplitTaskType TASK_TYPE_A = new SplitTaskType() {};
16+
private static final SplitTaskType TASK_TYPE_B = new SplitTaskType() {};
17+
private static final SplitTaskType TASK_TYPE_C = new SplitTaskType() {};
18+
1519
@Test
1620
public void successfulStatusContainsResultsOfEveryTask() {
1721
SplitTask task1 = mock(SplitTask.class);
1822
SplitTask task2 = mock(SplitTask.class);
1923

20-
when(task1.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.TELEMETRY_CONFIG_TASK));
21-
when(task2.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.TELEMETRY_STATS_TASK));
24+
when(task1.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_A));
25+
when(task2.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_B));
2226

2327
SplitTaskSerialWrapper wrapper = new SplitTaskSerialWrapper(task1, task2);
2428

@@ -27,10 +31,10 @@ public void successfulStatusContainsResultsOfEveryTask() {
2731
List<SplitTaskExecutionInfo> results = (List<SplitTaskExecutionInfo>) executionInfo.getObjectValue("serial_task_results");
2832
assertEquals(SplitTaskExecutionStatus.SUCCESS, executionInfo.getStatus());
2933
assertEquals(2, results.size());
30-
assertEquals(SplitTaskType.TELEMETRY_CONFIG_TASK, results.get(0).getTaskType());
34+
assertEquals(TASK_TYPE_A, results.get(0).getTaskType());
3135
assertEquals(SplitTaskExecutionStatus.SUCCESS, results.get(0).getStatus());
3236

33-
assertEquals(SplitTaskType.TELEMETRY_STATS_TASK, results.get(1).getTaskType());
37+
assertEquals(TASK_TYPE_B, results.get(1).getTaskType());
3438
assertEquals(SplitTaskExecutionStatus.SUCCESS, results.get(1).getStatus());
3539
}
3640

@@ -40,9 +44,9 @@ public void unsuccessfulResultContainsExecutionInfoUpToFirstUnsuccessfulTask() {
4044
SplitTask task2 = mock(SplitTask.class);
4145
SplitTask task3 = mock(SplitTask.class);
4246

43-
when(task1.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.TELEMETRY_CONFIG_TASK));
44-
when(task2.execute()).thenReturn(SplitTaskExecutionInfo.error(SplitTaskType.TELEMETRY_STATS_TASK));
45-
when(task3.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.IMPRESSIONS_RECORDER));
47+
when(task1.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_A));
48+
when(task2.execute()).thenReturn(SplitTaskExecutionInfo.error(TASK_TYPE_B));
49+
when(task3.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_C));
4650

4751
SplitTaskSerialWrapper wrapper = new SplitTaskSerialWrapper(task1, task2, task3);
4852

@@ -51,10 +55,10 @@ public void unsuccessfulResultContainsExecutionInfoUpToFirstUnsuccessfulTask() {
5155
List<SplitTaskExecutionInfo> results = (List<SplitTaskExecutionInfo>) executionInfo.getObjectValue("serial_task_results");
5256
assertEquals(SplitTaskExecutionStatus.ERROR, executionInfo.getStatus());
5357
assertEquals(2, results.size());
54-
assertEquals(SplitTaskType.TELEMETRY_CONFIG_TASK, results.get(0).getTaskType());
58+
assertEquals(TASK_TYPE_A, results.get(0).getTaskType());
5559
assertEquals(SplitTaskExecutionStatus.SUCCESS, results.get(0).getStatus());
5660

57-
assertEquals(SplitTaskType.TELEMETRY_STATS_TASK, results.get(1).getTaskType());
61+
assertEquals(TASK_TYPE_B, results.get(1).getTaskType());
5862
assertEquals(SplitTaskExecutionStatus.ERROR, results.get(1).getStatus());
5963
}
6064

@@ -64,9 +68,9 @@ public void successfulTasksAreAllExecuted() {
6468
SplitTask task2 = mock(SplitTask.class);
6569
SplitTask task3 = mock(SplitTask.class);
6670

67-
when(task1.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.TELEMETRY_CONFIG_TASK));
68-
when(task2.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.TELEMETRY_STATS_TASK));
69-
when(task3.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.IMPRESSIONS_RECORDER));
71+
when(task1.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_A));
72+
when(task2.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_B));
73+
when(task3.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_C));
7074

7175
SplitTaskSerialWrapper wrapper = new SplitTaskSerialWrapper(task1, task2, task3);
7276

@@ -84,10 +88,10 @@ public void tasksAreExecutedUpToUnsuccessfulOne() {
8488
SplitTask task3 = mock(SplitTask.class);
8589
SplitTask task4 = mock(SplitTask.class);
8690

87-
when(task1.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.TELEMETRY_CONFIG_TASK));
88-
when(task2.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.TELEMETRY_STATS_TASK));
89-
when(task3.execute()).thenReturn(SplitTaskExecutionInfo.error(SplitTaskType.IMPRESSIONS_RECORDER));
90-
when(task4.execute()).thenReturn(SplitTaskExecutionInfo.success(SplitTaskType.IMPRESSIONS_RECORDER));
91+
when(task1.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_A));
92+
when(task2.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_B));
93+
when(task3.execute()).thenReturn(SplitTaskExecutionInfo.error(TASK_TYPE_C));
94+
when(task4.execute()).thenReturn(SplitTaskExecutionInfo.success(TASK_TYPE_C));
9195

9296
SplitTaskSerialWrapper wrapper = new SplitTaskSerialWrapper(task1, task2, task3, task4);
9397
wrapper.execute();

‎main/src/androidTest/java/tests/workmanager/WorkManagerWrapperTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import io.split.android.client.SplitClientConfig;
3535
import io.split.android.client.SplitFilter;
3636
import io.split.android.client.network.CertificatePinningConfiguration;
37-
import io.split.android.client.service.executor.SplitTaskType;
37+
import io.split.android.client.service.SplitTaskType;
3838
import io.split.android.client.service.synchronizer.WorkManagerWrapper;
3939
import io.split.android.client.service.workmanager.EventsRecorderWorker;
4040
import io.split.android.client.service.workmanager.ImpressionsRecorderWorker;

‎main/src/main/java/io/split/android/client/service/CleanUpDatabaseTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import io.split.android.client.service.executor.SplitTask;
66
import io.split.android.client.service.executor.SplitTaskExecutionInfo;
7-
import io.split.android.client.service.executor.SplitTaskType;
7+
import io.split.android.client.service.SplitTaskType;
88
import io.split.android.client.service.impressions.observer.PersistentImpressionsObserverCacheStorage;
99
import io.split.android.client.storage.events.PersistentEventsStorage;
1010
import io.split.android.client.storage.impressions.PersistentImpressionsCountStorage;

‎main/src/main/java/io/split/android/client/service/SplitTaskType.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package io.split.android.client.service;
2+
3+
public enum SplitTaskType implements io.split.android.client.service.executor.SplitTaskType {
4+
SPLITS_SYNC,
5+
MY_SEGMENTS_SYNC,
6+
EVENTS_RECORDER,
7+
IMPRESSIONS_RECORDER,
8+
LOAD_LOCAL_SPLITS,
9+
LOAD_LOCAL_MY_SEGMENTS,
10+
SSE_AUTHENTICATION_TASK,
11+
SPLIT_KILL,
12+
FILTER_SPLITS_CACHE,
13+
CLEAN_UP_DATABASE,
14+
IMPRESSIONS_COUNT_RECORDER,
15+
SAVE_IMPRESSIONS_COUNT,
16+
MY_SEGMENTS_UPDATE,
17+
LOAD_LOCAL_ATTRIBUTES,
18+
TELEMETRY_CONFIG_TASK,
19+
TELEMETRY_STATS_TASK,
20+
SAVE_UNIQUE_KEYS_TASK,
21+
UNIQUE_KEYS_RECORDER_TASK,
22+
MY_LARGE_SEGMENTS_UPDATE,
23+
LOAD_LOCAL_RULE_BASED_SEGMENTS,
24+
RULE_BASED_SEGMENT_SYNC,
25+
}

‎main/src/main/java/io/split/android/client/service/attributes/LoadAttributesTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import io.split.android.client.service.executor.SplitTask;
99
import io.split.android.client.service.executor.SplitTaskExecutionInfo;
10-
import io.split.android.client.service.executor.SplitTaskType;
10+
import io.split.android.client.service.SplitTaskType;
1111
import io.split.android.client.storage.attributes.AttributesStorage;
1212
import io.split.android.client.storage.attributes.PersistentAttributesStorage;
1313

‎main/src/main/java/io/split/android/client/service/events/EventsRecorderTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.split.android.client.dtos.Event;
88
import io.split.android.client.service.HttpRecorderSubmitterAdapter;
99
import io.split.android.client.service.TelemetryRecorderAdapter;
10-
import io.split.android.client.service.executor.SplitTaskType;
10+
import io.split.android.client.service.SplitTaskType;
1111
import io.split.android.client.service.http.HttpRecorder;
1212
import io.split.android.client.storage.events.PersistentEventsStorage;
1313
import io.split.android.client.submitter.RecorderTask;

‎main/src/main/java/io/split/android/client/service/impressions/ImpressionsCountRecorderTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.split.android.client.service.HttpRecorderSubmitterAdapter;
88
import io.split.android.client.service.ServiceConstants;
99
import io.split.android.client.service.TelemetryRecorderAdapter;
10-
import io.split.android.client.service.executor.SplitTaskType;
10+
import io.split.android.client.service.SplitTaskType;
1111
import io.split.android.client.service.http.HttpRecorder;
1212
import io.split.android.client.storage.impressions.PersistentImpressionsCountStorage;
1313
import io.split.android.client.submitter.RecorderTask;

‎main/src/main/java/io/split/android/client/service/impressions/ImpressionsRecorderTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.split.android.client.dtos.KeyImpression;
88
import io.split.android.client.service.HttpRecorderSubmitterAdapter;
99
import io.split.android.client.service.TelemetryRecorderAdapter;
10-
import io.split.android.client.service.executor.SplitTaskType;
10+
import io.split.android.client.service.SplitTaskType;
1111
import io.split.android.client.service.http.HttpRecorder;
1212
import io.split.android.client.storage.impressions.PersistentImpressionsStorage;
1313
import io.split.android.client.submitter.RecorderTask;

‎main/src/main/java/io/split/android/client/service/impressions/SaveImpressionsCountTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import io.split.android.client.service.executor.SplitTask;
88
import io.split.android.client.service.executor.SplitTaskExecutionInfo;
9-
import io.split.android.client.service.executor.SplitTaskType;
9+
import io.split.android.client.service.SplitTaskType;
1010
import io.split.android.client.storage.impressions.PersistentImpressionsCountStorage;
1111

1212
import static io.split.android.client.utils.Utils.checkNotNull;

0 commit comments

Comments
 (0)