From 206c0ac18a4c13655a8e93f9b47ecb116d822672 Mon Sep 17 00:00:00 2001 From: Renato Haeberli Date: Fri, 10 Jan 2025 23:45:58 +0100 Subject: [PATCH] implementing factory-methods for empty and key-value pair on SimpleOrderedMap --- .../solr/common/util/SimpleOrderedMap.java | 33 ++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java b/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java index 20a16eb7f83..cd4eb3951fd 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java @@ -72,39 +72,20 @@ public SimpleOrderedMap clone() { /** * Returns a shared, empty, and immutable instance of SimpleOrderedMap. - * @return empty SimpleOrderedMap (immutable) + * @return Empty SimpleOrderedMap (immutable) */ public static SimpleOrderedMap of() { return EMPTY; } /** - * Returns an immutable instance of SimpleOrderedMap with a single element. - * @return List containing the elements + * Returns an immutable instance of SimpleOrderedMap with a single key-value pair. + * @return SimpleOrderedMap containing one key-value pair */ - public static SimpleOrderedMap of(Object o1) { - return new SimpleOrderedMap<>(List.of(o1)); - } - - /** - * Returns an immutable instance of SimpleOrderedMap with two elements. - * @return List containing the elements - */ - public static SimpleOrderedMap of(Object o1, Object o2) { - return new SimpleOrderedMap<>(List.of(o1,o2)); - } - - /** - * Returns an immutable instance of SimpleOrderedMap with an arbitrary number of elements. - * @return List containing the elements - */ - public static SimpleOrderedMap of(Object... elements) { - return switch (elements.length) { - case 0 -> of(); - case 1 -> of(elements[0]); - case 2 -> of(elements[0], elements[1]); - default -> new SimpleOrderedMap<>(List.of(elements)); - }; + + public static SimpleOrderedMap of(String name, T val) + { + return new SimpleOrderedMap<>(List.of(name, val)); } }