From 30f4bd611cb7e8cf150b5518258e667b33d6b58e Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 22 Nov 2024 08:29:21 -0500 Subject: [PATCH] Doc cleanups --- .../java/org/apache/solr/request/json/RequestUtil.java | 2 +- .../org/apache/solr/security/AuthorizationContext.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java index 55f3681e13f..3cba7e0ec2c 100644 --- a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java +++ b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java @@ -78,7 +78,7 @@ public static void processParams( for (ContentStream cs : req.getContentStreams()) { // if BinaryResponseParser.BINARY_CONTENT_TYPE, let the following fail below - we may have // adjusted the content without updating the content type - // problem in this case happens in a few tests, one seems to happen with kerberos and remote + // problem in this case happens in a few tests including a remote // node query (HttpSolrCall's request proxy) String contentType = cs.getContentType(); diff --git a/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java b/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java index c2fd9215e33..715294720c2 100644 --- a/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java +++ b/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java @@ -42,10 +42,9 @@ public String toString() { /** * This method returns the {@link Principal} corresponding to the authenticated user for the * current request. The value returned by {@link Principal#getName()} depends on the - * authentication mechanism used (e.g. for user "foo" with BASIC authentication the result would - * be "foo". On the other hand with KERBEROS it would be foo@REALMNAME). The {@link - * #getUserName()} method may be preferred to extract the identity of the authenticated user - * instead of this method. + * authentication mechanism used. For example for the user "foo" with BASIC authentication the + * result would be "foo". The {@link #getUserName()} method may be preferred to extract the + * identity of the authenticated user instead of this method. * * @return user principal in case of an authenticated request null in case of unauthenticated * request @@ -56,7 +55,7 @@ public String toString() { * This method returns the name of the authenticated user for the current request. The return * value of this method is agnostic of the underlying authentication mechanism used. * - * @return user name in case of an authenticated user null in case of unauthenticated request + * @return username in case of an authenticated user null in case of unauthenticated request */ public abstract String getUserName();