From c080e812cf41b9935b480574f8d42857a3f133de Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Mon, 31 Aug 2026 13:23:42 -0400 Subject: [PATCH] Review and tidy solr/modules/language-models code Split out from #4743 into a per-module PR to make review easier. Contains only the tidy-up changes to solr/modules/language-models (isEmpty() idioms, JUnit assertEquals argument-order fixes, javadoc/comment fixes). No behavior changes. --- .../update/processor/TextToVectorUpdateProcessor.java | 2 +- .../org/apache/solr/languagemodels/TestLanguageModelBase.java | 2 +- .../store/rest/TestLargeLanguageModelManager.java | 2 +- .../store/rest/TestTextToVectorModelManager.java | 2 +- .../factory/DocumentEnrichmentUpdateProcessorFactoryTest.java | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/solr/modules/language-models/src/java/org/apache/solr/languagemodels/update/processor/TextToVectorUpdateProcessor.java b/solr/modules/language-models/src/java/org/apache/solr/languagemodels/update/processor/TextToVectorUpdateProcessor.java index 44c75988e7fc..d775b70c47e6 100644 --- a/solr/modules/language-models/src/java/org/apache/solr/languagemodels/update/processor/TextToVectorUpdateProcessor.java +++ b/solr/modules/language-models/src/java/org/apache/solr/languagemodels/update/processor/TextToVectorUpdateProcessor.java @@ -65,7 +65,7 @@ public void processAdd(AddUpdateCommand cmd) throws IOException { try { String textToVectorise = inputFieldContent.getValue().toString(); float[] vector = textToVector.vectorise(textToVectorise); - List vectorAsList = new ArrayList(vector.length); + List vectorAsList = new ArrayList<>(vector.length); for (float f : vector) { vectorAsList.add(f); } diff --git a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java index 99d241fdde58..908754bd1c64 100644 --- a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java +++ b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java @@ -150,7 +150,7 @@ public static void loadLargeLanguageModel(String fileName) throws Exception { assertJPut(LargeLanguageModelStore.REST_END_POINT, model, "/responseHeader/status==0"); } - protected static void prepareIndex() throws Exception { + protected static void prepareIndex() { List docsToIndex = prepareDocs(); for (SolrInputDocument doc : docsToIndex) { assertU(adoc(doc)); diff --git a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/store/rest/TestLargeLanguageModelManager.java b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/store/rest/TestLargeLanguageModelManager.java index bb785d90719d..051b67a21243 100644 --- a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/store/rest/TestLargeLanguageModelManager.java +++ b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/store/rest/TestLargeLanguageModelManager.java @@ -58,7 +58,7 @@ public void test() throws Exception { final ManagedResource res = restManager.getManagedResource(resourceId); assertTrue(res instanceof LargeLanguageModelStore); - assertEquals(res.getResourceId(), resourceId); + assertEquals(resourceId, res.getResourceId()); } @Test diff --git a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/store/rest/TestTextToVectorModelManager.java b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/store/rest/TestTextToVectorModelManager.java index 0dba83a8d97b..b63635a19caa 100644 --- a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/store/rest/TestTextToVectorModelManager.java +++ b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/store/rest/TestTextToVectorModelManager.java @@ -58,7 +58,7 @@ public void test() throws Exception { final ManagedResource res = restManager.getManagedResource(resourceId); assertTrue(res instanceof TextToVectorModelStore); - assertEquals(res.getResourceId(), resourceId); + assertEquals(resourceId, res.getResourceId()); } @Test diff --git a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/update/processor/factory/DocumentEnrichmentUpdateProcessorFactoryTest.java b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/update/processor/factory/DocumentEnrichmentUpdateProcessorFactoryTest.java index 10c0137bd323..45f568031108 100644 --- a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/update/processor/factory/DocumentEnrichmentUpdateProcessorFactoryTest.java +++ b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/update/processor/factory/DocumentEnrichmentUpdateProcessorFactoryTest.java @@ -419,8 +419,7 @@ private UpdateRequestProcessor createUpdateProcessor( String outputFieldName, String prompt, SolrCore core, - String modelName) - throws Exception { + String modelName) { LargeLanguageModelStore.getManagedModelStore(core) .addModel(new SolrLargeLanguageModel(modelName, null, null));