Skip to content

Commit 446a9e5

Browse files
committed
SolrParams.of() (partial cherry-pick) (#3140)
1 parent dfa2063 commit 446a9e5

File tree

2 files changed

+73
-0
lines changed

2 files changed

+73
-0
lines changed
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.solr.common.params;
19+
20+
import java.util.Iterator;
21+
import java.util.Map.Entry;
22+
23+
/** Empty, immutable, SolrParams. */
24+
class EmptySolrParams extends SolrParams {
25+
26+
static final SolrParams INSTANCE = new EmptySolrParams();
27+
28+
@SuppressWarnings("rawtypes")
29+
private static final Iterator EMPTY_ITERATOR =
30+
new Iterator() {
31+
@Override
32+
public boolean hasNext() {
33+
return false;
34+
}
35+
36+
@Override
37+
public Object next() {
38+
throw new IllegalStateException("No elements available in iterator");
39+
}
40+
};
41+
42+
@Override
43+
public String get(String param) {
44+
return null;
45+
}
46+
47+
@Override
48+
public String[] getParams(String param) {
49+
return null;
50+
}
51+
52+
@SuppressWarnings("unchecked")
53+
@Override
54+
public Iterator<String> getParameterNamesIterator() {
55+
return EMPTY_ITERATOR;
56+
}
57+
58+
@SuppressWarnings("unchecked")
59+
@Override
60+
public Iterator<Entry<String, String[]>> iterator() {
61+
return EMPTY_ITERATOR;
62+
}
63+
}

solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,4 +528,14 @@ public String toString() {
528528
}
529529
return sb.toString();
530530
}
531+
532+
/** An empty, immutable SolrParams. */
533+
public static SolrParams of() {
534+
return EmptySolrParams.INSTANCE;
535+
}
536+
537+
/** An immutable SolrParams holding one pair (not null). */
538+
public static SolrParams of(String k, String v) {
539+
return new MapSolrParams(Map.of(k, v));
540+
}
531541
}

0 commit comments

Comments
 (0)