Author: markt
Date: Mon Sep 26 08:40:49 2016
New Revision: 1762296
URL: http://svn.apache.org/viewvc?rev=1762296&view=rev
Log:
Add some annotation checks to checkstyle and fix the handful of issues reported.
Modified:
tomcat/trunk/java/javax/annotation/ManagedBean.java
tomcat/trunk/java/javax/annotation/PostConstruct.java
tomcat/trunk/java/javax/annotation/PreDestroy.java
tomcat/trunk/java/javax/annotation/Priority.java
tomcat/trunk/java/javax/annotation/Resources.java
tomcat/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/trunk/java/javax/annotation/security/RunAs.java
tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java
tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java
tomcat/trunk/java/javax/ejb/EJBs.java
tomcat/trunk/java/javax/persistence/PersistenceContexts.java
tomcat/trunk/java/javax/persistence/PersistenceUnits.java
tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java
tomcat/trunk/java/javax/servlet/annotation/WebFilter.java
tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java
tomcat/trunk/java/javax/servlet/annotation/WebListener.java
tomcat/trunk/java/javax/servlet/annotation/WebServlet.java
tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/test/javax/servlet/http/TestCookie.java
tomcat/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java
Modified: tomcat/trunk/java/javax/annotation/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/ManagedBean.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/ManagedBean.java (original)
+++ tomcat/trunk/java/javax/annotation/ManagedBean.java Mon Sep 26 08:40:49 2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.1
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface ManagedBean {
String value() default "";
Modified: tomcat/trunk/java/javax/annotation/PostConstruct.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/PostConstruct.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/trunk/java/javax/annotation/PostConstruct.java Mon Sep 26 08:40:49
2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.0
*/
-@Target({ElementType.METHOD})
+@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface PostConstruct {
// No attributes
Modified: tomcat/trunk/java/javax/annotation/PreDestroy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/PreDestroy.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/trunk/java/javax/annotation/PreDestroy.java Mon Sep 26 08:40:49 2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.0
*/
-@Target({ElementType.METHOD})
+@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface PreDestroy {
// No attributes
Modified: tomcat/trunk/java/javax/annotation/Priority.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Priority.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/Priority.java (original)
+++ tomcat/trunk/java/javax/annotation/Priority.java Mon Sep 26 08:40:49 2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.2
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface Priority {
int value();
Modified: tomcat/trunk/java/javax/annotation/Resources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resources.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/trunk/java/javax/annotation/Resources.java Mon Sep 26 08:40:49 2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.0
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface Resources {
public Resource[] value();
Modified: tomcat/trunk/java/javax/annotation/security/DeclareRoles.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/security/DeclareRoles.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/security/DeclareRoles.java (original)
+++ tomcat/trunk/java/javax/annotation/security/DeclareRoles.java Mon Sep 26
08:40:49 2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.0
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface DeclareRoles {
public String[] value();
Modified: tomcat/trunk/java/javax/annotation/security/RunAs.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/security/RunAs.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/security/RunAs.java (original)
+++ tomcat/trunk/java/javax/annotation/security/RunAs.java Mon Sep 26 08:40:49
2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.0
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface RunAs {
public String value();
Modified: tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java (original)
+++ tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java Mon Sep 26
08:40:49 2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.1
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface DataSourceDefinition {
String className();
Modified: tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java (original)
+++ tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java Mon Sep
26 08:40:49 2016
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.1
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface DataSourceDefinitions {
DataSourceDefinition[] value();
Modified: tomcat/trunk/java/javax/ejb/EJBs.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/ejb/EJBs.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/ejb/EJBs.java (original)
+++ tomcat/trunk/java/javax/ejb/EJBs.java Mon Sep 26 08:40:49 2016
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface EJBs {
Modified: tomcat/trunk/java/javax/persistence/PersistenceContexts.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceContexts.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceContexts.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceContexts.java Mon Sep 26
08:40:49 2016
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ ElementType.TYPE })
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceContexts {
Modified: tomcat/trunk/java/javax/persistence/PersistenceUnits.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceUnits.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceUnits.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceUnits.java Mon Sep 26
08:40:49 2016
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceUnits {
Modified: tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java Mon Sep 26
08:40:49 2016
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
*
* @since Servlet 3.0
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface HandlesTypes {
Modified: tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java Mon Sep 26
08:40:49 2016
@@ -41,7 +41,7 @@ import java.lang.annotation.Target;
*
* @since Servlet 3.0
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface MultipartConfig {
Modified: tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java Mon Sep 26
08:40:49 2016
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
* @since Servlet 3.0
*/
@Inherited
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface ServletSecurity {
Modified: tomcat/trunk/java/javax/servlet/annotation/WebFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebFilter.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/WebFilter.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebFilter.java Mon Sep 26
08:40:49 2016
@@ -57,7 +57,7 @@ import javax.servlet.DispatcherType;
* @since Servlet 3.0 (Section 8.1.2)
*
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface WebFilter {
Modified: tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java Mon Sep 26
08:40:49 2016
@@ -35,7 +35,7 @@ import java.lang.annotation.Target;
*
* @since Servlet 3.0
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface WebInitParam {
Modified: tomcat/trunk/java/javax/servlet/annotation/WebListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebListener.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/WebListener.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebListener.java Mon Sep 26
08:40:49 2016
@@ -42,7 +42,7 @@ import java.lang.annotation.Target;
*
* @since Servlet 3.0
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface WebListener {
Modified: tomcat/trunk/java/javax/servlet/annotation/WebServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebServlet.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/WebServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebServlet.java Mon Sep 26
08:40:49 2016
@@ -53,7 +53,7 @@ import java.lang.annotation.Target;
* @since Servlet 3.0 (Section 8.1.1)
*
*/
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface WebServlet {
Modified: tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java (original)
+++ tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java Mon Sep 26 08:40:49 2016
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface WebServiceRefs {
Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Mon Sep 26 08:40:49 2016
@@ -43,6 +43,12 @@
<module name="TreeWalker">
+ <!-- Annotations -->
+ <module name="AnnotationLocation"/>
+ <module name="AnnotationUseStyle"/>
+ <module name="MissingOverride"/>
+ <module name="PackageAnnotation"/>
+
<!-- Block Checks -->
<module name="AvoidNestedBlocks">
<property name="allowInSwitchCase" value="true"/>
Modified: tomcat/trunk/test/javax/servlet/http/TestCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/http/TestCookie.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/http/TestCookie.java (original)
+++ tomcat/trunk/test/javax/servlet/http/TestCookie.java Mon Sep 26 08:40:49
2016
@@ -66,7 +66,7 @@ public class TestCookie {
Assert.assertEquals(0, cookie.getVersion());
}
- @Test()
+ @Test
public void defaultImpliesNetscape() {
// $Foo is allowed by Netscape but not by RFC2109
Cookie cookie = new Cookie("$Foo", null);
Modified: tomcat/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java?rev=1762296&r1=1762295&r2=1762296&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java
(original)
+++ tomcat/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java Mon
Sep 26 08:40:49 2016
@@ -33,7 +33,7 @@ public class TestCookieRFC6265Validator
TestCookie.checkCharInName(validator, TestCookie.TOKEN);
}
- @Test()
+ @Test
public void leadingDollar() {
validator.validate("$Version");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
