This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new dddee8b2fed SOLR-16745: Consolidate DelegatedSolrQueryRequest and
DelegatingSolrQueryRequest (#1558)
dddee8b2fed is described below
commit dddee8b2fed21060a4be86ce66485ae4b1abb3b1
Author: Kevin Risden <[email protected]>
AuthorDate: Wed Apr 12 09:44:46 2023 -0400
SOLR-16745: Consolidate DelegatedSolrQueryRequest and
DelegatingSolrQueryRequest (#1558)
---
solr/CHANGES.txt | 2 +
.../solr/request/DelegatedSolrQueryRequest.java | 167 ---------------------
.../solr/servlet/CoordinatorHttpSolrCall.java | 4 +-
3 files changed, 4 insertions(+), 169 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3f82f47496c..17ba721a36d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -105,6 +105,8 @@ Other Changes
* SOLR-16735: Allow custom configuration of Jetty's SecureRequestCustomizer
(Tomás Fernández Löbbe)
+* SOLR-16745: Consolidate DelegatedSolrQueryRequest and
DelegatingSolrQueryRequest (Kevin Risden)
+
================== 9.2.0 ==================
New Features
diff --git
a/solr/core/src/java/org/apache/solr/request/DelegatedSolrQueryRequest.java
b/solr/core/src/java/org/apache/solr/request/DelegatedSolrQueryRequest.java
deleted file mode 100644
index 70028099ef1..00000000000
--- a/solr/core/src/java/org/apache/solr/request/DelegatedSolrQueryRequest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * 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.request;
-
-import io.opentracing.Span;
-import io.opentracing.Tracer;
-import java.security.Principal;
-import java.util.List;
-import java.util.Map;
-import org.apache.solr.cloud.CloudDescriptor;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.CommandOperation;
-import org.apache.solr.common.util.ContentStream;
-import org.apache.solr.core.CoreContainer;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.schema.IndexSchema;
-import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.servlet.HttpSolrCall;
-import org.apache.solr.util.RTimerTree;
-
-public class DelegatedSolrQueryRequest implements SolrQueryRequest {
- private final SolrQueryRequest delegate;
-
- public DelegatedSolrQueryRequest(SolrQueryRequest delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public SolrParams getParams() {
- return delegate.getParams();
- }
-
- @Override
- public void setParams(SolrParams params) {
- delegate.setParams(params);
- }
-
- @Override
- public Iterable<ContentStream> getContentStreams() {
- return delegate.getContentStreams();
- }
-
- @Override
- public SolrParams getOriginalParams() {
- return delegate.getOriginalParams();
- }
-
- @Override
- public Map<Object, Object> getContext() {
- return delegate.getContext();
- }
-
- @Override
- public void close() {
- delegate.close();
- }
-
- @Override
- public long getStartTime() {
- return delegate.getStartTime();
- }
-
- @Override
- public RTimerTree getRequestTimer() {
- return delegate.getRequestTimer();
- }
-
- @Override
- public SolrIndexSearcher getSearcher() {
- return delegate.getSearcher();
- }
-
- @Override
- public SolrCore getCore() {
- return delegate.getCore();
- }
-
- @Override
- public IndexSchema getSchema() {
- return delegate.getSchema();
- }
-
- @Override
- public void updateSchemaToLatest() {
- delegate.updateSchemaToLatest();
- }
-
- @Override
- public String getParamString() {
- return delegate.getParamString();
- }
-
- @Override
- public Map<String, Object> getJSON() {
- return delegate.getJSON();
- }
-
- @Override
- public void setJSON(Map<String, Object> json) {
- delegate.setJSON(json);
- }
-
- @Override
- public Principal getUserPrincipal() {
- return delegate.getUserPrincipal();
- }
-
- @Override
- public String getPath() {
- return delegate.getPath();
- }
-
- @Override
- public Map<String, String> getPathTemplateValues() {
- return delegate.getPathTemplateValues();
- }
-
- @Override
- public List<CommandOperation> getCommands(boolean validateInput) {
- return delegate.getCommands(validateInput);
- }
-
- @Override
- public String getHttpMethod() {
- return delegate.getHttpMethod();
- }
-
- @Override
- public HttpSolrCall getHttpSolrCall() {
- return delegate.getHttpSolrCall();
- }
-
- @Override
- public Tracer getTracer() {
- return delegate.getTracer();
- }
-
- @Override
- public Span getSpan() {
- return delegate.getSpan();
- }
-
- @Override
- public CoreContainer getCoreContainer() {
- return delegate.getCoreContainer();
- }
-
- @Override
- public CloudDescriptor getCloudDescriptor() {
- return delegate.getCloudDescriptor();
- }
-}
diff --git
a/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
b/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
index 06d7f94cdd5..44f1fd5f837 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
@@ -37,7 +37,7 @@ import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.request.DelegatedSolrQueryRequest;
+import org.apache.solr.request.DelegatingSolrQueryRequest;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
@@ -188,7 +188,7 @@ public class CoordinatorHttpSolrCall extends HttpSolrCall {
CloudDescriptor cloudDescriptor =
new CloudDescriptor(
delegate.getCore().getCoreDescriptor(),
delegate.getCore().getName(), p);
- return new DelegatedSolrQueryRequest(delegate) {
+ return new DelegatingSolrQueryRequest(delegate) {
@Override
public HttpSolrCall getHttpSolrCall() {
return httpSolrCall;
