| commit | ae4c420b3085d957782cca2936f588eaeaf88eec | [log] [tgz] |
|---|---|---|
| author | Sven Selberg <svense@axis.com> | Fri Mar 01 10:12:11 2024 +0100 |
| committer | Sven Selberg <svense@axis.com> | Fri Mar 01 10:12:11 2024 +0100 |
| tree | 0e8301111983a8ee534fb0ac013e8719449e7c33 | |
| parent | cb0fa4011fb5f8336f84cf884be6e777d6a6d2c3 [diff] | |
| parent | 1db0ea24ee063080ed7af4d9ce0d4d73d8750db0 [diff] |
Merge branch 'stable-3.8' into stable-3.9 * stable-3.8: Fix compiler warnings Change-Id: I5bf1711945b850e53910ffa4137e212c39eded7c
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/EventCreationResponse.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/EventCreationResponse.java index 8303940..61a766f 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/EventCreationResponse.java +++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/EventCreationResponse.java
@@ -19,6 +19,7 @@ import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC; import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCS; +import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Lists; import com.google.gerrit.extensions.restapi.CacheControl; import com.google.gerrit.extensions.restapi.Response; @@ -78,6 +79,11 @@ } @Override + public ImmutableMultimap<String, String> headers() { + return ImmutableMultimap.of(); + } + + @Override public String toString() { return "[" + statusCode()
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventPublisher.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventPublisher.java index 7b4569e..e7c8869 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventPublisher.java +++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventPublisher.java
@@ -34,7 +34,7 @@ @Ignore public class TestEventPublisher implements Runnable, EiffelEventHub.Consumer { /* Milliseconds after which the publisher-thread is expected to have handled the event. */ - public static int MILLIS_TO_WAIT = 500; + public static int MILLIS_TO_WAIT = 1000; Map<EventKey, EiffelEvent> publishedEvents = Maps.newConcurrentMap(); List<EventKey> actualOrder = Lists.newArrayList();