This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 859b2b98ee4138bf479168773f7d94317f035753 Author: Igal Sapir <isa...@apache.org> AuthorDate: Sat Oct 3 11:24:58 2020 -0700 Added Javadoc comments for Java 15 --- java/javax/annotation/Priority.java | 4 ++ java/javax/annotation/Resource.java | 32 ++++++++++ java/javax/annotation/Resources.java | 4 ++ java/javax/annotation/security/DeclareRoles.java | 4 ++ java/javax/annotation/security/RolesAllowed.java | 4 ++ java/javax/annotation/security/RunAs.java | 4 ++ .../javax/annotation/sql/DataSourceDefinition.java | 73 ++++++++++++++++++++++ .../annotation/sql/DataSourceDefinitions.java | 4 ++ 8 files changed, 129 insertions(+) diff --git a/java/javax/annotation/Priority.java b/java/javax/annotation/Priority.java index a4980da..df757d9 100644 --- a/java/javax/annotation/Priority.java +++ b/java/javax/annotation/Priority.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Priority { + + /** + * @return the int value + */ int value(); } diff --git a/java/javax/annotation/Resource.java b/java/javax/annotation/Resource.java index 498ca22..232ec56 100644 --- a/java/javax/annotation/Resource.java +++ b/java/javax/annotation/Resource.java @@ -27,21 +27,53 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) public @interface Resource { + + /** + * The AuthenticationType, either CONTAINER or APPLICATION + */ public enum AuthenticationType { + /** + * Container authentication + */ CONTAINER, + /** + * Application authentication + */ APPLICATION } + + /** + * @return a String with the name of the resource + */ public String name() default ""; + /** * Uses generics since Common Annotations 1.2. * * @return The type for instances of this resource */ public Class<?> type() default Object.class; + + /** + * @return the AuthenticationType of the resource default CONTAINER + */ public AuthenticationType authenticationType() default AuthenticationType.CONTAINER; + + /** + * @return true (default) if the resource is shareable, or false if not + */ public boolean shareable() default true; + + /** + * @return a string with the description for the resource + */ public String description() default ""; + + /** + * @return a string with the mappedName of the resource + */ public String mappedName() default ""; + /** * @since Common Annotations 1.1 * diff --git a/java/javax/annotation/Resources.java b/java/javax/annotation/Resources.java index 7b79dda..48d55c1 100644 --- a/java/javax/annotation/Resources.java +++ b/java/javax/annotation/Resources.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Resources { + + /** + * @return a Resource[] with the value of this Resources + */ public Resource[] value(); } diff --git a/java/javax/annotation/security/DeclareRoles.java b/java/javax/annotation/security/DeclareRoles.java index d50e30d..7bf21e5 100644 --- a/java/javax/annotation/security/DeclareRoles.java +++ b/java/javax/annotation/security/DeclareRoles.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DeclareRoles { + + /** + * @return a String[] with the roles + */ public String[] value(); } diff --git a/java/javax/annotation/security/RolesAllowed.java b/java/javax/annotation/security/RolesAllowed.java index f916b6d..202b184 100644 --- a/java/javax/annotation/security/RolesAllowed.java +++ b/java/javax/annotation/security/RolesAllowed.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface RolesAllowed { + + /** + * @return a String[] of the allowed roles + */ public String[] value(); } diff --git a/java/javax/annotation/security/RunAs.java b/java/javax/annotation/security/RunAs.java index 8a366e2..1484fee 100644 --- a/java/javax/annotation/security/RunAs.java +++ b/java/javax/annotation/security/RunAs.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface RunAs { + + /** + * @return a String with the value for RunAs + */ public String value(); } diff --git a/java/javax/annotation/sql/DataSourceDefinition.java b/java/javax/annotation/sql/DataSourceDefinition.java index feb0758..9274283 100644 --- a/java/javax/annotation/sql/DataSourceDefinition.java +++ b/java/javax/annotation/sql/DataSourceDefinition.java @@ -27,22 +27,95 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DataSourceDefinition { + + /** + * @return the className + */ String className(); + + /** + * @return the name + */ String name(); + + /** + * @return the description + */ String description() default ""; + + /** + * @return the url + */ String url() default ""; + + /** + * @return the user + */ String user() default ""; + + /** + * @return the password + */ String password() default ""; + + /** + * @return database name + */ String databaseName() default ""; + + /** + * @return the port number + */ int portNumber() default -1; + + /** + * @return the server name + */ String serverName() default "localhost"; + + /** + * @return the isolation level + */ int isolationLevel() default -1; + + /** + * @return true if the data source is transactional + */ boolean transactional() default true; + + /** + * @return the initial pool size + */ int initialPoolSize() default -1; + + /** + * @return the max pool size + */ int maxPoolSize() default -1; + + /** + * @return the min pool size + */ int minPoolSize() default -1; + + /** + * @return the max idle time + */ int maxIdleTime() default -1; + + /** + * @return the max statements + */ int maxStatements() default -1; + + /** + * @return a String[] with the properties + */ String[] properties() default {}; + + /** + * @return the login timeout + */ int loginTimeout() default 0; + } diff --git a/java/javax/annotation/sql/DataSourceDefinitions.java b/java/javax/annotation/sql/DataSourceDefinitions.java index 7fcbc050..6dd8a69 100644 --- a/java/javax/annotation/sql/DataSourceDefinitions.java +++ b/java/javax/annotation/sql/DataSourceDefinitions.java @@ -27,5 +27,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DataSourceDefinitions { + + /** + * @return a DataSourceDefinition[] + */ DataSourceDefinition[] value(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org