Adapt to new StorageException class name and package Change-Id: Iad8ec18501a48dae6c3d34747c113ff70452c9cb
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java index ae0662d..ad68d42 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java
@@ -15,10 +15,10 @@ package com.googlesource.gerrit.plugins.replication; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.events.EventDispatcher; import com.google.gerrit.server.events.RefEvent; import com.google.gerrit.server.permissions.PermissionBackendException; -import com.google.gwtorm.server.OrmException; import com.googlesource.gerrit.plugins.replication.ReplicationState.RefPushResult; import java.lang.ref.WeakReference; import java.util.concurrent.atomic.AtomicBoolean; @@ -187,7 +187,7 @@ private void postEvent(RefEvent event) { try { dispatcher.postEvent(event); - } catch (OrmException | PermissionBackendException e) { + } catch (StorageException | PermissionBackendException e) { logger.atSevere().withCause(e).log("Cannot post event"); } }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/GitUpdateProcessingTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/GitUpdateProcessingTest.java index 549890a..3ced5cc 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/GitUpdateProcessingTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/GitUpdateProcessingTest.java
@@ -20,9 +20,9 @@ import static org.easymock.EasyMock.reset; import static org.easymock.EasyMock.verify; +import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.events.EventDispatcher; import com.google.gerrit.server.permissions.PermissionBackendException; -import com.google.gwtorm.server.OrmException; import com.googlesource.gerrit.plugins.replication.PushResultProcessing.GitUpdateProcessing; import com.googlesource.gerrit.plugins.replication.ReplicationState.RefPushResult; import java.net.URISyntaxException; @@ -44,7 +44,7 @@ @Test public void headRefReplicated() - throws URISyntaxException, OrmException, PermissionBackendException { + throws URISyntaxException, StorageException, PermissionBackendException { reset(dispatcherMock); RefReplicatedEvent expectedEvent = new RefReplicatedEvent( @@ -68,7 +68,7 @@ @Test public void changeRefReplicated() - throws URISyntaxException, OrmException, PermissionBackendException { + throws URISyntaxException, StorageException, PermissionBackendException { reset(dispatcherMock); RefReplicatedEvent expectedEvent = new RefReplicatedEvent( @@ -91,7 +91,7 @@ } @Test - public void onAllNodesReplicated() throws OrmException, PermissionBackendException { + public void onAllNodesReplicated() throws StorageException, PermissionBackendException { reset(dispatcherMock); RefReplicationDoneEvent expectedDoneEvent = new RefReplicationDoneEvent("someProject", "refs/heads/master", 5);