Consistently import methods from Preconditions as static

Change-Id: I7e42b182e374967136e85bdc93bd39def493613b
This commit is contained in:
David Pursehouse
2018-10-16 19:24:30 +09:00
parent e1e0ae5157
commit 10fd9cad45
14 changed files with 38 additions and 31 deletions

View File

@@ -14,10 +14,10 @@
package com.google.gerrit.server.schema;
import static com.google.common.base.Preconditions.checkState;
import static com.google.gerrit.server.config.ConfigUtil.storeSection;
import static java.util.Objects.requireNonNull;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.gerrit.extensions.client.DiffPreferencesInfo;
import com.google.gerrit.extensions.client.DiffPreferencesInfo.Whitespace;
@@ -203,7 +203,7 @@ public class Schema_115 extends SchemaVersion {
}
private static boolean toBoolean(String v) {
Preconditions.checkState(!Strings.isNullOrEmpty(v));
checkState(!Strings.isNullOrEmpty(v));
return v.equals("Y");
}
}

View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.schema;
import static com.google.common.base.Preconditions.checkState;
import static com.google.gerrit.reviewdb.client.CoreDownloadSchemes.ANON_GIT;
import static com.google.gerrit.reviewdb.client.CoreDownloadSchemes.ANON_HTTP;
import static com.google.gerrit.reviewdb.client.CoreDownloadSchemes.HTTP;
@@ -21,7 +22,6 @@ import static com.google.gerrit.reviewdb.client.CoreDownloadSchemes.REPO_DOWNLOA
import static com.google.gerrit.reviewdb.client.CoreDownloadSchemes.SSH;
import static com.google.gerrit.server.config.ConfigUtil.storeSection;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.gerrit.extensions.client.GeneralPreferencesInfo;
@@ -227,7 +227,7 @@ public class Schema_119 extends SchemaVersion {
}
private static boolean toBoolean(String v) {
Preconditions.checkState(!Strings.isNullOrEmpty(v));
checkState(!Strings.isNullOrEmpty(v));
return v.equals("Y");
}
}

View File

@@ -14,8 +14,9 @@
package com.google.gerrit.server.schema;
import static com.google.common.base.Preconditions.checkState;
import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder;
@@ -205,7 +206,7 @@ public class Schema_139 extends SchemaVersion {
}
private static boolean toBoolean(String v) {
Preconditions.checkState(!Strings.isNullOrEmpty(v));
checkState(!Strings.isNullOrEmpty(v));
return v.equals("Y");
}
}