Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

minor: AuthorizationFailure is now a record (#4198)

David Smiley4af06a9c5185
diff --git a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java
index 7fa7a05f2a9..1a96f534310 100644
--- a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java
+++ b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java
@@ -89,7 +89,7 @@ public class SolrRequestAuthorizer implements ContainerRequestFilter {
AuthorizationUtils.authorize(servletRequest, servletResponse, coreContainer, authzContext);
if (authzFailure != null) {
final Response failureResponse =
- Response.status(authzFailure.getStatusCode()).entity(authzFailure.getMessage()).build();
+ Response.status(authzFailure.statusCode()).entity(authzFailure.message()).build();
requestContext.abortWith(failureResponse);
}
}
diff --git a/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java b/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java
index d551c4eddc8..a316dbdf65d 100644
--- a/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java
+++ b/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java
@@ -43,23 +43,7 @@ public class AuthorizationUtils {
/* Private ctor prevents instantiation */
}
- public static class AuthorizationFailure {
- private final int statusCode;
- private final String message;
-
- public AuthorizationFailure(int statusCode, String message) {
- this.statusCode = statusCode;
- this.message = message;
- }
-
- public int getStatusCode() {
- return statusCode;
- }
-
- public String getMessage() {
- return message;
- }
- }
+ public record AuthorizationFailure(int statusCode, String message) {}
public static AuthorizationFailure authorize(
HttpServletRequest servletReq,
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index c289ca6a3a9..5e2fc97d163 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -450,7 +450,7 @@ public class HttpSolrCall {
AuthorizationUtils.AuthorizationFailure authzFailure =
AuthorizationUtils.authorize(req, response, cores, authzContext);
if (authzFailure != null) {
- sendError(authzFailure.getStatusCode(), authzFailure.getMessage());
+ sendError(authzFailure.statusCode(), authzFailure.message());
return RETURN;
}
}