Author: markt
Date: Mon Sep 26 08:42:07 2016
New Revision: 1762297
URL: http://svn.apache.org/viewvc?rev=1762297&view=rev
Log:
Add some annotation checks to checkstyle and fix the handful of issues reported.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/javax/annotation/ManagedBean.java
tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java
tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/RunAs.java
tomcat/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java
tomcat/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinitions.java
tomcat/tc8.5.x/trunk/java/javax/ejb/EJBs.java
tomcat/tc8.5.x/trunk/java/javax/persistence/PersistenceContexts.java
tomcat/tc8.5.x/trunk/java/javax/persistence/PersistenceUnits.java
tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/HandlesTypes.java
tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/MultipartConfig.java
tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/ServletSecurity.java
tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebFilter.java
tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebInitParam.java
tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebListener.java
tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebServlet.java
tomcat/tc8.5.x/trunk/java/javax/xml/ws/WebServiceRefs.java
tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml
tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookie.java
tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 26 08:42:07 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762182,1762202,1762288
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762182,1762202,1762288,1762296
Modified: tomcat/tc8.5.x/trunk/java/javax/annotation/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/ManagedBean.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/ManagedBean.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/ManagedBean.java Mon Sep 26
08:42:07 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/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java Mon Sep 26
08:42:07 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/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java Mon Sep 26
08:42:07 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/tc8.5.x/trunk/java/javax/annotation/Priority.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java Mon Sep 26
08:42:07 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/tc8.5.x/trunk/java/javax/annotation/Resources.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java Mon Sep 26
08:42:07 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/tc8.5.x/trunk/java/javax/annotation/security/DeclareRoles.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/security/DeclareRoles.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/security/DeclareRoles.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/security/DeclareRoles.java Mon
Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/annotation/security/RunAs.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/security/RunAs.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/security/RunAs.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/security/RunAs.java Mon Sep 26
08:42:07 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/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java
Mon Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinitions.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinitions.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinitions.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/sql/DataSourceDefinitions.java
Mon Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/ejb/EJBs.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/ejb/EJBs.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/ejb/EJBs.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/ejb/EJBs.java Mon Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/persistence/PersistenceContexts.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/persistence/PersistenceContexts.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/persistence/PersistenceContexts.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/persistence/PersistenceContexts.java Mon
Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/persistence/PersistenceUnits.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/persistence/PersistenceUnits.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/persistence/PersistenceUnits.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/persistence/PersistenceUnits.java Mon Sep
26 08:42:07 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/tc8.5.x/trunk/java/javax/servlet/annotation/HandlesTypes.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/HandlesTypes.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/HandlesTypes.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/HandlesTypes.java Mon
Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/servlet/annotation/MultipartConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/MultipartConfig.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/MultipartConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/MultipartConfig.java Mon
Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/servlet/annotation/ServletSecurity.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/ServletSecurity.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/ServletSecurity.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/ServletSecurity.java Mon
Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/servlet/annotation/WebFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebFilter.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebFilter.java Mon Sep
26 08:42:07 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/tc8.5.x/trunk/java/javax/servlet/annotation/WebInitParam.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebInitParam.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebInitParam.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebInitParam.java Mon
Sep 26 08:42:07 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/tc8.5.x/trunk/java/javax/servlet/annotation/WebListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebListener.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebListener.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebListener.java Mon Sep
26 08:42:07 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/tc8.5.x/trunk/java/javax/servlet/annotation/WebServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebServlet.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebServlet.java
(original)
+++ tomcat/tc8.5.x/trunk/java/javax/servlet/annotation/WebServlet.java Mon Sep
26 08:42:07 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/tc8.5.x/trunk/java/javax/xml/ws/WebServiceRefs.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/xml/ws/WebServiceRefs.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/javax/xml/ws/WebServiceRefs.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/xml/ws/WebServiceRefs.java Mon Sep 26
08:42:07 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/tc8.5.x/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml Mon Sep 26 08:42:07 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/tc8.5.x/trunk/test/javax/servlet/http/TestCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookie.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookie.java (original)
+++ tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookie.java Mon Sep 26
08:42:07 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/tc8.5.x/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java?rev=1762297&r1=1762296&r2=1762297&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookieRFC6265Validator.java
Mon Sep 26 08:42:07 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
