This is an automated email from the ASF dual-hosted git repository. ishan pushed a commit to branch jira/SOLR15694 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 81385af0d5baf02dc7b0a7c5b8cfb7b3610992d6 Author: Ishan Chattopadhyaya <[email protected]> AuthorDate: Mon Jan 3 17:47:03 2022 +0530 Adding changelog and sonatype fixes --- solr/CHANGES.txt | 2 ++ solr/core/src/java/org/apache/solr/core/NodeRoles.java | 2 -- solr/core/src/java/org/apache/solr/handler/ClusterAPI.java | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 0c4b8aa..deffed1 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -68,6 +68,8 @@ New Features * SOLR-14608: Faster sorting for the /export handler (Joel Bernstein) +* SOLR-15694: Node roles (Ishan Chattopadhyaya, noble) + Improvements ---------------------- * LUCENE-8984: MoreLikeThis MLT is biased for uncommon fields (Andy Hind via Anshum Gupta) diff --git a/solr/core/src/java/org/apache/solr/core/NodeRoles.java b/solr/core/src/java/org/apache/solr/core/NodeRoles.java index 2eb2b62..16059db 100644 --- a/solr/core/src/java/org/apache/solr/core/NodeRoles.java +++ b/solr/core/src/java/org/apache/solr/core/NodeRoles.java @@ -26,8 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class NodeRoles { - private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - public static final String NODE_ROLES_PROP = "solr.node.roles"; /** diff --git a/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java b/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java index dce5ea5..3e9f0b0 100644 --- a/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java @@ -80,8 +80,6 @@ public class ClusterAPI { this.configSetsHandler = configSetsHandler; } - private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - @EndPoint(method = GET, path = "/cluster/node-roles", permission = COLL_READ_PERM) @@ -152,7 +150,7 @@ public class ClusterAPI { Map<String, Object> roleModesSupportedMap = new HashMap<>(); for (NodeRoles.Role role: NodeRoles.Role.values()) { roleModesSupportedMap.put(role.toString(), - Map.of("modes", (role.supportedModes()).stream().map(NodeRoles.Mode::toString).collect(Collectors.toList()))); + Map.of("modes", role.supportedModes().stream().map(NodeRoles.Mode::toString).collect(Collectors.toList()))); } rsp.add("supported-roles", roleModesSupportedMap); }
