risdenk commented on code in PR #2876:
URL: https://github.com/apache/solr/pull/2876#discussion_r1848801684
##########
gradle/libs.versions.toml:
##########
@@ -295,7 +296,7 @@ bouncycastle-bcprov = { module =
"org.bouncycastle:bcprov-jdk18on", version.ref
carrot2-core = { module = "org.carrot2:carrot2-core", version.ref =
"carrot2-core" }
carrotsearch-hppc = { module = "com.carrotsearch:hppc", version.ref =
"carrotsearch-hppc" }
carrotsearch-randomizedtesting-runner = { module =
"com.carrotsearch.randomizedtesting:randomizedtesting-runner", version.ref =
"carrotsearch-randomizedtesting" }
-# @keep transitive dependency for version alignment
Review Comment:
not sure why this changed
##########
gradle/libs.versions.toml:
##########
@@ -305,7 +306,7 @@ commonsio-commonsio = { module = "commons-io:commons-io",
version.ref = "commons
cybozulabs-langdetect = { module = "com.cybozu.labs:langdetect", version.ref =
"cybozulabs-langdetect" }
dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core",
version.ref = "dropwizard-metrics" }
dropwizard-metrics-graphite = { module =
"io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" }
-dropwizard-metrics-jetty10 = { module =
"io.dropwizard.metrics:metrics-jetty10", version.ref = "dropwizard-metrics" }
+dropwizard-metrics-jetty10 = { module =
"io.dropwizard.metrics:metrics-jetty12-ee10", version.ref =
"dropwizard-metrics" }
Review Comment:
also the key should change from `dropwizard-metrics-jetty10`
##########
solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java:
##########
@@ -414,16 +419,16 @@ public void contextInitialized(ServletContextEvent event)
{
// Default servlet as a fall-through
root.addServlet(Servlet404.class, "/");
- chain = root;
+ chain.setHandler(root);
}
chain = injectJettyHandlers(chain);
if (config.enableV2) {
RewriteHandler rwh = new RewriteHandler();
rwh.setHandler(chain);
- rwh.setRewriteRequestURI(true);
- rwh.setRewritePathInfo(false);
+ // rwh.setRewriteRequestURI(true);
Review Comment:
commented out?
##########
solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java:
##########
@@ -24,6 +24,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
+// @LogLevel("org.eclipse.jetty=DEBUG")
Review Comment:
left over from debugging?
##########
gradle/libs.versions.toml:
##########
@@ -305,7 +306,7 @@ commonsio-commonsio = { module = "commons-io:commons-io",
version.ref = "commons
cybozulabs-langdetect = { module = "com.cybozu.labs:langdetect", version.ref =
"cybozulabs-langdetect" }
dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core",
version.ref = "dropwizard-metrics" }
dropwizard-metrics-graphite = { module =
"io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" }
-dropwizard-metrics-jetty10 = { module =
"io.dropwizard.metrics:metrics-jetty10", version.ref = "dropwizard-metrics" }
+dropwizard-metrics-jetty10 = { module =
"io.dropwizard.metrics:metrics-jetty12-ee10", version.ref =
"dropwizard-metrics" }
Review Comment:
does it matter that this is ee10 vs ee8 like the description?
##########
solr/licenses/jetty-ee10-servlet-12.0.10.jar.sha1:
##########
@@ -0,0 +1 @@
+a8d087bde78f231084901553bb6829663b4a22f1
Review Comment:
this is ee10 servlet?
##########
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:
Why did csv/xhtml get added?
##########
solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java:
##########
@@ -350,7 +351,7 @@ private void init(int port) {
connector.setIdleTimeout(THREAD_POOL_MAX_IDLE_TIME_MS);
server.setConnectors(new Connector[] {connector});
- server.setSessionIdManager(new DefaultSessionIdManager(server, new
Random()));
+ // server.setSessionIdManager(new DefaultSessionIdManager(server, new
Random()));
Review Comment:
commented out?
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
