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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 8afad4d Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=64013
Javadoc Java 8+
8afad4d is described below
commit 8afad4ddac6dc825cde2dc6fa06c41aaee2507d5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 17 22:17:09 2019 +0000
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=64013 Javadoc Java 8+
Fix Javadoc warnings and formatting changes to align with 9.0.x/7.0.x
---
java/org/apache/catalina/realm/RealmBase.java | 38 ++++++++++++++-------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/realm/RealmBase.java
b/java/org/apache/catalina/realm/RealmBase.java
index 5fd7f18..b1cbfc7 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -149,7 +149,6 @@ public abstract class RealmBase extends LifecycleMBeanBase
implements org.apache
// ------------------------------------------------------------- Properties
-
/**
* @return The HTTP status code used when the container needs to issue an
* HTTP redirect to meet the requirements of a configured transport
@@ -368,6 +367,7 @@ public abstract class RealmBase extends LifecycleMBeanBase
implements org.apache
}
}
+
/**
* Try to authenticate with the specified username, which
* matches the digest calculated using the given parameters using the
@@ -1246,7 +1246,12 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements org.apache
/**
- * @deprecated This will be removed in Tomcat 10. Use
+ * Get the principal associated with the specified user name.
+ *
+ * @param username The user name
+ * @param gssCredential the GSS credential of the principal
+ * @return the principal associated with the given user name.
+ * @deprecated This will be removed in Tomcat 10 onwards. Use
* {@link #getPrincipal(GSSName, GSSCredential)} instead.
*/
@Deprecated
@@ -1561,44 +1566,41 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements org.apache
*/
public static final AllRolesMode STRICT_AUTH_ONLY_MODE = new
AllRolesMode("strictAuthOnly");
- static AllRolesMode toMode(String name)
- {
+ static AllRolesMode toMode(String name) {
AllRolesMode mode;
- if( name.equalsIgnoreCase(STRICT_MODE.name) )
+ if (name.equalsIgnoreCase(STRICT_MODE.name)) {
mode = STRICT_MODE;
- else if( name.equalsIgnoreCase(AUTH_ONLY_MODE.name) )
+ } else if (name.equalsIgnoreCase(AUTH_ONLY_MODE.name)) {
mode = AUTH_ONLY_MODE;
- else if( name.equalsIgnoreCase(STRICT_AUTH_ONLY_MODE.name) )
+ } else if (name.equalsIgnoreCase(STRICT_AUTH_ONLY_MODE.name)) {
mode = STRICT_AUTH_ONLY_MODE;
- else
+ } else {
throw new IllegalStateException("Unknown mode, must be one of:
strict, authOnly, strictAuthOnly");
+ }
return mode;
}
- private AllRolesMode(String name)
- {
+ private AllRolesMode(String name) {
this.name = name;
}
@Override
- public boolean equals(Object o)
- {
+ public boolean equals(Object o) {
boolean equals = false;
- if( o instanceof AllRolesMode )
- {
+ if (o instanceof AllRolesMode) {
AllRolesMode mode = (AllRolesMode) o;
equals = name.equals(mode.name);
}
return equals;
}
+
@Override
- public int hashCode()
- {
+ public int hashCode() {
return name.hashCode();
}
+
@Override
- public String toString()
- {
+ public String toString() {
return name;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
