dsmiley commented on code in PR #2259: URL: https://github.com/apache/solr/pull/2259#discussion_r1498446345
########## solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientJdkImpl.java: ########## @@ -0,0 +1,443 @@ +/* + * 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.client.solrj.impl; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.invoke.MethodHandles; +import java.net.CookieStore; +import java.net.InetSocketAddress; +import java.net.ProxySelector; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.net.http.HttpTimeoutException; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.util.Collection; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import javax.net.ssl.SSLContext; +import org.apache.solr.client.solrj.ResponseParser; +import org.apache.solr.client.solrj.SolrRequest; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.request.RequestWriter; +import org.apache.solr.client.solrj.util.ClientUtils; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.params.ModifiableSolrParams; +import org.apache.solr.common.util.ContentStream; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.common.util.ObjectReleaseTracker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class HttpSolrClientJdkImpl extends Http2SolrClientBase { + private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + private static final String USER_AGENT = + "Solr[" + MethodHandles.lookup().lookupClass().getName() + "] 1.0"; + + private HttpClient client; + + protected HttpSolrClientJdkImpl(String serverBaseUrl, HttpSolrClientJdkImpl.Builder builder) { + super(serverBaseUrl, builder); + + HttpClient.Redirect followRedirects = + Boolean.TRUE.equals(builder.followRedirects) + ? HttpClient.Redirect.NORMAL + : HttpClient.Redirect.NEVER; + HttpClient.Builder b = HttpClient.newBuilder().followRedirects(followRedirects); + if (builder.sslContext != null) { + b.sslContext(builder.sslContext); + } + if (builder.executor != null) { + b.executor(builder.executor); + } + if (builder.proxyHost != null) { + if (builder.proxyIsSocks4) { + log.warn( + "Socks4 is likely not supported by this client. See https://bugs.openjdk.org/browse/JDK-8214516";); + } + b.proxy(ProxySelector.of(new InetSocketAddress(builder.proxyHost, builder.proxyPort))); + } + this.client = b.build(); + updateDefaultMimeTypeForParser(); + assert ObjectReleaseTracker.track(this); + } + + @Override + public NamedList<Object> request(SolrRequest<?> solrRequest, String collection) + throws SolrServerException, IOException { + checkClosed(); + if (ClientUtils.shouldApplyDefaultCollection(collection, solrRequest)) { + collection = defaultCollection; + } + String url = getRequestPath(solrRequest, collection); + ResponseParser parser = responseParser(solrRequest); + ModifiableSolrParams queryParams = initalizeSolrParams(solrRequest); + HttpResponse<InputStream> resp = null; + try { + var reqb = HttpRequest.newBuilder(); + switch (solrRequest.getMethod()) { + case GET: + { + validateGetRequest(solrRequest); + reqb.GET(); + break; + } + case POST: + { + PreparePostPutRequestResult result = + preparePostPutRequest(reqb, solrRequest, queryParams); + queryParams = result.queryParams; + reqb.POST(result.bodyPublisher); + break; + } + case PUT: + { + PreparePostPutRequestResult result = + preparePostPutRequest(reqb, solrRequest, queryParams); + queryParams = result.queryParams; + reqb.PUT(result.bodyPublisher); + break; + } + default: + { + throw new IllegalStateException("Unsupported method: " + solrRequest.getMethod()); + } + } + decorateRequest(reqb, solrRequest); + reqb.uri(new URI(url + "?" + queryParams)); + resp = client.send(reqb.build(), HttpResponse.BodyHandlers.ofInputStream()); + return processErrorsAndResponse(solrRequest, parser, resp, url); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } catch (HttpTimeoutException e) { + throw new SolrServerException( + "Timeout occurred while waiting response from server at: " + url, e); + } catch (SolrException se) { + throw se; + } catch (URISyntaxException | RuntimeException re) { + throw new SolrServerException(re); + } finally { + // See + // https://docs.oracle.com/en/java/javase/17/docs/api/java.net.http/java/net/http/HttpResponse.BodySubscribers.html#ofInputStream() + if (!wantStream(parser)) { + try { + resp.body().close(); + } catch (Exception e1) { + // ignore + } + } + } + } + + private static class PreparePostPutRequestResult { Review Comment: See `org.apache.solr.common.util.Pair` -- 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
