Apache Solr open-source search software
SOLR-17933: fix imports & indentation
David Smileybf18ed6a90b9
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 84ab7f1db33..b2f4d5d4e52 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -182,7 +182,6 @@ openjdk-jmh = "1.37"opentelemetry = "1.56.0"opentelemetry-prometheus = "1.56.0-alpha"opentelemetry-runtime-telemetry = "2.22.0-alpha"-osgi-annotation = "8.1.0"oshai-logging = "7.0.13"# @keep for version alignmentow2-asm = "9.8"@@ -449,11 +448,11 @@ ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }ktor-client-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }langchain4j-bom = { module = "dev.langchain4j:langchain4j-bom", version.ref = "langchain4j-bom" }-langchain4j-cohere = { module = "dev.langchain4j:langchain4j-cohere"}-langchain4j-core = { module = "dev.langchain4j:langchain4j-core"}-langchain4j-hugging-face = { module = "dev.langchain4j:langchain4j-hugging-face"}-langchain4j-mistral-ai = { module = "dev.langchain4j:langchain4j-mistral-ai"}-langchain4j-open-ai = { module = "dev.langchain4j:langchain4j-open-ai"}+langchain4j-cohere = { module = "dev.langchain4j:langchain4j-cohere" }+langchain4j-core = { module = "dev.langchain4j:langchain4j-core" }+langchain4j-hugging-face = { module = "dev.langchain4j:langchain4j-hugging-face" }+langchain4j-mistral-ai = { module = "dev.langchain4j:langchain4j-mistral-ai" }+langchain4j-open-ai = { module = "dev.langchain4j:langchain4j-open-ai" }lmax-disruptor = { module = "com.lmax:disruptor", version.ref = "lmax-disruptor" }locationtech-spatial4j = { module = "org.locationtech.spatial4j:spatial4j", version.ref = "spatial4j" }mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.javaindex 7ccc3b4e32a..d3bb6216b8a 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java@@ -225,7 +225,7 @@ public class SearchHandler extends RequestHandlerBase}rb.isDistrib = isDistrib(req, rb); // can change later nonetheless-+boolean dbg = req.getParams().getBool(CommonParams.DEBUG_QUERY, false);rb.setDebug(dbg);if (dbg == false) { // if it's true, we are doing everything anyway.diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.javaindex 63908f192a6..763fe6c2f47 100644--- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java@@ -16,14 +16,12 @@*/package org.apache.solr.handler;-import java.util.ArrayList;import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.MoreLikeThisParams;-import org.apache.solr.common.util.ContentStream;import org.apache.solr.common.util.ContentStreamBase;import org.apache.solr.core.SolrCore;import org.apache.solr.handler.component.FacetComponent;@@ -158,9 +156,10 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {() -> {try (MoreLikeThisHandler mlt = new MoreLikeThisHandler();SolrQueryRequestBase req = new SolrQueryRequestBase(core, params) {}) {- req.setContentStreams(List.of(- new ContentStreamBase.StringStream("hello"),- new ContentStreamBase.StringStream("there")));+ req.setContentStreams(+ List.of(+ new ContentStreamBase.StringStream("hello"),+ new ContentStreamBase.StringStream("there")));mlt.handleRequestBody(req, new SolrQueryResponse());}});diff --git a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.javaindex 2735130d72e..43be628bb40 100644--- a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java@@ -16,7 +16,6 @@*/package org.apache.solr.update.processor;-import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;@@ -24,7 +23,6 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.MultiMapSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.params.UpdateParams;-import org.apache.solr.common.util.ContentStream;import org.apache.solr.common.util.ContentStreamBase;import org.apache.solr.core.SolrCore;import org.apache.solr.handler.UpdateRequestHandler;diff --git a/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.javaindex 22d23b90603..e44b6329c20 100644--- a/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java+++ b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java@@ -16,13 +16,11 @@*/package org.apache.solr.scripting.xslt;-import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.MapSolrParams;-import org.apache.solr.common.util.ContentStream;import org.apache.solr.common.util.ContentStreamBase;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrCore;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.javaindex cc4aef43ddf..60005d50e5a 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java@@ -22,7 +22,6 @@ import java.net.MalformedURLException;import java.net.URI;import java.nio.ByteBuffer;import java.nio.charset.StandardCharsets;-import java.util.ArrayList;import java.util.Base64;import java.util.Collection;import java.util.Date;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex bee5d1e4614..2036a94ce61 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -101,7 +101,6 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.MultiMapSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.params.UpdateParams;-import org.apache.solr.common.util.ContentStream;import org.apache.solr.common.util.ContentStreamBase;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.IOUtils;