You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/04/14 11:02:20 UTC
[tomcat] 06/08: Code clean-up - no functional change
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b37f755905b10f0b6d8e0693f9c982854c809033
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 14 11:32:25 2023 +0100
Code clean-up - no functional change
---
java/jakarta/annotation/Generated.java | 11 ++++++-----
java/jakarta/annotation/ManagedBean.java | 3 +--
java/jakarta/annotation/PostConstruct.java | 3 +--
java/jakarta/annotation/PreDestroy.java | 3 +--
java/jakarta/annotation/Priority.java | 4 ++--
java/jakarta/annotation/Resource.java | 7 +++----
java/jakarta/annotation/security/DenyAll.java | 2 +-
java/jakarta/annotation/security/PermitAll.java | 2 +-
java/jakarta/annotation/security/RolesAllowed.java | 2 +-
9 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/java/jakarta/annotation/Generated.java b/java/jakarta/annotation/Generated.java
index e13713dd50..4997cdf44b 100644
--- a/java/jakarta/annotation/Generated.java
+++ b/java/jakarta/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/jakarta/annotation/ManagedBean.java b/java/jakarta/annotation/ManagedBean.java
index 0eac89251a..7a839d802d 100644
--- a/java/jakarta/annotation/ManagedBean.java
+++ b/java/jakarta/annotation/ManagedBean.java
@@ -26,8 +26,7 @@ import java.lang.annotation.Target;
*
* @since Common Annotations 1.1
*
- * @deprecated This will be removed no earlier than Jakarta EE 11. Use CDI beans
- * instead.
+ * @deprecated This will be removed no earlier than Jakarta EE 11. Use CDI beans instead.
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/java/jakarta/annotation/PostConstruct.java b/java/jakarta/annotation/PostConstruct.java
index 9326bc1aee..8f32f4fd52 100644
--- a/java/jakarta/annotation/PostConstruct.java
+++ b/java/jakarta/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/jakarta/annotation/PreDestroy.java b/java/jakarta/annotation/PreDestroy.java
index b25d2fe90a..3635f769b4 100644
--- a/java/jakarta/annotation/PreDestroy.java
+++ b/java/jakarta/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/jakarta/annotation/Priority.java b/java/jakarta/annotation/Priority.java
index 918ac11365..8fd399c094 100644
--- a/java/jakarta/annotation/Priority.java
+++ b/java/jakarta/annotation/Priority.java
@@ -21,8 +21,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
- * 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/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java
index b779288923..a86d4cf7df 100644
--- a/java/jakarta/annotation/Resource.java
+++ b/java/jakarta/annotation/Resource.java
@@ -23,13 +23,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)
@Repeatable(Resources.class)
public @interface Resource {
diff --git a/java/jakarta/annotation/security/DenyAll.java b/java/jakarta/annotation/security/DenyAll.java
index f722de38db..347d5e6161 100644
--- a/java/jakarta/annotation/security/DenyAll.java
+++ b/java/jakarta/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/jakarta/annotation/security/PermitAll.java b/java/jakarta/annotation/security/PermitAll.java
index 5ceaa32eed..0e0c784c65 100644
--- a/java/jakarta/annotation/security/PermitAll.java
+++ b/java/jakarta/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/jakarta/annotation/security/RolesAllowed.java b/java/jakarta/annotation/security/RolesAllowed.java
index 77cd130b40..7092d01ab3 100644
--- a/java/jakarta/annotation/security/RolesAllowed.java
+++ b/java/jakarta/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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org