Alon Bar-Lev has uploaded a new change for review. Change subject: extapi: build: fix checkstyle plugin ......................................................................
extapi: build: fix checkstyle plugin Change-Id: I01f2f7b1f883faabdb28d9cd9cec3a577120f362 Signed-off-by: Alon Bar-Lev <[email protected]> --- A backend/manager/modules/extensions-api-root/extensions-api/checkstyle.xml M backend/manager/modules/extensions-api-root/extensions-api/pom.xml M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/ExtMap.java M backend/manager/modules/extensions-api-root/pom.xml 4 files changed, 58 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/35234/1 diff --git a/backend/manager/modules/extensions-api-root/extensions-api/checkstyle.xml b/backend/manager/modules/extensions-api-root/extensions-api/checkstyle.xml new file mode 100644 index 0000000..b697b40 --- /dev/null +++ b/backend/manager/modules/extensions-api-root/extensions-api/checkstyle.xml @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> +<module name="Checker"> + <module name="NewlineAtEndOfFile"> + <property name="lineSeparator" value="lf"/> + </module> + <module name="FileTabCharacter"> + <property name="eachLine" value="true"/> + </module> + <module name="RegexpSingleline"> + <!-- \s matches whitespace character, $ matches end of line. --> + <property name="format" value="\s+$"/> + <property name="message" value="Line has trailing spaces."/> + </module> + <module name="TreeWalker"> + <property name="cacheFile" value="${checkstyle.cache.file}"/> + <module name="EmptyStatement"/> + <module name="RedundantImport"/> + <module name="UnusedImports"/> + <module name="AvoidStarImport"/> + <module name="UpperEll"/> + <module name="EqualsHashCode"/> + <module name="UncommentedMain"/> + <module name="LeftCurly"/> + <module name="NoWhitespaceBefore"> + <property name="tokens" value="SEMI"/> + </module> + <module name="WhitespaceAfter"> + <property name="tokens" value="COMMA"/> + </module> + </module> +</module> diff --git a/backend/manager/modules/extensions-api-root/extensions-api/pom.xml b/backend/manager/modules/extensions-api-root/extensions-api/pom.xml index 3ff71b1..f8b7a59 100644 --- a/backend/manager/modules/extensions-api-root/extensions-api/pom.xml +++ b/backend/manager/modules/extensions-api-root/extensions-api/pom.xml @@ -16,6 +16,13 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>./checkstyle.xml</configLocation> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> diff --git a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/ExtMap.java b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/ExtMap.java index 13c3371..2b8e27d 100644 --- a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/ExtMap.java +++ b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/ExtMap.java @@ -161,8 +161,8 @@ * {@inheritDoc} */ @Override - public void putAll(Map<? extends ExtKey,? extends Object> m) { - for (Map.Entry<? extends ExtKey,? extends Object> entry : m.entrySet()) { + public void putAll(Map<? extends ExtKey, ? extends Object> m) { + for (Map.Entry<? extends ExtKey, ? extends Object> entry : m.entrySet()) { put(entry.getKey(), entry.getValue()); } } @@ -309,7 +309,7 @@ * @param m map to add. * @return this. */ - public ExtMap mput(Map<? extends ExtKey,? extends Object> m) { + public ExtMap mput(Map<? extends ExtKey, ? extends Object> m) { putAll(m); return this; } diff --git a/backend/manager/modules/extensions-api-root/pom.xml b/backend/manager/modules/extensions-api-root/pom.xml index 8267448..ff4e5b8 100644 --- a/backend/manager/modules/extensions-api-root/pom.xml +++ b/backend/manager/modules/extensions-api-root/pom.xml @@ -44,7 +44,23 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.9.1</version> + <configuration> + <failsOnError>true</failsOnError> + <consoleOutput>true</consoleOutput> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + </configuration> + <executions> + <execution> + <id>checkstyle</id> + <phase>compile</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -56,10 +72,6 @@ <artifactId>${animal.sniffer.signature}</artifactId> <version>1.0</version> </signature> - <ignores> - <ignore>sun.security.krb5.Config</ignore> - <ignore>sun.misc.Signal</ignore> - </ignores> </configuration> </plugin> <plugin> -- To view, visit http://gerrit.ovirt.org/35234 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01f2f7b1f883faabdb28d9cd9cec3a577120f362 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
