malliaridis commented on code in PR #2876:
URL: https://github.com/apache/solr/pull/2876#discussion_r1848994558
##########
gradle/libs.versions.toml:
##########
@@ -138,7 +139,7 @@ jayway-jsonpath = "2.9.0"
jctools = "4.0.5"
jersey = "3.1.9"
# TODO Sync with jersey versions
-jersey-containers = "2.39.1"
+jersey-containers = "3.1.0"
Review Comment:
I would go with jersey version 3.1.9 if possible, so that we can remove this
entry completely (see line above).
##########
solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java:
##########
@@ -100,9 +100,14 @@ public class ShowFileRequestHandler extends
RequestHandlerBase implements Permis
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static {
- KNOWN_MIME_TYPES = new HashSet<>(MimeTypes.getKnownMimeTypes());
+ KNOWN_MIME_TYPES = new HashSet<>();
+ for (MimeTypes.Type type : MimeTypes.Type.values()) {
+ KNOWN_MIME_TYPES.add(type.toString());
+ }
KNOWN_MIME_TYPES.add("text/xml");
KNOWN_MIME_TYPES.add("text/javascript");
+ KNOWN_MIME_TYPES.add("text/csv");
Review Comment:
Starting from Jetty 11 these two mime types are not included in
`MimeTypes.Type`, but we have tests that check if they are supported. Not sure
if this could cause any issues with jetty though.
##########
gradle/libs.versions.toml:
##########
@@ -315,23 +316,25 @@ eclipse-jetty-alpnjavaserver = { module =
"org.eclipse.jetty:jetty-alpn-java-ser
eclipse-jetty-alpnserver = { module = "org.eclipse.jetty:jetty-alpn-server",
version.ref = "eclipse-jetty" }
eclipse-jetty-client = { module = "org.eclipse.jetty:jetty-client",
version.ref = "eclipse-jetty" }
eclipse-jetty-deploy = { module = "org.eclipse.jetty:jetty-deploy",
version.ref = "eclipse-jetty" }
+eclipse-jetty-ee8-nested = { module =
"org.eclipse.jetty.ee8:jetty-ee8-nested", version.ref = "eclipse-jetty" }
eclipse-jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref =
"eclipse-jetty" }
-eclipse-jetty-http2-client = { module =
"org.eclipse.jetty.http2:http2-client", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-common = { module =
"org.eclipse.jetty.http2:http2-common", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:http2-hpack",
version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-httpclienttransport = { module =
"org.eclipse.jetty.http2:http2-http-client-transport", version.ref =
"eclipse-jetty" }
-eclipse-jetty-http2-server = { module =
"org.eclipse.jetty.http2:http2-server", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-client = { module =
"org.eclipse.jetty.http2:jetty-http2-client", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-common = { module =
"org.eclipse.jetty.http2:jetty-http2-common", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-hpack = { module =
"org.eclipse.jetty.http2:jetty-http2-hpack", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-httpclienttransport = { module =
"org.eclipse.jetty.http2:jetty-http2-client-transport", version.ref =
"eclipse-jetty" }
+eclipse-jetty-http2-server = { module =
"org.eclipse.jetty.http2:jetty-http2-server", version.ref = "eclipse-jetty" }
eclipse-jetty-io = { module = "org.eclipse.jetty:jetty-io", version.ref =
"eclipse-jetty" }
eclipse-jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version.ref =
"eclipse-jetty" }
eclipse-jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite",
version.ref = "eclipse-jetty" }
eclipse-jetty-security = { module = "org.eclipse.jetty:jetty-security",
version.ref = "eclipse-jetty" }
eclipse-jetty-server = { module = "org.eclipse.jetty:jetty-server",
version.ref = "eclipse-jetty" }
-eclipse-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet",
version.ref = "eclipse-jetty" }
-eclipse-jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets",
version.ref = "eclipse-jetty" }
+eclipse-jetty-servlet = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlet",
version.ref = "eclipse-jetty" }
+eclipse-jetty-servlets = { module =
"org.eclipse.jetty.ee8:jetty-ee8-servlets", version.ref = "eclipse-jetty" }
Review Comment:
I would go for
```
eclipse-jetty-ee8-servlet = { module =
"org.eclipse.jetty.ee8:jetty-ee8-servlet", version.ref = "eclipse-jetty" }
eclipse-jetty-ee8-servlets = { module =
"org.eclipse.jetty.ee8:jetty-ee8-servlets", version.ref = "eclipse-jetty" }
```
so that it is clear when using them EE8 is active. Suggestion requires
update of references if applied.
##########
solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java:
##########
@@ -41,7 +40,7 @@ public void test() {
"c", Set.of("2"));
HttpServletRequest req =
- new HttpServletRequestWrapper(new Request(null, null)) {
+ new HttpServletRequestWrapper(null) {
Review Comment:
If I remember correct, this is annotated with not-null, causing a NPE
instantly?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
