opendev/gerrit
Code Issues Proposed changes

EventRecorder: Don't use Function just to cast

Browse Source 
Change-Id: Id9bd54676d8adda70d1f4cb1cb86cddac2e40c22
This commit is contained in:
Dave Borowitz
2016-09-22 09:09:03 +02:00
parent aa51cd2b3d
commit 574c3f6826
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java
View File

@@ -16,7 +16,6 @@ package com.google.gerrit.acceptance;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import com.google.common.base.Function;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.LinkedListMultimap;
@@ -90,16 +89,6 @@ public class EventRecorder {
return String.format("%s-%s-%s", type, project, ref); return String.format("%s-%s-%s", type, project, ref);
} }
private static class RefEventTransformer<T extends RefEvent>
implements Function<RefEvent, T> {
@SuppressWarnings("unchecked")
@Override
public T apply(RefEvent e) {
return (T) e;
}
}
private ImmutableList<RefUpdatedEvent> getRefUpdatedEvents(String project, private ImmutableList<RefUpdatedEvent> getRefUpdatedEvents(String project,
String refName, int expectedSize) { String refName, int expectedSize) {
String key = refEventKey(RefUpdatedEvent.TYPE, project, refName); String key = refEventKey(RefUpdatedEvent.TYPE, project, refName);
@@ -111,7 +100,7 @@ public class EventRecorder {
assertThat(recordedEvents).containsKey(key); assertThat(recordedEvents).containsKey(key);
ImmutableList<RefUpdatedEvent> events = FluentIterable ImmutableList<RefUpdatedEvent> events = FluentIterable
.from(recordedEvents.get(key)) .from(recordedEvents.get(key))
.transform(new RefEventTransformer<RefUpdatedEvent>()) .transform(RefUpdatedEvent.class::cast)
.toList(); .toList();
assertThat(events).hasSize(expectedSize); assertThat(events).hasSize(expectedSize);
return events; return events;
@@ -128,7 +117,7 @@ public class EventRecorder {
assertThat(recordedEvents).containsKey(key); assertThat(recordedEvents).containsKey(key);
ImmutableList<ChangeMergedEvent> events = FluentIterable ImmutableList<ChangeMergedEvent> events = FluentIterable
.from(recordedEvents.get(key)) .from(recordedEvents.get(key))
.transform(new RefEventTransformer<ChangeMergedEvent>()) .transform(ChangeMergedEvent.class::cast)
.toList(); .toList();
assertThat(events).hasSize(expectedSize); assertThat(events).hasSize(expectedSize);
return events; return events;
@@ -144,7 +133,7 @@ public class EventRecorder {
assertThat(recordedEvents).containsKey(key); assertThat(recordedEvents).containsKey(key);
ImmutableList<ReviewerDeletedEvent> events = FluentIterable ImmutableList<ReviewerDeletedEvent> events = FluentIterable
.from(recordedEvents.get(key)) .from(recordedEvents.get(key))
.transform(new RefEventTransformer<ReviewerDeletedEvent>()) .transform(ReviewerDeletedEvent.class::cast)
.toList(); .toList();
assertThat(events).hasSize(expectedSize); assertThat(events).hasSize(expectedSize);
return events; return events;
@@ -217,4 +206,4 @@ public class EventRecorder {
public void close() { public void close() {
eventListenerRegistration.remove(); eventListenerRegistration.remove();
} }
} }