Format Java files with google-java-format

Change-Id: If362fdd79ef3ab6898c3e5bbf575793edfcf1fe6
This commit is contained in:
David Pursehouse
2017-06-08 11:05:15 +09:00
parent 17ad3df4d9
commit a85e8147b3
3 changed files with 7 additions and 21 deletions

View File

@@ -34,13 +34,9 @@ public @interface GerritConfig {
*/ */
String name(); String name();
/** /** Single value. Takes precedence over values specified in {@code values}. */
* Single value. Takes precedence over values specified in {@code values}.
*/
String value() default ""; String value() default "";
/** /** Multiple values (list). Ignored if {@code value} is specified. */
* Multiple values (list). Ignored if {@code value} is specified.
*/
String[] values() default ""; String[] values() default "";
} }

View File

@@ -25,23 +25,15 @@ import java.lang.annotation.Target;
@Retention(RUNTIME) @Retention(RUNTIME)
@Repeatable(GlobalPluginConfigs.class) @Repeatable(GlobalPluginConfigs.class)
public @interface GlobalPluginConfig { public @interface GlobalPluginConfig {
/** /** Name of the plugin, corresponding to {@code $site/etc/@pluginName.comfig}. */
* Name of the plugin, corresponding to {@code $site/etc/@pluginName.comfig}.
*/
String pluginName(); String pluginName();
/** /** @see GerritConfig#name() */
* @see GerritConfig#name()
*/
String name(); String name();
/** /** @see GerritConfig#value() */
* @see GerritConfig#value()
*/
String value() default ""; String value() default "";
/** /** @see GerritConfig#values() */
* @see GerritConfig#values()
*/
String[] values() default ""; String[] values() default "";
} }

View File

@@ -74,8 +74,6 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest {
values = {"value-2", "value-3"} values = {"value-2", "value-3"}
) )
public void valueHasPrecedenceOverValues() { public void valueHasPrecedenceOverValues() {
assertThat(cfg.getStringList("section", null, "name")) assertThat(cfg.getStringList("section", null, "name")).asList().containsExactly("value-1");
.asList()
.containsExactly("value-1");
} }
} }