Apache Solr open-source search software
Tidy up java code in o.a.s.jersey package (#4658)
Eric Pugh928d4eae5465
diff --git a/solr/core/src/java/org/apache/solr/jersey/MediaTypeOverridingFilter.java b/solr/core/src/java/org/apache/solr/jersey/MediaTypeOverridingFilter.javaindex cc5c4f6ca80..70122f29425 100644--- a/solr/core/src/java/org/apache/solr/jersey/MediaTypeOverridingFilter.java+++ b/solr/core/src/java/org/apache/solr/jersey/MediaTypeOverridingFilter.java@@ -29,22 +29,17 @@ import jakarta.ws.rs.container.ContainerResponseFilter;import jakarta.ws.rs.container.ResourceInfo;import jakarta.ws.rs.core.Context;import java.io.IOException;-import java.lang.invoke.MethodHandles;import java.util.List;import org.apache.solr.api.JerseyResource;import org.apache.solr.handler.admin.ZookeeperRead;import org.apache.solr.handler.api.V2ApiUtils;import org.apache.solr.request.SolrQueryRequest;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;// TODO Deprecate or remove support for the 'wt' parameter in the v2 APIs in favor of the more// HTTP-compliant 'Accept' header/** Overrides the content-type of the response based on an optional user-provided 'wt' parameter */public class MediaTypeOverridingFilter implements ContainerResponseFilter {- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());-private static final List<Class<? extends JerseyResource>> EXEMPTED_RESOURCES =List.of(ZookeeperRead.class);diff --git a/solr/core/src/java/org/apache/solr/jersey/PostRequestDecorationFilter.java b/solr/core/src/java/org/apache/solr/jersey/PostRequestDecorationFilter.javaindex 53f9e8b880b..ea48aeba31d 100644--- a/solr/core/src/java/org/apache/solr/jersey/PostRequestDecorationFilter.java+++ b/solr/core/src/java/org/apache/solr/jersey/PostRequestDecorationFilter.java@@ -56,7 +56,7 @@ public class PostRequestDecorationFilter implements ContainerResponseFilter {final SolrQueryRequest solrQueryRequest =(SolrQueryRequest) requestContext.getProperty(SOLR_QUERY_REQUEST);if (!responseContext.hasEntity()- || !SolrJerseyResponse.class.isInstance(responseContext.getEntity())) {+ || !(responseContext.getEntity() instanceof SolrJerseyResponse)) {log.debug("Skipping QTime assignment because response was not a SolrJerseyResponse");return;}diff --git a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.javaindex 0840618bbe3..7c3b6450e4a 100644--- a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java+++ b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java@@ -77,7 +77,7 @@ public class PostRequestLoggingFilter implements ContainerResponseFilter {return;}if (!responseContext.hasEntity()- || !SolrJerseyResponse.class.isInstance(responseContext.getEntity())) {+ || !(responseContext.getEntity() instanceof SolrJerseyResponse)) {log.debug("Skipping v2 API logging because response is of an unexpected type");return;}@@ -112,6 +112,7 @@ public class PostRequestLoggingFilter implements ContainerResponseFilter {requestContext.getMethod(),templatedPath,filterAndStringifyQueryParameters(requestContext.getUriInfo().getQueryParameters()),+ bodyVal,response.responseHeader.status,response.responseHeader.qTime);}@@ -173,7 +174,7 @@ public class PostRequestLoggingFilter implements ContainerResponseFilter {if (!paramNamesToLog.contains(name)) return;for (String val : entry.getValue()) {- if (sb.length() != 0) sb.append('&');+ if (!sb.isEmpty()) sb.append('&');StrUtils.partialURLEncodeVal(sb, name);sb.append('=');StrUtils.partialURLEncodeVal(sb, val);diff --git a/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java b/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.javaindex e12484b12a6..5d2bf29a617 100644--- a/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java+++ b/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java@@ -66,7 +66,7 @@ public interface RequestContextKeys {* A flag set by {@link NotFoundExceptionMapper} indicating that a 404 error response was* suppressed.*- * <p>Used primarily to allow Solr to lookup certian APIs in multiple JAX-RS applications.+ * <p>Used primarily to allow Solr to lookup certain APIs in multiple JAX-RS applications.** @see NotFoundExceptionMapper*/diff --git a/solr/core/src/java/org/apache/solr/jersey/RequestMetricHandling.java b/solr/core/src/java/org/apache/solr/jersey/RequestMetricHandling.javaindex 2ee9c079610..533f56cd1a3 100644--- a/solr/core/src/java/org/apache/solr/jersey/RequestMetricHandling.java+++ b/solr/core/src/java/org/apache/solr/jersey/RequestMetricHandling.java@@ -113,7 +113,7 @@ public class RequestMetricHandling {// Increment the timeout count if responseHeader indicates a timeoutif (responseContext.hasEntity()- && SolrJerseyResponse.class.isInstance(responseContext.getEntity())) {+ && responseContext.getEntity() instanceof SolrJerseyResponse) {final SolrJerseyResponse response = (SolrJerseyResponse) responseContext.getEntity();if (Boolean.TRUE.equals(response.responseHeader.partialResults)) {metrics.numTimeouts.inc();diff --git a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.javaindex 22dcc2f1f1f..eddd237c84b 100644--- a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java@@ -21,15 +21,12 @@ import jakarta.servlet.http.HttpServletResponse;import jakarta.ws.rs.core.Response.StatusType;import java.io.IOException;import java.io.OutputStream;-import java.lang.invoke.MethodHandles;import java.util.List;import java.util.Map;import java.util.concurrent.TimeUnit;import org.glassfish.jersey.server.ContainerException;import org.glassfish.jersey.server.ContainerResponse;import org.glassfish.jersey.server.spi.ContainerResponseWriter;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;/*** A ResponseWriter which copies that output of JAX-RS computation over to {@link@@ -44,8 +41,6 @@ import org.slf4j.LoggerFactory;*/public class JettyBridgeResponseWriter implements ContainerResponseWriter {- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());-private final HttpServletResponse httpServletResponse;public JettyBridgeResponseWriter(HttpServletResponse httpServletResponse) {