This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch deprecations in repository https://gitbox.apache.org/repos/asf/solr.git
commit fa96d18b981607d30256018138f610cafa8f21ae Author: David Smiley <[email protected]> AuthorDate: Wed Feb 5 08:50:41 2025 -0500 Deprecate stuff; misc. to be done in 10 & 9 --- .../src/java/org/apache/solr/request/LocalSolrQueryRequest.java | 2 +- .../src/java/org/apache/solr/servlet/DirectSolrConnection.java | 2 ++ .../src/java/org/apache/solr/util/MockSearchableSolrClient.java | 1 + .../org/apache/solr/client/solrj/request/DirectXmlRequest.java | 2 ++ solr/solrj/src/java/org/apache/solr/common/MapSerializable.java | 7 ++++++- solr/solrj/src/java/org/apache/solr/common/util/NamedList.java | 8 ++++++++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java b/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java index 02b36e9c3e4..b01021f0362 100644 --- a/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java +++ b/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java @@ -30,7 +30,7 @@ import org.apache.solr.core.SolrCore; // With the addition of SolrParams, this class isn't needed for much anymore... it's currently // retained more for backward compatibility. -/** */ +@Deprecated // use SolrQueryRequestBase public class LocalSolrQueryRequest extends SolrQueryRequestBase { public String userPrincipalName = null; diff --git a/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java index f7b5f59b48a..aa4337a6679 100644 --- a/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java +++ b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java @@ -42,7 +42,9 @@ import org.apache.solr.response.SolrQueryResponse; * interface to Solr. * * @since solr 1.2 + * @deprecated see {@link org.apache.solr.client.solrj.embedded.EmbeddedSolrServer} */ +@Deprecated public class DirectSolrConnection { protected final SolrCore core; protected final SolrRequestParsers parser; diff --git a/solr/core/src/java/org/apache/solr/util/MockSearchableSolrClient.java b/solr/core/src/java/org/apache/solr/util/MockSearchableSolrClient.java index 6f4a52e95f6..c98b9b5d94b 100644 --- a/solr/core/src/java/org/apache/solr/util/MockSearchableSolrClient.java +++ b/solr/core/src/java/org/apache/solr/util/MockSearchableSolrClient.java @@ -38,6 +38,7 @@ import org.apache.solr.common.util.NamedList; * Simple mock client that collects added documents and supports simple search by id (both <code> * {!term f=id}</code> and <code>id:</code> syntax is supported) or *:*. */ +@Deprecated public class MockSearchableSolrClient extends SolrClient { public Map<String, Map<String, SolrInputDocument>> docs = new ConcurrentHashMap<>(); diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java index 4fbe8b08158..8d40bc8c294 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java @@ -26,7 +26,9 @@ import org.apache.solr.common.params.SolrParams; * Send arbitrary XML to a request handler * * @since solr 1.3 + * @deprecated Use {@link GenericSolrRequest}. */ +@Deprecated public class DirectXmlRequest extends CollectionRequiringSolrRequest<UpdateResponse> implements IsUpdateRequest { diff --git a/solr/solrj/src/java/org/apache/solr/common/MapSerializable.java b/solr/solrj/src/java/org/apache/solr/common/MapSerializable.java index 6d3fcff9dad..e5d6ebafa92 100644 --- a/solr/solrj/src/java/org/apache/solr/common/MapSerializable.java +++ b/solr/solrj/src/java/org/apache/solr/common/MapSerializable.java @@ -18,7 +18,12 @@ package org.apache.solr.common; import java.util.Map; -/** This is to facilitate just in time creation of objects before writing it to the response. */ +/** + * This is to facilitate just in time creation of objects before writing it to the response. + * + * @deprecated Use {@link MapWriter} instead + */ +@Deprecated public interface MapSerializable { /** * Use the passed map to minimize object creation. Do not keep a reference to the passed map and diff --git a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java index 98b4efd42bd..4a3badb27e1 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java @@ -277,7 +277,9 @@ public class NamedList<T> * * @return null if not found or if the value stored was null. * @see #indexOf + * @deprecated Use {@link #indexOf(String, int)} then {@link #getVal(int)}. */ + @Deprecated public T get(String name, int start) { int sz = size(); for (int i = start; i < sz; i++) { @@ -346,7 +348,9 @@ public class NamedList<T> * * @param args One or more strings specifying the tree to navigate. * @return the last entry in the given path hierarchy, null if not found. + * @deprecated use {@link org.apache.solr.common.NavigableObject} methods instead */ + @Deprecated public Object findRecursive(String... args) { NamedList<?> currentList = null; Object value = null; @@ -408,6 +412,10 @@ public class NamedList<T> return new NamedList<>(Collections.unmodifiableList(copy.nvPairs)); } + /** + * @deprecated Use {@link SimpleOrderedMap} instead. + */ + @Deprecated public Map<String, T> asShallowMap() { return asShallowMap(false); }
