commit b080bca4427edc069ba55aa0ad0a0366a5e6a242
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> Wed Aug 09 12:57:57 2017 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> Wed Aug 09 12:57:57 2017 -0400
tree d51195b599f9ef4191c4e0129f54ad1e23a57936
parent 0454b99261ee132d1f41e7615e14903ee38797e5

Extract default values to constants

This allows to avoid passing constant values as method parameters, using
instead the defined constants.

Change-Id: I44075e873dbd2722d17b53d41806b3c939293425

src/main/java/com/googlesource/gerrit/plugins/quota/AccountLimitsConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/AccountLimitsConfig.java b/src/main/java/com/googlesource/gerrit/plugins/quota/AccountLimitsConfig.java
index e9633b1..b50c4b6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/AccountLimitsConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/AccountLimitsConfig.java
@@ -32,6 +32,8 @@
 import org.slf4j.LoggerFactory;
 
 public class AccountLimitsConfig {
+  private static final int DEFAULT_BURST_COUNT = 30;
+  private static final int DEFAULT_INTERVAL_SECONDS = 60;
   private static final Logger log =
       LoggerFactory.getLogger(AccountLimitsConfig.class);
   static final String GROUP_SECTION = "group";
@@ -92,16 +94,15 @@
     for (String groupName : groups) {
       Type type = Type.UPLOADPACK;
       rateLimits.put(type, groupName,
-          parseRateLimit(c, groupName, type, 60, 30));
+          parseRateLimit(c, groupName, type));
     }
   }
 
-  RateLimit parseRateLimit(Config c, String groupName, Type type,
-      int defaultIntervalSeconds, int defaultBurstCount) {
+  RateLimit parseRateLimit(Config c, String groupName, Type type) {
     String name = type.toConfigValue();
     String value = c.getString(GROUP_SECTION, groupName, name).trim();
     if (value == null) {
-      return defaultRateLimit(type, defaultIntervalSeconds, defaultBurstCount);
+      return defaultRateLimit(type);
     }
 
     Matcher m = Pattern.compile("^\\s*(\\d+)\\s*/\\s*(.*)\\s*burst\\s*(\\d+)$")
@@ -109,14 +110,14 @@
     if (!m.matches()) {
       log.warn(
           "Invalid ''{}'' ratelimit configuration ''{}'', use default ratelimit {}/hour",
-          name, value, 3600.0D / defaultIntervalSeconds);
-      return defaultRateLimit(type, defaultIntervalSeconds, defaultBurstCount);
+          name, value, 3600.0D / DEFAULT_INTERVAL_SECONDS);
+      return defaultRateLimit(type);
     }
 
     String digits = m.group(1);
     String unitName = m.group(2).trim();
     String storeCountString = m.group(3).trim();
-    long burstCount = defaultBurstCount;
+    long burstCount = DEFAULT_BURST_COUNT;
     try {
       burstCount = Long.parseLong(storeCountString);
     } catch (NumberFormatException e) {
@@ -126,7 +127,7 @@
     }
 
     TimeUnit inputUnit = TimeUnit.HOURS;
-    double ratePerSecond = 1.0D / defaultIntervalSeconds;
+    double ratePerSecond = 1.0D / DEFAULT_INTERVAL_SECONDS;
     if (unitName.isEmpty()) {
       inputUnit = TimeUnit.SECONDS;
     } else if (match(unitName, "s", "sec", "second")) {
@@ -171,10 +172,9 @@
     }
   }
 
-  private RateLimit defaultRateLimit(Type type, int defaultIntervalSeconds,
-      int defaultStoreCount) {
-    return new RateLimit(type, 1.0D / defaultIntervalSeconds,
-        defaultIntervalSeconds * defaultStoreCount);
+  private RateLimit defaultRateLimit(Type type) {
+    return new RateLimit(type, 1.0D / DEFAULT_INTERVAL_SECONDS,
+        DEFAULT_INTERVAL_SECONDS * DEFAULT_BURST_COUNT);
   }
 
   /**