Apache Solr open-source search software
Review and tidy solr/modules/language-models code (#4836)
Eric Pugh2ffb3b97db10
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.javaindex 44c75988e7f..d775b70c47e 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 class TextToVectorUpdateProcessor extends UpdateRequestProcessor {try {String textToVectorise = inputFieldContent.getValue().toString();float[] vector = textToVector.vectorise(textToVectorise);- List<Float> vectorAsList = new ArrayList<Float>(vector.length);+ List<Float> 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.javaindex 99d241fdde5..908754bd1c6 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 class TestLanguageModelBase extends RestTestBase {assertJPut(LargeLanguageModelStore.REST_END_POINT, model, "/responseHeader/status==0");}- protected static void prepareIndex() throws Exception {+ protected static void prepareIndex() {List<SolrInputDocument> 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.javaindex bb785d90719..051b67a2124 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 class TestLargeLanguageModelManager extends TestLanguageModelBase {final ManagedResource res = restManager.getManagedResource(resourceId);assertTrue(res instanceof LargeLanguageModelStore);- assertEquals(res.getResourceId(), resourceId);+ assertEquals(resourceId, res.getResourceId());}@Testdiff --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.javaindex 0dba83a8d97..b63635a19ca 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 class TestTextToVectorModelManager extends TestLanguageModelBase {final ManagedResource res = restManager.getManagedResource(resourceId);assertTrue(res instanceof TextToVectorModelStore);- assertEquals(res.getResourceId(), resourceId);+ assertEquals(resourceId, res.getResourceId());}@Testdiff --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.javaindex 10c0137bd32..45f56803110 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 @@ public class DocumentEnrichmentUpdateProcessorFactoryTest extends TestLanguageMoString outputFieldName,String prompt,SolrCore core,- String modelName)- throws Exception {+ String modelName) {LargeLanguageModelStore.getManagedModelStore(core).addModel(new SolrLargeLanguageModel(modelName, null, null));