Apply formatting changes - google-java-format - remove wild card imports - add missing headers Change-Id: I52f1f69fe6dedb081a4e1d31ad52f6920385e79f
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/MaxConnectionsLimiter.java b/src/main/java/com/googlesource/gerrit/plugins/quota/MaxConnectionsLimiter.java index f2b18cd..f10f07a 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/quota/MaxConnectionsLimiter.java +++ b/src/main/java/com/googlesource/gerrit/plugins/quota/MaxConnectionsLimiter.java
@@ -1,3 +1,17 @@ +// 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.quota; import com.google.gerrit.httpd.AllRequestFilter; @@ -7,10 +21,11 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; -import org.eclipse.jgit.lib.Config; - import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; @@ -21,6 +36,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jgit.lib.Config; @Singleton public class MaxConnectionsLimiter extends AllRequestFilter {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/ParkedQuotaTransitionLogger.java b/src/main/java/com/googlesource/gerrit/plugins/quota/ParkedQuotaTransitionLogger.java index bb40a19..ea7e76a 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/quota/ParkedQuotaTransitionLogger.java +++ b/src/main/java/com/googlesource/gerrit/plugins/quota/ParkedQuotaTransitionLogger.java
@@ -17,14 +17,10 @@ import static com.google.gerrit.server.git.WorkQueue.Task; import static com.googlesource.gerrit.plugins.quota.QueueManager.Queue; import static com.googlesource.gerrit.plugins.quota.QueueManager.QueueInfo; -import static com.googlesource.gerrit.plugins.quota.QueueManager.Reservation; import com.google.gerrit.util.logging.NamedFluentLogger; import java.util.Map; -import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.stream.Collectors; public class ParkedQuotaTransitionLogger { protected static final NamedFluentLogger quotaLog =
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/QueueManager.java b/src/main/java/com/googlesource/gerrit/plugins/quota/QueueManager.java index dc6d658..a9ffb10 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/quota/QueueManager.java +++ b/src/main/java/com/googlesource/gerrit/plugins/quota/QueueManager.java
@@ -15,16 +15,15 @@ package com.googlesource.gerrit.plugins.quota; import com.google.gerrit.server.git.WorkQueue; -import java.util.*; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Predicate; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/TaskQuotaWithPermits.java b/src/main/java/com/googlesource/gerrit/plugins/quota/TaskQuotaWithPermits.java index ff7fe80..e4c6ade 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/quota/TaskQuotaWithPermits.java +++ b/src/main/java/com/googlesource/gerrit/plugins/quota/TaskQuotaWithPermits.java
@@ -1,3 +1,17 @@ +// 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.quota; import com.google.gerrit.server.git.WorkQueue;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/TaskQuotas.java b/src/main/java/com/googlesource/gerrit/plugins/quota/TaskQuotas.java index 5359bf5..75ed10c 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/quota/TaskQuotas.java +++ b/src/main/java/com/googlesource/gerrit/plugins/quota/TaskQuotas.java
@@ -19,7 +19,11 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.ThreadSettingsConfig; import com.google.gerrit.server.git.WorkQueue; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.regex.Matcher; @@ -114,6 +118,7 @@ if (!acquiredQuotas.isEmpty()) { quotasByTask.put(task.getTaskId(), acquiredQuotas); } + return true; }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/quota/QueueManagerTest.java b/src/test/java/com/googlesource/gerrit/plugins/quota/QueueManagerTest.java index 1740561..2e247e2 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/quota/QueueManagerTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/quota/QueueManagerTest.java
@@ -14,12 +14,16 @@ package com.googlesource.gerrit.plugins.quota; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import com.google.gerrit.server.git.WorkQueue; import com.googlesource.gerrit.plugins.quota.QueueManager.Queue; import com.googlesource.gerrit.plugins.quota.QueueManager.QueueInfo; -import com.google.gerrit.server.git.WorkQueue; -import org.junit.Before; -import org.junit.Test; - import java.util.HashSet; import java.util.Set; import java.util.concurrent.CountDownLatch; @@ -27,10 +31,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.junit.Before; +import org.junit.Test; public class QueueManagerTest { private static final Queue TEST_QUEUE = Queue.INTERACTIVE;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/quota/TaskQuotasTest.java b/src/test/java/com/googlesource/gerrit/plugins/quota/TaskQuotasTest.java index 05d23d2..c8870d0 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/quota/TaskQuotasTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/quota/TaskQuotasTest.java
@@ -14,10 +14,12 @@ package com.googlesource.gerrit.plugins.quota; -import static com.googlesource.gerrit.plugins.quota.QueueManager.Queue.*; +import static com.googlesource.gerrit.plugins.quota.QueueManager.Queue.INTERACTIVE; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; import com.google.gerrit.server.git.WorkQueue.Task; import java.util.Random; @@ -39,7 +41,7 @@ taskQuotas( 2, 2, -""" + """ [quota "%s"] maxStartForTaskForQueue = 1 uploadpack %s """