Revert "Extract QueueInfo into its own class" This reverts commit 5ffac84cd4024a548055836a6000e57a9283214f. Reason for revert: Not strictly needed Change-Id: Ice65f4fbe6c04b15bb4da831fb284222ffcad1da
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/ListCommand.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/ListCommand.java index a37f554..d7d55ec 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/ListCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/ListCommand.java
@@ -89,7 +89,7 @@ addProperty(obj, "AdminUrl", s.getAdminUrls()); addProperty(obj, "AuthGroup", s.getAuthGroupNames()); addProperty(obj, "Project", s.getProjects()); - QueueInfo q = s.getQueueInfo(); + Source.QueueInfo q = s.getQueueInfo(); addQueueDetails(obj, "InFlight", q.inFlight.values()); addQueueDetails(obj, "Pending", q.pending.values()); } @@ -114,7 +114,7 @@ out.append("Project: ").append(project).append("\n"); } - QueueInfo q = s.getQueueInfo(); + Source.QueueInfo q = s.getQueueInfo(); out.append("In Flight: ").append(q.inFlight.size()).append("\n"); addQueueDetails(out, q.inFlight.values()); out.append("Pending: ").append(q.pending.size()).append("\n");
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/QueueInfo.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/QueueInfo.java deleted file mode 100644 index 5c1ee56..0000000 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/QueueInfo.java +++ /dev/null
@@ -1,30 +0,0 @@ -// Copyright (C) 2025 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.googlesource.gerrit.plugins.replication.pull; - -import com.google.common.collect.ImmutableMap; -import com.google.gerrit.entities.Project; -import java.util.Map; - -public class QueueInfo { - public final Map<Project.NameKey, FetchOne> pending; - public final Map<Project.NameKey, FetchOne> inFlight; - - public QueueInfo( - Map<Project.NameKey, FetchOne> pending, Map<Project.NameKey, FetchOne> inFlight) { - this.pending = ImmutableMap.copyOf(pending); - this.inFlight = ImmutableMap.copyOf(inFlight); - } -}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java index 563d51e..097f058 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java
@@ -21,6 +21,7 @@ import com.google.common.base.Stopwatch; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Lists; @@ -132,6 +133,17 @@ REPOSITORY_MISSING } + public static class QueueInfo { + public final Map<Project.NameKey, FetchOne> pending; + public final Map<Project.NameKey, FetchOne> inFlight; + + public QueueInfo( + Map<Project.NameKey, FetchOne> pending, Map<Project.NameKey, FetchOne> inFlight) { + this.pending = ImmutableMap.copyOf(pending); + this.inFlight = ImmutableMap.copyOf(inFlight); + } + } + @Inject protected Source( Injector injector,