code review and manual testing

Author: epugh

solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java

@@ -152,21 +152,14 @@ protected List<SolrInputDocument> loadCsvDocs(
         .loadDocs(stream);
   }
 
-  @SuppressWarnings("unchecked")
   protected List<SolrInputDocument> loadJsonLines(
       ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad) throws IOException {
     List<Map<String, Object>> docs = new ArrayList<>();
     try (Reader r = stream.getReader()) {
       BufferedReader br = new BufferedReader(r);
       String line;
       while ((line = br.readLine()) != null) {
-        line = line.trim();
-        if (line.startsWith("{") && line.endsWith("}")) {
-          Object jsonLine = ObjectBuilder.getVal(new JSONParser(line));
-          if (jsonLine instanceof Map) {
-            docs.add((Map<String, Object>) jsonLine);
-          }
-        }
+        parseStringToJson(docs, line);
         if (maxDocsToLoad > 0 && docs.size() == maxDocsToLoad) {
           break;
         }
@@ -176,6 +169,19 @@ protected List<SolrInputDocument> loadJsonLines(
     return docs.stream().map(JsonLoader::buildDoc).collect(Collectors.toList());
   }
 
+  private void parseStringToJson(List<Map<String, Object>> docs, String line) throws IOException {
+    line = line.trim();
+    if (line.startsWith("{") && line.endsWith("}")) {
+      Object jsonLine = ObjectBuilder.getVal(new JSONParser(line));
+      if (jsonLine instanceof Map<?, ?> rawMap) {
+        // JSON object keys are always Strings; the cast is safe
+        @SuppressWarnings("unchecked")
+        Map<String, Object> typedMap = (Map<String, Object>) rawMap;
+        docs.add(typedMap);
+      }
+    }
+  }
+
   @SuppressWarnings("unchecked")
   protected List<SolrInputDocument> loadJsonDocs(
       ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad) throws IOException {
@@ -293,17 +299,10 @@ protected List<SolrInputDocument> parseXmlDocs(XMLStreamReader parser, final int
     }
   }
 
-  @SuppressWarnings("unchecked")
   protected List<Map<String, Object>> loadJsonLines(String[] lines) throws IOException {
     List<Map<String, Object>> docs = new ArrayList<>(lines.length);
     for (String line : lines) {
-      line = line.trim();
-      if (line.startsWith("{") && line.endsWith("}")) {
-        Object jsonLine = ObjectBuilder.getVal(new JSONParser(line));
-        if (jsonLine instanceof Map) {
-          docs.add((Map<String, Object>) jsonLine);
-        }
-      }
+      parseStringToJson(docs, line);
     }
     return docs;
   }

solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java

@@ -47,7 +47,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -74,7 +73,6 @@
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.cloud.DocCollection;
-import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkMaintenanceUtils;
 import org.apache.solr.common.cloud.ZkStateReader;
@@ -536,29 +534,6 @@ static byte[] readAllBytes(IOSupplier<InputStream> hasStream) throws IOException
     }
   }
 
-  private String getBaseUrl(final String collection) {
-    String baseUrl = null;
-    try {
-      Set<String> liveNodes = zkStateReader().getClusterState().getLiveNodes();
-      DocCollection docColl = zkStateReader().getCollection(collection);
-      if (docColl != null && !liveNodes.isEmpty()) {
-        Optional<Replica> maybeActive =
-            docColl.getReplicas().stream().filter(r -> r.isActive(liveNodes)).findAny();
-        if (maybeActive.isPresent()) {
-          baseUrl = maybeActive.get().getBaseUrl();
-        }
-      }
-    } catch (Exception exc) {
-      log.warn("Failed to lookup base URL for collection {}", collection, exc);
-    }
-
-    if (baseUrl == null) {
-      baseUrl = zkStateReader().getBaseUrlForNodeName(cc.getZkController().getNodeName());
-    }
-
-    return baseUrl;
-  }
-
   protected String getManagedSchemaZkPath(final String configSet) {
     return getConfigSetZkPath(configSet, DEFAULT_MANAGED_SCHEMA_RESOURCE_NAME);
   }
@@ -819,8 +794,8 @@ protected ManagedIndexSchema removeLanguageSpecificObjectsAndFiles(
     final Set<String> toRemove =
         types.values().stream()
             .filter(this::isTextType)
-            .filter(t -> !languages.contains(t.getTypeName().substring(TEXT_PREFIX_LEN)))
             .map(FieldType::getTypeName)
+            .filter(typeName -> !languages.contains(typeName.substring(TEXT_PREFIX_LEN)))
             .filter(t -> !usedTypes.contains(t)) // not explicitly used by a field
             .collect(Collectors.toSet());
 
@@ -961,9 +936,9 @@ protected ManagedIndexSchema restoreLanguageSpecificObjectsAndFiles(
 
       List<SchemaField> addDynFields =
           Arrays.stream(copyFromSchema.getDynamicFields())
-              .filter(df -> langFieldTypeNames.contains(df.getPrototype().getType().getTypeName()))
-              .filter(df -> !existingDynFields.contains(df.getPrototype().getName()))
               .map(IndexSchema.DynamicField::getPrototype)
+              .filter(prototype -> langFieldTypeNames.contains(prototype.getType().getTypeName()))
+              .filter(prototype -> !existingDynFields.contains(prototype.getName()))
               .collect(Collectors.toList());
       if (!addDynFields.isEmpty()) {
         schema = schema.addDynamicFields(addDynFields, null, false);
@@ -1035,8 +1010,8 @@ protected ManagedIndexSchema restoreDynamicFields(
             .collect(Collectors.toSet());
     List<SchemaField> toAdd =
         Arrays.stream(dynamicFields)
-            .filter(df -> !existingDFNames.contains(df.getPrototype().getName()))
             .map(IndexSchema.DynamicField::getPrototype)
+            .filter(prototype -> !existingDFNames.contains(prototype.getName()))
             .collect(Collectors.toList());
 
     // only restore language specific dynamic fields that match our langSet