This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new ef774a4 AMBARI-24674. Upgrade checkstyle version to 8.9 (#2362) ef774a4 is described below commit ef774a4f8c283040bcdbcdd5570a9155deef3997 Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com> AuthorDate: Sat Sep 22 21:08:15 2018 +0200 AMBARI-24674. Upgrade checkstyle version to 8.9 (#2362) --- ambari-project/pom.xml | 2 +- .../ambari/server/api/services/ConfigGroupService.java | 1 - .../ambari/server/api/services/ConfigurationService.java | 1 - .../ambari/server/api/services/HostComponentService.java | 1 - .../ambari/server/api/services/RequestScheduleService.java | 1 - .../server/api/services/ServiceConfigVersionService.java | 1 - .../server/api/services/views/ViewInstanceService.java | 1 - .../server/api/services/views/ViewPermissionService.java | 1 - .../server/api/services/views/ViewPrivilegeService.java | 1 - .../ambari/server/api/services/views/ViewService.java | 1 - .../ambari/server/api/services/views/ViewUrlsService.java | 1 - .../server/api/services/views/ViewVersionService.java | 1 - .../server/controller/ServiceConfigVersionResponse.java | 2 -- .../apache/ambari/server/stack/StackServiceDirectory.java | 1 - .../server/checks/AtlasMigrationPropertyCheckTest.java | 2 -- .../ambari/server/stack/StackServiceDirectoryTest.java | 1 - .../AvoidTransactionalOnPrivateMethodsCheck.java | 13 ++++++++++++- .../checkstyle/UndocumentedRestApiOperationCheck.java | 13 ++++++++++++- .../AvoidTransactionalOnPrivateMethodsCheckTest.java | 14 +++++--------- .../checkstyle/UndocumentedRestApiOperationCheckTest.java | 14 +++++--------- 20 files changed, 35 insertions(+), 38 deletions(-) diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index 24d5878..3c568fe 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -32,7 +32,7 @@ <powermock.version>1.6.3</powermock.version> <jetty.version>9.4.11.v20180605</jetty.version> <ldap-api.version>1.0.0</ldap-api.version> - <checkstyle.version>6.19</checkstyle.version> <!-- last version that does not require Java 8 --> + <checkstyle.version>8.9</checkstyle.version> <swagger.version>1.5.19</swagger.version> <swagger.maven.plugin.version>3.1.4</swagger.maven.plugin.version> <slf4j.version>1.7.20</slf4j.version> diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java index efa0375..093134d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java @@ -36,7 +36,6 @@ import javax.ws.rs.core.UriInfo; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.ConfigGroupResponse; import org.apache.ambari.server.controller.spi.Resource; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java index 81ce705..71e1fa4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java @@ -34,7 +34,6 @@ import javax.ws.rs.core.UriInfo; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.ConfigurationResponse; import org.apache.ambari.server.controller.spi.Resource; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java index 2f2051a..a37883f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java @@ -48,7 +48,6 @@ import org.apache.ambari.server.controller.HostComponentSwagger; import org.apache.ambari.server.controller.spi.Resource; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java index 68494d4..8c08384 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java @@ -35,7 +35,6 @@ import javax.ws.rs.core.UriInfo; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.RequestScheduleResponseSwagger; import org.apache.ambari.server.controller.spi.Resource; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java index bc859c5..e00becb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java @@ -34,7 +34,6 @@ import org.apache.ambari.annotations.SwaggerOverwriteNestedAPI; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.ServiceConfigVersionResponse; import org.apache.ambari.server.controller.spi.Resource; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java index 788a63a..bad03f0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java @@ -43,7 +43,6 @@ import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; import org.apache.ambari.server.security.authorization.AuthorizationException; import org.apache.ambari.server.view.ViewRegistry; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java index d09905c..93b42ca 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java @@ -40,7 +40,6 @@ import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.controller.ViewPermissionResponse; import org.apache.ambari.server.controller.spi.Resource; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java index 2b40aec..80cda41 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java @@ -40,7 +40,6 @@ import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.controller.ViewPrivilegeResponse; import org.apache.ambari.server.controller.spi.Resource; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java index 03c991e..c12281b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java @@ -39,7 +39,6 @@ import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.controller.ViewResponse; import org.apache.ambari.server.controller.spi.Resource; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewUrlsService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewUrlsService.java index afaf9c8..1ac24ea 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewUrlsService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewUrlsService.java @@ -39,7 +39,6 @@ import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.controller.ViewUrlResponseSwagger; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.security.authorization.AuthorizationException; - import org.apache.http.HttpStatus; import com.google.common.base.Optional; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java index 6178635..07f2c6f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java @@ -40,7 +40,6 @@ import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.controller.ViewVersionResponse; import org.apache.ambari.server.controller.spi.Resource; - import org.apache.http.HttpStatus; import io.swagger.annotations.Api; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java index d0534e2..c4579fd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java @@ -27,10 +27,8 @@ import org.apache.ambari.server.orm.entities.ClusterEntity; import org.apache.ambari.server.orm.entities.ServiceConfigEntity; import org.apache.ambari.server.orm.entities.StackEntity; import org.apache.ambari.server.state.StackId; - import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; - import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonSerialize; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackServiceDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackServiceDirectory.java index b2195dc..c4d8870 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackServiceDirectory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackServiceDirectory.java @@ -28,7 +28,6 @@ import org.apache.ambari.annotations.Experimental; import org.apache.ambari.annotations.ExperimentalFeature; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.state.stack.RepositoryXml; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/AtlasMigrationPropertyCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/AtlasMigrationPropertyCheckTest.java index 8607ae2..da894c6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/AtlasMigrationPropertyCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/AtlasMigrationPropertyCheckTest.java @@ -25,14 +25,12 @@ import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.PrereqCheckRequest; import org.apache.ambari.server.orm.entities.RepositoryVersionEntity; - import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.DesiredConfig; import org.apache.ambari.server.state.RepositoryType; import org.apache.ambari.server.state.Service; - import org.apache.ambari.server.state.repository.ClusterVersionSummary; import org.apache.ambari.server.state.repository.VersionDefinitionXml; import org.apache.ambari.server.state.stack.PrereqCheckStatus; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackServiceDirectoryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackServiceDirectoryTest.java index 5983dce..44957d4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackServiceDirectoryTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackServiceDirectoryTest.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals; import java.io.File; import org.apache.ambari.server.AmbariException; - import org.junit.Test; /** diff --git a/ambari-utility/src/main/java/org/apache/ambari/checkstyle/AvoidTransactionalOnPrivateMethodsCheck.java b/ambari-utility/src/main/java/org/apache/ambari/checkstyle/AvoidTransactionalOnPrivateMethodsCheck.java index 80da103..421fb9f 100644 --- a/ambari-utility/src/main/java/org/apache/ambari/checkstyle/AvoidTransactionalOnPrivateMethodsCheck.java +++ b/ambari-utility/src/main/java/org/apache/ambari/checkstyle/AvoidTransactionalOnPrivateMethodsCheck.java @@ -30,10 +30,21 @@ public class AvoidTransactionalOnPrivateMethodsCheck extends AbstractCheck { private static final String ANNOTATION_NAME = "Transactional"; public static final String MSG_TRANSACTIONAL_ON_PRIVATE_METHOD = "@" + ANNOTATION_NAME + " should not be used on private methods"; + private static final int[] TOKENS = new int[] { TokenTypes.METHOD_DEF }; + + @Override + public int[] getAcceptableTokens() { + return TOKENS; + } @Override public int[] getDefaultTokens() { - return new int[] { TokenTypes.METHOD_DEF }; + return TOKENS; + } + + @Override + public int[] getRequiredTokens() { + return TOKENS; } @Override diff --git a/ambari-utility/src/main/java/org/apache/ambari/checkstyle/UndocumentedRestApiOperationCheck.java b/ambari-utility/src/main/java/org/apache/ambari/checkstyle/UndocumentedRestApiOperationCheck.java index c6347db..e31aab5 100644 --- a/ambari-utility/src/main/java/org/apache/ambari/checkstyle/UndocumentedRestApiOperationCheck.java +++ b/ambari-utility/src/main/java/org/apache/ambari/checkstyle/UndocumentedRestApiOperationCheck.java @@ -34,10 +34,21 @@ public class UndocumentedRestApiOperationCheck extends AbstractCheck { private static final String API_OPERATION = "ApiOperation"; private static final String API_IGNORE = "ApiIgnore"; public static final String MESSAGE = "REST API operation should be documented"; + private static final int[] TOKENS = new int[] { TokenTypes.METHOD_DEF }; + + @Override + public int[] getAcceptableTokens() { + return TOKENS; + } @Override public int[] getDefaultTokens() { - return new int[] { TokenTypes.METHOD_DEF }; + return TOKENS; + } + + @Override + public int[] getRequiredTokens() { + return TOKENS; } @Override diff --git a/ambari-utility/src/test/java/org/apache/ambari/checkstyle/AvoidTransactionalOnPrivateMethodsCheckTest.java b/ambari-utility/src/test/java/org/apache/ambari/checkstyle/AvoidTransactionalOnPrivateMethodsCheckTest.java index bfdbfa1..59c8c08 100644 --- a/ambari-utility/src/test/java/org/apache/ambari/checkstyle/AvoidTransactionalOnPrivateMethodsCheckTest.java +++ b/ambari-utility/src/test/java/org/apache/ambari/checkstyle/AvoidTransactionalOnPrivateMethodsCheckTest.java @@ -19,25 +19,21 @@ package org.apache.ambari.checkstyle; import static org.apache.ambari.checkstyle.AvoidTransactionalOnPrivateMethodsCheck.MSG_TRANSACTIONAL_ON_PRIVATE_METHOD; -import java.io.File; -import java.io.IOException; - import org.junit.Test; -import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; +import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; -public class AvoidTransactionalOnPrivateMethodsCheckTest extends BaseCheckTestSupport { +public class AvoidTransactionalOnPrivateMethodsCheckTest extends AbstractModuleTestSupport { @Override - protected String getPath(String filename) throws IOException { - return new File("src/test/resources/org/apache/ambari/checkstyle/" + filename) - .getCanonicalPath(); + protected String getPackageLocation() { + return "org/apache/ambari/checkstyle"; } @Test public void transactionalOnPrivateMethod() throws Exception { - final DefaultConfiguration config = createCheckConfig(AvoidTransactionalOnPrivateMethodsCheck.class); + final DefaultConfiguration config = createModuleConfig(AvoidTransactionalOnPrivateMethodsCheck.class); final String[] expected = { "32: " + MSG_TRANSACTIONAL_ON_PRIVATE_METHOD, "41: " + MSG_TRANSACTIONAL_ON_PRIVATE_METHOD, diff --git a/ambari-utility/src/test/java/org/apache/ambari/checkstyle/UndocumentedRestApiOperationCheckTest.java b/ambari-utility/src/test/java/org/apache/ambari/checkstyle/UndocumentedRestApiOperationCheckTest.java index 7caf3cf..c0d33c0 100644 --- a/ambari-utility/src/test/java/org/apache/ambari/checkstyle/UndocumentedRestApiOperationCheckTest.java +++ b/ambari-utility/src/test/java/org/apache/ambari/checkstyle/UndocumentedRestApiOperationCheckTest.java @@ -19,25 +19,21 @@ package org.apache.ambari.checkstyle; import static org.apache.ambari.checkstyle.UndocumentedRestApiOperationCheck.MESSAGE; -import java.io.File; -import java.io.IOException; - import org.junit.Test; -import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; +import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; -public class UndocumentedRestApiOperationCheckTest extends BaseCheckTestSupport { +public class UndocumentedRestApiOperationCheckTest extends AbstractModuleTestSupport { @Override - protected String getPath(String filename) throws IOException { - return new File("src/test/resources/org/apache/ambari/checkstyle/" + filename) - .getCanonicalPath(); + protected String getPackageLocation() { + return "org/apache/ambari/checkstyle"; } @Test public void test() throws Exception { - final DefaultConfiguration config = createCheckConfig(UndocumentedRestApiOperationCheck.class); + final DefaultConfiguration config = createModuleConfig(UndocumentedRestApiOperationCheck.class); final String[] expected = { "36: " + MESSAGE, "53: " + MESSAGE,