This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 79cd576c3a9 SOLR-15582: Remove deprecated APIs in solrj Tuple class.
(#257)
79cd576c3a9 is described below
commit 79cd576c3a97abe6d80ec6b798dfce7e964f5b1b
Author: Christine Poerschke <[email protected]>
AuthorDate: Sat Jun 22 16:24:33 2024 +0100
SOLR-15582: Remove deprecated APIs in solrj Tuple class. (#257)
---
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/client/solrj/io/Tuple.java | 12 +++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2ca207bbf42..74f3692b811 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -100,6 +100,8 @@ Other Changes
* SOLR-17279: Introduce SecurityJson.java file to Test Framework to
consolidate setting up authentication in tests. (Rudy Seitz via Eric Pugh)
+* SOLR-15582: Remove deprecated APIs in solrj Tuple class. (Christine
Poerschke via Eric Pugh)
+
================== 9.7.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 fdf992a9ed4..6e2f62ce91c 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
@@ -49,8 +49,13 @@ public class Tuple implements Cloneable, MapWriter {
*/
public boolean EXCEPTION;
+ /** Tuple fields. */
private final Map<String, Object> fields = CollectionUtil.newHashMap(2);
+
+ /** External serializable field names. */
private List<String> fieldNames;
+
+ /** Mapping of external field names to internal tuple field names. */
private Map<String, String> fieldLabels;
public Tuple() {
@@ -242,7 +247,7 @@ public class Tuple implements Cloneable, MapWriter {
/**
* A list of field names to serialize. This list (together with the mapping
in {@link
- * #getFieldLabels()} determines what tuple values are serialized and their
external (serialized)
+ * #getFieldLabels()}) determines what tuple values are serialized and their
external (serialized)
* names.
*
* @return list of external field names or null
@@ -279,8 +284,9 @@ public class Tuple implements Cloneable, MapWriter {
}
/**
- * The other tuples fields and fieldLabels will be putAll'd directly to
this's fields and
- * fieldLabels while other's fieldNames will be added such that duplicates
aren't present.
+ * The other tuples fields and fieldLabels will be merged via putAll
directly into this Tuple's
+ * fields and fieldLabels while other's fieldNames will be added such that
duplicates aren't
+ * present.
*
* @param other Tuple to be merged into this.
*/
