GerritServer: Split annotation sanity check to a separate method
Change-Id: Ie9ecdc29054093f5e29261d159177c02fc260b1b
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java
index 58cdf96..a7ffd91 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GerritServer.java
@@ -115,10 +115,13 @@
@Nullable
abstract GerritConfigs configs();
- private Config buildConfig(Config baseConfig) {
+ private void checkValidAnnotations() {
if (configs() != null && config() != null) {
throw new IllegalStateException("Use either @GerritConfigs or @GerritConfig not both");
}
+ }
+
+ private Config buildConfig(Config baseConfig) {
if (configs() != null) {
return ConfigAnnotationParser.parse(baseConfig, configs());
} else if (config() != null) {
@@ -131,6 +134,7 @@
/** Returns fully started Gerrit server */
static GerritServer start(Description desc, Config baseConfig) throws Exception {
+ desc.checkValidAnnotations();
Config cfg = desc.buildConfig(baseConfig);
Logger.getLogger("com.google.gerrit").setLevel(Level.DEBUG);
final CyclicBarrier serverStarted = new CyclicBarrier(2);
