tidy up

Author: kotman12

solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java

@@ -251,7 +251,8 @@ private record FieldOrigin(String shardAddr, LukeResponse.FieldInfo fieldInfo) {
    *     short-circuited (e.g. single-shard collection) and the caller should fall through to local
    *     logic.
    */
-  private boolean handleDistributed(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
+  private boolean handleDistributed(SolrQueryRequest req, SolrQueryResponse rsp)
+      throws IOException {
     ShardHandler shardHandler = shardHandlerFactory.getShardHandler();
     ResponseBuilder rb = new ResponseBuilder(req, rsp, Collections.emptyList());
     shardHandler.prepDistributed(rb);
@@ -321,9 +322,13 @@ private void mergeDistributedResponses(SolrQueryResponse rsp, List<ShardResponse
             "Unexpected empty response from shard: " + shardAddress(firstRsp));
       }
       Object schema = firstShardRsp.get(RSP_SCHEMA);
-      if (schema != null) rsp.add(RSP_SCHEMA, schema);
+      if (schema != null) {
+        rsp.add(RSP_SCHEMA, schema);
+      }
       Object info = firstShardRsp.get(RSP_INFO);
-      if (info != null) rsp.add(RSP_INFO, info);
+      if (info != null) {
+        rsp.add(RSP_INFO, info);
+      }
     }
 
     for (ShardResponse srsp : responses) {
@@ -335,8 +340,7 @@ private void mergeDistributedResponses(SolrQueryResponse rsp, List<ShardResponse
       NamedList<Object> shardIndex = lukeRsp.getIndexInfo();
       if (shardIndex != null) {
         totalNumDocs += Optional.ofNullable(lukeRsp.getNumDocsAsLong()).orElse(0L);
-        totalMaxDoc =
-            Math.max(totalMaxDoc, Optional.ofNullable(lukeRsp.getMaxDoc()).orElse(0));
+        totalMaxDoc = Math.max(totalMaxDoc, Optional.ofNullable(lukeRsp.getMaxDoc()).orElse(0));
         totalDeletedDocs += Optional.ofNullable(lukeRsp.getDeletedDocsAsLong()).orElse(0L);
         Number segCount = (Number) shardIndex.get(KEY_SEGMENT_COUNT);
         totalSegmentCount += segCount != null ? segCount.intValue() : 0;

solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerDistribTest.java

@@ -66,8 +66,7 @@ private LukeResponse requestLuke(String collection, ModifiableSolrParams extra)
     params.set("qt", "/admin/luke");
     params.set("numTerms", "0");
     if (extra != null) {
-      for (Map.Entry<String, String[]> entry :
-          extra.getMap().entrySet()) {
+      for (Map.Entry<String, String[]> entry : extra.getMap().entrySet()) {
         params.set(entry.getKey(), entry.getValue());
       }
     }

solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java

@@ -130,21 +130,26 @@ public FieldInfo(String n) {
     @SuppressWarnings("unchecked")
     public void read(NamedList<Object> nl) {
       for (Map.Entry<String, Object> entry : nl) {
-        String key = entry.getKey();
-        switch (key) {
-          case "type" -> type = (String) entry.getValue();
-          case "flags" -> flags = parseFlags((String) entry.getValue());
-          case "schema" -> schema = (String) entry.getValue();
-          case "docs" -> {
-            docs = (Integer) entry.getValue();
-            docsAsLong = (long) docs; // widen, lossless
-          }
-          case "docsAsLong" -> docsAsLong = (Long) entry.getValue();
+        if ("type".equals(entry.getKey())) {
+          type = (String) entry.getValue();
+        } else if ("flags".equals(entry.getKey())) {
+          flags = parseFlags((String) entry.getValue());
+        } else if ("schema".equals(entry.getKey())) {
+          schema = (String) entry.getValue();
+        } else if ("docs".equals(entry.getKey())) {
+          docs = (Integer) entry.getValue();
+          docsAsLong = (long) docs; // widen, lossless
+        } else if ("docsAsLong".equals(entry.getKey())) {
           // Don't set docs — narrowing Long→int is lossy
-          case "distinct" -> distinct = (Integer) entry.getValue();
-          case "cacheableFaceting" -> cacheableFaceting = (Boolean) entry.getValue();
-          case "topTerms" -> topTerms = (NamedList<Integer>) entry.getValue();
-          default -> extras.put(key, entry.getValue());
+          docsAsLong = (Long) entry.getValue();
+        } else if ("distinct".equals(entry.getKey())) {
+          distinct = (Integer) entry.getValue();
+        } else if ("cacheableFaceting".equals(entry.getKey())) {
+          cacheableFaceting = (Boolean) entry.getValue();
+        } else if ("topTerms".equals(entry.getKey())) {
+          topTerms = (NamedList<Integer>) entry.getValue();
+        } else {
+          extras.put(entry.getKey(), entry.getValue());
         }
       }
     }
@@ -287,7 +292,9 @@ private Long getIndexLong(String key) {
   }
 
   public Integer getNumDocs() {
-    if (indexInfo == null) return null;
+    if (indexInfo == null) {
+      return null;
+    }
     Object val = indexInfo.get("numDocs");
     return val instanceof Integer i ? i : null;
   }
@@ -297,7 +304,9 @@ public Long getNumDocsAsLong() {
   }
 
   public Integer getMaxDoc() {
-    if (indexInfo == null) return null;
+    if (indexInfo == null) {
+      return null;
+    }
     Object val = indexInfo.get("maxDoc");
     return val instanceof Integer i ? i : null;
   }
@@ -307,7 +316,9 @@ public Long getDeletedDocsAsLong() {
   }
 
   public Integer getNumTerms() {
-    if (indexInfo == null) return null;
+    if (indexInfo == null) {
+      return null;
+    }
     Object val = indexInfo.get("numTerms");
     return val instanceof Integer i ? i : null;
   }