You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2020/09/23 07:30:00 UTC
[lucene-solr] 02/02: SOLR-14890: Refactor code to use annotations
for cluster API
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch jira/solr14890
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 1423dd495d225799801f01c819b9250696997157
Author: noble <no...@apache.org>
AuthorDate: Wed Sep 23 17:29:19 2020 +1000
SOLR-14890: Refactor code to use annotations for cluster API
---
solr/solrj/src/java/org/apache/solr/common/MapSerializable.java | 3 ++-
solr/solrj/src/java/org/apache/solr/common/MapWriter.java | 2 +-
solr/solrj/src/java/org/apache/solr/common/MapWriterMap.java | 4 ++--
.../solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java | 1 -
4 files changed, 5 insertions(+), 5 deletions(-)
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 14f06d7..f56f1b2 100644
--- a/solr/solrj/src/java/org/apache/solr/common/MapSerializable.java
+++ b/solr/solrj/src/java/org/apache/solr/common/MapSerializable.java
@@ -26,5 +26,6 @@ public interface MapSerializable {
* Do not keep a reference to the passed map and reuse it.
* it may be reused by the framework
*/
- Map<String,Object> toMap(Map<String, Object> map);
+ @SuppressWarnings({"rawtypes"})
+ Map toMap(Map<String, Object> map);
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/MapWriter.java b/solr/solrj/src/java/org/apache/solr/common/MapWriter.java
index f98f269..7266410 100644
--- a/solr/solrj/src/java/org/apache/solr/common/MapWriter.java
+++ b/solr/solrj/src/java/org/apache/solr/common/MapWriter.java
@@ -41,7 +41,7 @@ public interface MapWriter extends MapSerializable , NavigableObject {
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
- default Map<String, Object> toMap(Map<String, Object> map) {
+ default Map toMap(Map<String, Object> map) {
try {
writeMap(new EntryWriter() {
@Override
diff --git a/solr/solrj/src/java/org/apache/solr/common/MapWriterMap.java b/solr/solrj/src/java/org/apache/solr/common/MapWriterMap.java
index 8b35c96..c5f6164 100644
--- a/solr/solrj/src/java/org/apache/solr/common/MapWriterMap.java
+++ b/solr/solrj/src/java/org/apache/solr/common/MapWriterMap.java
@@ -51,8 +51,8 @@ public class MapWriterMap implements MapWriter {
@Override
- @SuppressWarnings({"rawtypes"})
- public Map toMap(Map<String, Object> map) {
+ @SuppressWarnings("unchecked")
+ public Map<String,Object> toMap(Map<String, Object> map) {
return delegate;
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java b/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
index b4807e3..d539088 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
@@ -39,7 +39,6 @@ public class JsonValidatorTest extends SolrTestCaseJ4 {
checkSchema("cluster.security.RuleBasedAuthorization");
checkSchema("core.config.Commands");
checkSchema("core.SchemaEdit");
- checkSchema("cluster.configs.Commands");
}