[tomcat] branch 7.0.x updated: Keep latest CheckStyle happy. Remove unnecessary arrays in annotations.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new 4883db6  Keep latest CheckStyle happy. Remove unnecessary arrays in 
annotations.
4883db6 is described below

commit 4883db6d8ccc45b9477e9460cf463f4cb6687025
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Jun 15 10:12:23 2019 +0100

    Keep latest CheckStyle happy. Remove unnecessary arrays in annotations.
---
 test/org/apache/catalina/startup/DuplicateMappingParamServlet.java | 2 +-
 test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java 
b/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
index bd5ba0a..9773c74 100644
--- a/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
+++ b/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author Peter Rossbach
  */
-@WebServlet(value = "/annotation/overwrite", urlPatterns = { "/param2" }, name 
= "param", initParams = {
+@WebServlet(value = "/annotation/overwrite", urlPatterns ="/param2", name = 
"param", initParams = {
         @WebInitParam(name = "foo", value = "Hello"),
         @WebInitParam(name = "bar", value = "World!") })
 public class DuplicateMappingParamServlet extends HttpServlet {
diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java 
b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index 4da9ad7..ba3f20c 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -231,8 +231,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
     }
 
 
-    @ClientEndpoint(decoders={ListStringDecoder.class},
-            encoders={ListStringEncoder.class})
+    @ClientEndpoint(decoders=ListStringDecoder.class, 
encoders=ListStringEncoder.class)
     public static class GenericsClient {
         private Queue<Object> received = new ConcurrentLinkedQueue<Object>();
 
@@ -262,8 +261,8 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 
     @ServerEndpoint(value=PATH_GENERICS_EP,
-            decoders={ListStringDecoder.class},
-            encoders={ListStringEncoder.class},
+            decoders=ListStringDecoder.class,
+            encoders=ListStringEncoder.class,
             configurator=SingletonConfigurator.class)
     public static class GenericsServer {
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org