dsmiley commented on code in PR #1374: URL: https://github.com/apache/solr/pull/1374#discussion_r1306288103
########## solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java: ########## Review Comment: @stillalex please take a look at my changes here and let me know if you think they are fine, or if you have any comments in general ########## solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java: ########## @@ -0,0 +1,129 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.util; + +import java.lang.invoke.MethodHandles; +import java.nio.file.Path; +import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.client.solrj.SolrClient; +import org.apache.solr.client.solrj.impl.HttpSolrClient; +import org.apache.solr.common.util.IOUtils; +import org.apache.solr.common.util.StrUtils; +import org.apache.solr.core.CoreContainer; +import org.apache.solr.embedded.JettyConfig; +import org.apache.solr.embedded.JettySolrRunner; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link SolrClientTestRule} that provides a Solr instance running in Jetty, an HTTP server. It's + * based off of {@link JettySolrRunner}. + */ +public class SolrJettyTestRule extends SolrClientTestRule { + private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + private JettySolrRunner jetty; + + private final ConcurrentHashMap<String, SolrClient> clients = new ConcurrentHashMap<>(); + private boolean enableProxy; + + @Override + protected void after() { + for (SolrClient solrClient : clients.values()) { + IOUtils.closeQuietly(solrClient); + } + clients.clear(); + + if (jetty != null) { + try { + jetty.stop(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new RuntimeException(e); + } + jetty = null; + enableProxy = false; + } + } + + /** Resets the state. DEPRECATED; please don't call! */ + @Deprecated + public void reset() { + after(); + } + + @Override + public void startSolr(Path solrHome) { + startSolr( + solrHome, + new Properties(), + JettyConfig.builder() + .withSSLConfig(SolrTestCaseJ4.sslConfig.buildServerSSLConfig()) + .build()); + } + + /** Enables proxy feature to disable connections. Must be called prior to starting. */ Review Comment: I copied the first sentence from a comment in JettySolrRunner written by Mark Miller but honestly I don't understand it. @stillalex maybe you could recommend better info as you just recently used it? -- 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
