Use index on ChangeNotes which supports local and imported changes
Avoid using indexing on Change which does not support the propagation
of change's original ServerId, which has been deprecated.
The ForwardedIndexChangeHandler has a ChangeNotes object and therefore
it would make sense to use it for indexing as well.
Depends-On: https://gerrit-review.googlesource.com/c/gerrit/+/377796
Change-Id: Icba66b43bf19e5af5ee6eef2b2ce966aebc7bb80
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandler.java
index 770259d..9663205 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandler.java
@@ -124,7 +124,7 @@
private void reindex(ChangeNotes notes) {
notes.reload();
- indexer.index(notes.getChange());
+ indexer.index(notes);
}
private boolean rescheduleIndex(String id, Optional<IndexEvent> indexEvent, int retryCount) {
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
index ba0c8c5..fe3e3fb 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexChangeHandlerTest.java
@@ -31,7 +31,6 @@
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.util.OneOffRequestContext;
import java.io.IOException;
-import java.time.Instant;
import java.util.Optional;
import java.util.concurrent.ScheduledExecutorService;
import org.junit.Before;
@@ -67,8 +66,6 @@
@Before
public void setUp() throws Exception {
id = Change.id(TEST_CHANGE_NUMBER);
- Change change = new Change(null, id, null, null, Instant.now());
- when(changeNotes.getChange()).thenReturn(change);
when(configMock.index()).thenReturn(indexMock);
when(changeCheckerFactoryMock.create(any())).thenReturn(changeCheckerAbsentMock);
handler =
@@ -80,14 +77,14 @@
public void changeIsIndexedWhenUpToDate() throws Exception {
setupChangeAccessRelatedMocks(CHANGE_EXISTS, CHANGE_UP_TO_DATE);
handler.index(TEST_CHANGE_ID, Operation.INDEX, Optional.empty());
- verify(indexerMock, times(1)).index(any(Change.class));
+ verify(indexerMock, times(1)).index(any(ChangeNotes.class));
}
@Test
public void changeIsStillIndexedEvenWhenOutdated() throws Exception {
setupChangeAccessRelatedMocks(CHANGE_EXISTS, CHANGE_OUTDATED);
handler.index(TEST_CHANGE_ID, Operation.INDEX, Optional.of(new IndexEvent()));
- verify(indexerMock, times(1)).index(any(Change.class));
+ verify(indexerMock, times(1)).index(any(ChangeNotes.class));
}
@Test
@@ -115,13 +112,13 @@
return null;
})
.when(indexerMock)
- .index(any(Change.class));
+ .index(any(ChangeNotes.class));
assertThat(Context.isForwardedEvent()).isFalse();
handler.index(TEST_CHANGE_ID, Operation.INDEX, Optional.empty());
assertThat(Context.isForwardedEvent()).isFalse();
- verify(indexerMock, times(1)).index(any(Change.class));
+ verify(indexerMock, times(1)).index(any(ChangeNotes.class));
}
@Test
@@ -134,7 +131,7 @@
throw new IOException("someMessage");
})
.when(indexerMock)
- .index(any(Change.class));
+ .index(any(ChangeNotes.class));
assertThat(Context.isForwardedEvent()).isFalse();
IOException thrown =
@@ -144,7 +141,7 @@
assertThat(thrown).hasMessageThat().isEqualTo("someMessage");
assertThat(Context.isForwardedEvent()).isFalse();
- verify(indexerMock, times(1)).index(any(Change.class));
+ verify(indexerMock, times(1)).index(any(ChangeNotes.class));
}
private void setupChangeAccessRelatedMocks(boolean changeExists, boolean changeIsUpToDate)
