This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 30845f4 Keep latest CheckStyle happy. Remove unnecessary arrays in
annotations.
30845f4 is described below
commit 30845f4d9e772ce17fe0a5eb1dd32547a017dd1c
Author: Mark Thomas <[email protected]>
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 47f8cd1..ac69fa7 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -332,8 +332,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<>();
@@ -376,8 +375,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: [email protected]
For additional commands, e-mail: [email protected]
