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
commit b3ce15379513bbdb0e52a270fcd240a6d5bf5aa3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 14 14:18:53 2023 +0100
Code clean-up - no functional change
---
java/javax/annotation/Generated.java | 11 ++++++-----
java/javax/annotation/PostConstruct.java | 3 +--
java/javax/annotation/PreDestroy.java | 3 +--
java/javax/annotation/Priority.java | 4 ++--
java/javax/annotation/Resource.java | 7 +++----
java/javax/annotation/security/DenyAll.java | 2 +-
java/javax/annotation/security/PermitAll.java | 2 +-
java/javax/annotation/security/RolesAllowed.java | 2 +-
8 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/java/javax/annotation/Generated.java
b/java/javax/annotation/Generated.java
index 922352a5b3..ba60ed77d2 100644
--- a/java/javax/annotation/Generated.java
+++ b/java/javax/annotation/Generated.java
@@ -28,20 +28,21 @@ import java.lang.annotation.Target;
* @since Common Annotations 1.0
*/
@Documented
-@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
- ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
- ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
ElementType.FIELD, ElementType.LOCAL_VARIABLE,
+ ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER,
ElementType.TYPE })
@Retention(RetentionPolicy.SOURCE)
public @interface Generated {
/**
- * @return The name of the code generator. It is recommended that the fully
- * qualified name of the code generator is used.
+ * @return The name of the code generator. It is recommended that the
fully qualified name of the code generator is
+ * used.
*/
String[] value();
+
/**
* @return The date the code was generated
*/
String date() default "";
+
/**
* @return Additional comments (if any) related to the code generation
*/
diff --git a/java/javax/annotation/PostConstruct.java
b/java/javax/annotation/PostConstruct.java
index 166aedbc6f..aef7d254d8 100644
--- a/java/javax/annotation/PostConstruct.java
+++ b/java/javax/annotation/PostConstruct.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Added to a method required to be called after the object has been
constructed
- * and before it used.
+ * Added to a method required to be called after the object has been
constructed and before it used.
*
* @since Common Annotations 1.0
*/
diff --git a/java/javax/annotation/PreDestroy.java
b/java/javax/annotation/PreDestroy.java
index 38bc4c6299..4a0749cefb 100644
--- a/java/javax/annotation/PreDestroy.java
+++ b/java/javax/annotation/PreDestroy.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Added to a method required to be called once the object is no longer
required
- * and before it is discarded.
+ * Added to a method required to be called once the object is no longer
required and before it is discarded.
*
* @since Common Annotations 1.0
*/
diff --git a/java/javax/annotation/Priority.java
b/java/javax/annotation/Priority.java
index 9178b0921e..6d9c84a50f 100644
--- a/java/javax/annotation/Priority.java
+++ b/java/javax/annotation/Priority.java
@@ -23,8 +23,8 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Used to define the order in which classes or parameters should be used. The
- * annotated class or parameter defines how the prority value is used.
+ * Used to define the order in which classes or parameters should be used. The
annotated class or parameter defines how
+ * the prority value is used.
*
* @since Common Annotations 1.2
*/
diff --git a/java/javax/annotation/Resource.java
b/java/javax/annotation/Resource.java
index 71427ded3c..cb00bc848f 100644
--- a/java/javax/annotation/Resource.java
+++ b/java/javax/annotation/Resource.java
@@ -22,13 +22,12 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Indicates a resource required by the application. Annotated classes will be
- * used as resources. Annotated fields and/or methods will have resources
- * injected.
+ * Indicates a resource required by the application. Annotated classes will be
used as resources. Annotated fields
+ * and/or methods will have resources injected.
*
* @since Common Annotations 1.0
*/
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
public @interface Resource {
diff --git a/java/javax/annotation/security/DenyAll.java
b/java/javax/annotation/security/DenyAll.java
index 069aca2af7..74db2da31a 100644
--- a/java/javax/annotation/security/DenyAll.java
+++ b/java/javax/annotation/security/DenyAll.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
* @since Common Annotations 1.0
*/
@Documented
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
public @interface DenyAll {
// No attributes
diff --git a/java/javax/annotation/security/PermitAll.java
b/java/javax/annotation/security/PermitAll.java
index db1d7b6b88..43177e8186 100644
--- a/java/javax/annotation/security/PermitAll.java
+++ b/java/javax/annotation/security/PermitAll.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
* @since Common Annotations 1.0
*/
@Documented
-@Target({ElementType.TYPE, ElementType.METHOD})
+@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface PermitAll {
// No attributes
diff --git a/java/javax/annotation/security/RolesAllowed.java
b/java/javax/annotation/security/RolesAllowed.java
index 4377cfd137..20bf70d475 100644
--- a/java/javax/annotation/security/RolesAllowed.java
+++ b/java/javax/annotation/security/RolesAllowed.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
* @since Common Annotations 1.0
*/
@Documented
-@Target({ElementType.TYPE, ElementType.METHOD})
+@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface RolesAllowed {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
