SOLR-16458: Node system info V2 api jersey resource

solr/api/src/java/org/apache/solr/client/api/endpoint/NodeSystemInfoApi.java

@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.api.endpoint;
+
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import org.apache.solr.client.api.model.NodeSystemResponse;
+import org.apache.solr.client.api.util.Constants;
+
+/** V2 API definition to fetch node system info, analogous to the v1 /admin/info/system. */
+@Path(Constants.NODE_INFO_SYSTEM_PATH)
+public interface NodeSystemInfoApi {
+
+  @GET
+  @Operation(
+      summary = "Retrieve all node system info.",
+      tags = {"system"})
+  NodeSystemResponse getNodeSystemInfo(@QueryParam(value = "nodes") String nodes);
+
+  @GET
+  @Operation(
+      summary = "Retrieve specific node system info.",
+      tags = {"system"})
+  @Path("/{requestedInfo}")
+  NodeSystemResponse getSpecificNodeSystemInfo(
+      @PathParam(value = "requestedInfo") String requestedInfo,
+      @QueryParam(value = "nodes") String nodes);
+}

solr/api/src/java/org/apache/solr/client/api/model/NodeSystemResponse.java

@@ -20,43 +20,50 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
-/** Response from /node/system */
+/** Response from /node/info/system */
 public class NodeSystemResponse extends SolrJerseyResponse {
 
-  @JsonProperty public String mode;
-  @JsonProperty public String host;
-  @JsonProperty public String zkHost;
+  @JsonProperty public NodeSystemInfo nodeInfo;
 
-  @JsonProperty("solr_home")
-  public String solrHome;
+  /** wrapper around the node info */
+  public static class NodeSystemInfo {
+    @JsonProperty public String host;
+    @JsonProperty public String node;
+    @JsonProperty public String mode;
+    @JsonProperty public String zkHost;
 
-  @JsonProperty("core_root")
-  public String coreRoot;
+    @JsonProperty("solr_home")
+    public String solrHome;
 
-  @JsonProperty public String environment;
+    @JsonProperty("core_root")
+    public String coreRoot;
 
-  @JsonProperty(value = "environment_label")
-  public String environmentLabel;
+    @JsonProperty public String environment;
 
-  @JsonProperty(value = "environment_color")
-  public String environmentColor;
+    @JsonProperty(value = "environment_label")
+    public String environmentLabel;
 
-  @JsonProperty public String node;
-  @JsonProperty public Lucene lucene;
-  @JsonProperty public JVM jvm;
-  @JsonProperty public Security security;
-  @JsonProperty public GPU gpu;
-  @JsonProperty public Map<String, String> system;
+    @JsonProperty(value = "environment_color")
+    public String environmentColor;
+
+    //@JsonProperty public Core core;
+    @JsonProperty public Lucene lucene;
+    @JsonProperty public JVM jvm;
+    @JsonProperty public Security security;
+    @JsonProperty public GPU gpu;
+    @JsonProperty public Map<String, String> system;
+  }
 
   /** /node/system/security */
   public static class Security {
     @JsonProperty public boolean tls;
     @JsonProperty public String authenticationPlugin;
     @JsonProperty public String authorizationPlugin;
     @JsonProperty public String username;
-    @JsonProperty public List<String> roles;
-    @JsonProperty public List<String> permissions;
+    @JsonProperty public Set<String> roles;
+    @JsonProperty public Set<String> permissions;
   }
 
   /** /node/system/lucene */
@@ -122,6 +129,22 @@ public static class GPU {
     @JsonProperty public boolean available;
     @JsonProperty public long count;
     @JsonProperty public MemoryRaw memory;
-    @JsonProperty Map<String, Object> devices;
+    @JsonProperty public Map<String, Object> devices;
+  }
+
+//  public static class Core {
+//    @JsonProperty public String schema;
+//    @JsonProperty public String host;
+//    @JsonProperty public Date now;
+//    @JsonProperty public Date start;
+//    @JsonProperty public Directory directory;
+//  }
+
+  public static class Directory {
+    @JsonProperty public String cwd;
+    @JsonProperty public String instance;
+    @JsonProperty public String data;
+    @JsonProperty public String dirimpl;
+    @JsonProperty public String index;
   }
 }

solr/api/src/java/org/apache/solr/client/api/util/Constants.java

@@ -47,4 +47,6 @@ private Constants() {
   public static final String ADDTL_FIELDS_PROPERTY = "hasAdditionalFields";
 
   public static final String JAVABIN_CONTENT_TYPE_V2 = "application/vnd.apache.solr.javabin";
+
+  public static final String NODE_INFO_SYSTEM_PATH = "/node/info/system";
 }