This is an automated email from the ASF dual-hosted git repository.
janhoy 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 70fbfb66887 Remove deprecated methods and fields in Tuple class (#1566)
70fbfb66887 is described below
commit 70fbfb6688741c81602a0fcfc8b1b0877d9fdeda
Author: Jan Høydahl <[email protected]>
AuthorDate: Tue Apr 25 20:49:02 2023 +0200
Remove deprecated methods and fields in Tuple class (#1566)
---
solr/CHANGES.txt | 2 ++
.../org/apache/solr/client/solrj/io/Tuple.java | 34 +++-------------------
2 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 620e95119a1..5e642d507fe 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -132,6 +132,8 @@ Other Changes
* SOLR-16745: Consolidate DelegatedSolrQueryRequest and
DelegatingSolrQueryRequest (Kevin Risden)
+* PR#1566: Removed deprecated members from Tuple class (janhoy)
+
================== 9.2.0 ==================
New Features
diff --git
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/Tuple.java
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/Tuple.java
index 28d680e16b9..a13a90831c5 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/Tuple.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/Tuple.java
@@ -48,24 +48,9 @@ public class Tuple implements Cloneable, MapWriter {
*/
public boolean EXCEPTION;
- /**
- * Tuple fields.
- *
- * @deprecated use {@link #getFields()} instead of this public field.
- */
- @Deprecated public Map<String, Object> fields = CollectionUtil.newHashMap(2);
- /**
- * External serializable field names.
- *
- * @deprecated use {@link #getFieldNames()} instead of this public field.
- */
- @Deprecated public List<String> fieldNames;
- /**
- * Mapping of external field names to internal tuple field names.
- *
- * @deprecated use {@link #getFieldLabels()} instead of this public field.
- */
- @Deprecated public Map<String, String> fieldLabels;
+ private final Map<String, Object> fields = CollectionUtil.newHashMap(2);
+ private List<String> fieldNames;
+ private Map<String, String> fieldLabels;
public Tuple() {
// just an empty tuple
@@ -240,16 +225,6 @@ public class Tuple implements Cloneable, MapWriter {
return this.fields;
}
- /**
- * Return all tuple fields.
- *
- * @deprecated use {@link #getFields()} instead.
- */
- @Deprecated(since = "8.6.0")
- public Map<String, Object> getMap() {
- return this.fields;
- }
-
/**
* This represents the mapping of external field labels to the tuple's
internal field names if
* they are different from field names.
@@ -299,8 +274,7 @@ public class Tuple implements Cloneable, MapWriter {
@Override
public Tuple clone() {
- Tuple clone = new Tuple(this);
- return clone;
+ return new Tuple(this);
}
/**
