Skip to content

Commit dc67141

Browse files
committed
Fixup for #49: remove eventType field from Snapshot object.
1 parent 4d442d7 commit dc67141

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

nakadi-producer-spring-boot-starter/src/main/java/org/zalando/nakadiproducer/NakadiProducerAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private List<Snapshot> createNonLegacySnapshots(SnapshotEventProvider provider,
163163
}
164164

165165
private Snapshot mapLegacyToNewSnapshot(SnapshotEventProvider.Snapshot snapshot) {
166-
return new Snapshot(snapshot.getId(), snapshot.getEventType(), snapshot.getDataType(), snapshot.getData());
166+
return new Snapshot(snapshot.getId(), snapshot.getDataType(), snapshot.getData());
167167
}
168168

169169
@Bean

nakadi-producer-spring-boot-starter/src/test/java/org/zalando/nakadiproducer/util/Fixture.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ public static MockPayload mockPayload(Integer id, String code) {
2626
}
2727

2828
public static List<Snapshot> mockSnapshotList(Integer size) {
29-
List<Snapshot> list = new ArrayList<>();
29+
final List<Snapshot> list = new ArrayList<>();
3030
for (int i = 0; i < size; i++) {
31-
list.add(new Snapshot(i, PUBLISHER_EVENT_TYPE, PUBLISHER_DATA_TYPE, mockPayload(i + 1, "code" + i, true, mockSubClass("some info " + i), mockSubList(3, "some detail for code" + i))));
31+
list.add(new Snapshot(i, PUBLISHER_DATA_TYPE, mockPayload(i + 1, "code" + i, true,
32+
mockSubClass("some info " + i), mockSubList(3, "some detail for code" + i))));
3233
}
3334
return list;
3435
}
@@ -46,7 +47,7 @@ private static MockPayload.SubListItem mockSubListItem(String detail) {
4647
}
4748

4849
public static List<MockPayload.SubListItem> mockSubList(Integer size, String detail) {
49-
List<MockPayload.SubListItem> items = new ArrayList<>();
50+
final List<MockPayload.SubListItem> items = new ArrayList<>();
5051
for (int i = 0; i < size; i++) {
5152
items.add(mockSubListItem(detail + i));
5253
}

nakadi-producer/src/main/java/org/zalando/nakadiproducer/snapshots/Snapshot.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@Getter
88
public class Snapshot {
99
private Object id;
10-
private String eventType;
1110
private String dataType;
1211
private Object data;
1312
}

nakadi-producer/src/test/java/org/zalando/nakadiproducer/snapshots/impl/SnapshotCreationServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void testCreateSnapshotEvents() {
6262
final String filter = "exampleFilter";
6363

6464
when(snapshotEventGenerator.generateSnapshots(null, filter)).thenReturn(
65-
singletonList(new Snapshot(1, PUBLISHER_EVENT_TYPE, PUBLISHER_DATA_TYPE, eventPayload)));
65+
singletonList(new Snapshot(1, PUBLISHER_DATA_TYPE, eventPayload)));
6666

6767
snapshotCreationService.createSnapshotEvents(PUBLISHER_EVENT_TYPE, filter);
6868

nakadi-producer/src/test/java/org/zalando/nakadiproducer/util/Fixture.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ public static MockPayload mockPayload(Integer id, String code) {
2626
}
2727

2828
public static List<Snapshot> mockSnapshotList(Integer size) {
29-
List<Snapshot> list = new ArrayList<>();
29+
final List<Snapshot> list = new ArrayList<>();
3030
for (int i = 0; i < size; i++) {
31-
list.add(new Snapshot(i, PUBLISHER_EVENT_TYPE, PUBLISHER_DATA_TYPE, mockPayload(i + 1, "code" + i, true, mockSubClass("some info " + i), mockSubList(3, "some detail for code" + i))));
31+
list.add(new Snapshot(i, PUBLISHER_DATA_TYPE, mockPayload(i + 1, "code" + i, true,
32+
mockSubClass("some info " + i), mockSubList(3, "some detail for code" + i))));
3233
}
3334
return list;
3435
}
@@ -46,7 +47,7 @@ private static MockPayload.SubListItem mockSubListItem(String detail) {
4647
}
4748

4849
public static List<MockPayload.SubListItem> mockSubList(Integer size, String detail) {
49-
List<MockPayload.SubListItem> items = new ArrayList<>();
50+
final List<MockPayload.SubListItem> items = new ArrayList<>();
5051
for (int i = 0; i < size; i++) {
5152
items.add(mockSubListItem(detail + i));
5253
}

0 commit comments

Comments
 (0)