diff --git a/src/main/java/org/codelibs/fess/suggest/Suggester.java b/src/main/java/org/codelibs/fess/suggest/Suggester.java index 79cf1d0..e1ef21d 100644 --- a/src/main/java/org/codelibs/fess/suggest/Suggester.java +++ b/src/main/java/org/codelibs/fess/suggest/Suggester.java @@ -203,7 +203,8 @@ public boolean createIndexIfNothing() { final String settingsSource = getDefaultIndexSettings(); final String indexName = createIndexName(index); if (logger.isInfoEnabled()) { - logger.info("Creating suggest index: index={}, searchAlias={}, updateAlias={}", indexName, getSearchAlias(index), getUpdateAlias(index)); + logger.info("Creating suggest index: index={}, searchAlias={}, updateAlias={}", indexName, getSearchAlias(index), + getUpdateAlias(index)); } client.admin() @@ -239,7 +240,8 @@ public void createNextIndex() { final String settingsSource = getDefaultIndexSettings(); final String indexName = createIndexName(index); if (logger.isInfoEnabled()) { - logger.info("Creating next index: index={}, updateAlias={}, previousIndices={}", indexName, getUpdateAlias(index), prevIndices); + logger.info("Creating next index: index={}, updateAlias={}, previousIndices={}", indexName, getUpdateAlias(index), + prevIndices); } final CreateIndexResponse createIndexResponse = client.admin() @@ -283,9 +285,11 @@ public void switchIndex() { final List updateIndices = getIndicesForAlias(updateAlias); if (updateIndices.size() != EXPECTED_INDEX_COUNT) { if (logger.isDebugEnabled()) { - logger.debug("Unexpected number of update indices: expected={}, actual={}, updateAlias={}, indices={}", EXPECTED_INDEX_COUNT, updateIndices.size(), updateAlias, updateIndices); + logger.debug("Unexpected number of update indices: expected={}, actual={}, updateAlias={}, indices={}", + EXPECTED_INDEX_COUNT, updateIndices.size(), updateAlias, updateIndices); } - throw new SuggesterException("Unexpected number of update indices: expected=" + EXPECTED_INDEX_COUNT + ", actual=" + updateIndices.size()); + throw new SuggesterException( + "Unexpected number of update indices: expected=" + EXPECTED_INDEX_COUNT + ", actual=" + updateIndices.size()); } final String updateIndex = updateIndices.get(0); @@ -293,9 +297,11 @@ public void switchIndex() { final List searchIndices = getIndicesForAlias(searchAlias); if (searchIndices.size() != EXPECTED_INDEX_COUNT) { if (logger.isDebugEnabled()) { - logger.debug("Unexpected number of search indices: expected={}, actual={}, searchAlias={}, indices={}", EXPECTED_INDEX_COUNT, searchIndices.size(), searchAlias, searchIndices); + logger.debug("Unexpected number of search indices: expected={}, actual={}, searchAlias={}, indices={}", + EXPECTED_INDEX_COUNT, searchIndices.size(), searchAlias, searchIndices); } - throw new SuggesterException("Unexpected number of search indices: expected=" + EXPECTED_INDEX_COUNT + ", actual=" + searchIndices.size()); + throw new SuggesterException( + "Unexpected number of search indices: expected=" + EXPECTED_INDEX_COUNT + ", actual=" + searchIndices.size()); } final String searchIndex = searchIndices.get(0); @@ -459,8 +465,7 @@ private String createIndexName(final String index) { } private String getDefaultMappings() throws IOException { - try (final InputStream is = this.getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { + try (final InputStream is = this.getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { if (is == null) { throw new IOException("Resource not found: suggest_indices/suggest/mappings-default.json"); } @@ -469,8 +474,7 @@ private String getDefaultMappings() throws IOException { } private String getDefaultIndexSettings() throws IOException { - try (final InputStream is = this.getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest.json")) { + try (final InputStream is = this.getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest.json")) { if (is == null) { throw new IOException("Resource not found: suggest_indices/suggest.json"); } @@ -496,10 +500,7 @@ private List getIndicesForAlias(final String alias) { client.admin().indices().prepareGetAliases(alias).execute().actionGet(suggestSettings.getIndicesTimeout()); getAliasesResponse.getAliases() .entrySet() - .forEach(x -> x.getValue() - .stream() - .filter(y -> alias.equals(y.alias())) - .forEach(y -> indices.add(x.getKey()))); + .forEach(x -> x.getValue().stream().filter(y -> alias.equals(y.alias())).forEach(y -> indices.add(x.getKey()))); } return indices; } diff --git a/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java b/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java index 55446d5..6bb47a7 100644 --- a/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java +++ b/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java @@ -170,8 +170,8 @@ public Suggester build(final Client client, final String id) { try { contentsReadingConverter.init(); } catch (final IOException e) { - throw new SuggesterException("Failed to initialize contents reading converter: " + contentsReadingConverter.getClass().getName(), - e); + throw new SuggesterException( + "Failed to initialize contents reading converter: " + contentsReadingConverter.getClass().getName(), e); } if (normalizer == null) { diff --git a/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexer.java b/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexer.java index c22224c..dda7082 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexer.java +++ b/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexer.java @@ -206,7 +206,8 @@ public SuggestIndexResponse index(final SuggestItem[] items) { final SuggestItem[] array = Stream.of(items).filter(item -> !item.isBadWord(badWords)).toArray(SuggestItem[]::new); if (logger.isDebugEnabled()) { - logger.debug("Indexing suggest items: index={}, totalItems={}, validItems={}, filteredByBadWords={}", index, items.length, array.length, items.length - array.length); + logger.debug("Indexing suggest items: index={}, totalItems={}, validItems={}, filteredByBadWords={}", index, items.length, + array.length, items.length - array.length); } try { @@ -273,9 +274,8 @@ public SuggestDeleteResponse deleteDocumentWords() { if (logger.isInfoEnabled()) { logger.info("Deleting document words: index={}", index); } - return deleteWordsByKind(FieldNames.DOC_FREQ, SuggestItem.Kind.DOCUMENT, - item -> item.setDocFreq(0), - SuggestItem.Kind.QUERY, SuggestItem.Kind.USER); + return deleteWordsByKind(FieldNames.DOC_FREQ, SuggestItem.Kind.DOCUMENT, item -> item.setDocFreq(0), SuggestItem.Kind.QUERY, + SuggestItem.Kind.USER); } /** @@ -286,9 +286,8 @@ public SuggestDeleteResponse deleteQueryWords() { if (logger.isInfoEnabled()) { logger.info("Deleting query words: index={}", index); } - return deleteWordsByKind(FieldNames.QUERY_FREQ, SuggestItem.Kind.QUERY, - item -> item.setQueryFreq(0), - SuggestItem.Kind.DOCUMENT, SuggestItem.Kind.USER); + return deleteWordsByKind(FieldNames.QUERY_FREQ, SuggestItem.Kind.QUERY, item -> item.setQueryFreq(0), SuggestItem.Kind.DOCUMENT, + SuggestItem.Kind.USER); } /** @@ -304,8 +303,8 @@ private SuggestDeleteResponse deleteWordsByKind(final String freqField, final Su final long start = System.currentTimeMillis(); // Build query to exclude certain kinds - final org.opensearch.index.query.BoolQueryBuilder boolQuery = QueryBuilders.boolQuery() - .must(QueryBuilders.rangeQuery(freqField).gte(1)); + final org.opensearch.index.query.BoolQueryBuilder boolQuery = + QueryBuilders.boolQuery().must(QueryBuilders.rangeQuery(freqField).gte(1)); for (final SuggestItem.Kind kind : excludeKinds) { boolQuery.mustNot(QueryBuilders.matchPhraseQuery(FieldNames.KINDS, kind.toString())); } @@ -332,9 +331,7 @@ private SuggestDeleteResponse deleteWordsByKind(final String freqField, final Su for (final SearchHit hit : hits) { final SuggestItem item = SuggestItem.parseSource(hit.getSourceAsMap()); freqSetter.accept(item); - item.setKinds(Stream.of(item.getKinds()) - .filter(kind -> kind != kindToRemove) - .toArray(SuggestItem.Kind[]::new)); + item.setKinds(Stream.of(item.getKinds()).filter(kind -> kind != kindToRemove).toArray(SuggestItem.Kind[]::new)); updateItems.add(item); } final SuggestWriterResult result = diff --git a/src/main/java/org/codelibs/fess/suggest/index/contents/DefaultContentsParser.java b/src/main/java/org/codelibs/fess/suggest/index/contents/DefaultContentsParser.java index 6f0c7d5..a087d96 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/contents/DefaultContentsParser.java +++ b/src/main/java/org/codelibs/fess/suggest/index/contents/DefaultContentsParser.java @@ -102,8 +102,8 @@ public SuggestItem parseSearchWords(final String[] words, final String[][] readi if (wordsList.isEmpty()) { return null; } - return new SuggestItem(wordsList.toArray(String[]::new), readingList.toArray(String[][]::new), - fields, 0, score, -1, tags, roles, langs, SuggestItem.Kind.QUERY); + return new SuggestItem(wordsList.toArray(String[]::new), readingList.toArray(String[][]::new), fields, 0, score, -1, tags, + roles, langs, SuggestItem.Kind.QUERY); } catch (final IOException e) { throw new SuggesterException("Failed to create SuggestItem from search words.", e); } @@ -256,8 +256,8 @@ protected List analyzeTextByReading(final SuggestAnalyzer analyzer * @param useReading Whether to use reading analysis * @return List of tokens */ - private List analyzeTextInternal(final SuggestAnalyzer analyzer, final String field, final String text, - final String lang, final boolean useReading) { + private List analyzeTextInternal(final SuggestAnalyzer analyzer, final String field, final String text, final String lang, + final boolean useReading) { final List tokens = new ArrayList<>(); final StringBuilder buf = new StringBuilder(maxAnalyzedContentLength); final String analyzeType = useReading ? "reading " : ""; @@ -289,8 +289,7 @@ private List analyzeTextInternal(final SuggestAnalyzer analyzer, f private void processBuffer(final SuggestAnalyzer analyzer, final String field, final String lang, final boolean useReading, final List tokens, final StringBuilder buf, final String analyzeType, final boolean isLast) { try { - final List result = useReading - ? analyzer.analyzeAndReading(buf.toString().trim(), field, lang) + final List result = useReading ? analyzer.analyzeAndReading(buf.toString().trim(), field, lang) : analyzer.analyze(buf.toString().trim(), field, lang); if (result != null) { tokens.addAll(result); @@ -299,9 +298,11 @@ private void processBuffer(final SuggestAnalyzer analyzer, final String field, f final String lastPrefix = isLast ? "last " : ""; final String typeDesc = useReading ? "reading " : ""; if (logger.isDebugEnabled()) { - logger.warn("Failed to analyze {}{}text: field={}, lang={}, textSize={}", lastPrefix, typeDesc, field, lang, buf.length(), e); + logger.warn("Failed to analyze {}{}text: field={}, lang={}, textSize={}", lastPrefix, typeDesc, field, lang, buf.length(), + e); } else { - logger.warn("Failed to analyze {}{}text: field={}, lang={}, textSize={}, error={}", lastPrefix, typeDesc, field, lang, buf.length(), e.getMessage()); + logger.warn("Failed to analyze {}{}text: field={}, lang={}, textSize={}, error={}", lastPrefix, typeDesc, field, lang, + buf.length(), e.getMessage()); } } } diff --git a/src/main/java/org/codelibs/fess/suggest/index/contents/document/ESSourceReader.java b/src/main/java/org/codelibs/fess/suggest/index/contents/document/ESSourceReader.java index 3a7e56a..c23c10d 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/contents/document/ESSourceReader.java +++ b/src/main/java/org/codelibs/fess/suggest/index/contents/document/ESSourceReader.java @@ -203,7 +203,8 @@ public void setLimitDocNumPercentage(final String limitPercentage) { } if (logger.isInfoEnabled()) { - logger.info("Setting document limit percentage: index={}, requestedPercentage={}, actualPercentage={}%", indexName, limitPercentage, this.limitPercentage); + logger.info("Setting document limit percentage: index={}, requestedPercentage={}, actualPercentage={}%", indexName, + limitPercentage, this.limitPercentage); } } diff --git a/src/main/java/org/codelibs/fess/suggest/settings/ArraySettings.java b/src/main/java/org/codelibs/fess/suggest/settings/ArraySettings.java index 3fac7e6..35276d1 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/ArraySettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/ArraySettings.java @@ -141,7 +141,8 @@ public String[] get(final String key) { */ public void add(final String key, final Object value) { if (logger.isDebugEnabled()) { - logger.debug("Adding array settings: index={}, settingsId={}, key={}, value={}", arraySettingsIndexName, settingsId, key, value); + logger.debug("Adding array settings: index={}, settingsId={}, key={}, value={}", arraySettingsIndexName, settingsId, key, + value); } final Map source = new HashMap<>(); @@ -167,7 +168,8 @@ public void delete(final String key) { */ public void delete(final String key, final String value) { if (logger.isDebugEnabled()) { - logger.debug("Deleting array settings: index={}, settingsId={}, key={}, value={}", arraySettingsIndexName, settingsId, key, value); + logger.debug("Deleting array settings: index={}, settingsId={}, key={}, value={}", arraySettingsIndexName, settingsId, key, + value); } deleteFromArray(arraySettingsIndexName, settingsId, createId(key, value)); } diff --git a/src/main/java/org/codelibs/fess/suggest/settings/ElevateWordSettings.java b/src/main/java/org/codelibs/fess/suggest/settings/ElevateWordSettings.java index f17808f..0966527 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/ElevateWordSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/ElevateWordSettings.java @@ -137,7 +137,8 @@ public ElevateWord[] get() { */ public void add(final ElevateWord elevateWord) { if (logger.isDebugEnabled()) { - logger.debug("Adding elevate word: index={}, word={}, boost={}", arraySettings.arraySettingsIndexName, elevateWord.getElevateWord(), elevateWord.getBoost()); + logger.debug("Adding elevate word: index={}, word={}, boost={}", arraySettings.arraySettingsIndexName, + elevateWord.getElevateWord(), elevateWord.getBoost()); } final Map source = new HashMap<>(); diff --git a/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettings.java b/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettings.java index 0bbe840..b9faa66 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettings.java @@ -429,7 +429,8 @@ public void set(final String key, final Object value) { */ public void set(final Map map) { if (logger.isDebugEnabled()) { - logger.debug("Setting suggest settings (bulk): index={}, settingsId={}, settings={}", settingsIndexName, settingsId, map.toString()); + logger.debug("Setting suggest settings (bulk): index={}, settingsId={}, settings={}", settingsIndexName, settingsId, + map.toString()); } try { final XContentBuilder builder = JsonXContent.contentBuilder().map(map); diff --git a/src/test/java/org/codelibs/fess/suggest/SuggesterRefactoringTest.java b/src/test/java/org/codelibs/fess/suggest/SuggesterRefactoringTest.java index 54fddad..9c79523 100644 --- a/src/test/java/org/codelibs/fess/suggest/SuggesterRefactoringTest.java +++ b/src/test/java/org/codelibs/fess/suggest/SuggesterRefactoringTest.java @@ -85,12 +85,8 @@ public void testGetIndicesForAlias_existingAlias() throws Exception { final String aliasName = "test-alias"; // Create index with alias - final CreateIndexResponse response = client.admin() - .indices() - .prepareCreate(indexName) - .addAlias(new Alias(aliasName)) - .execute() - .actionGet(); + final CreateIndexResponse response = + client.admin().indices().prepareCreate(indexName).addAlias(new Alias(aliasName)).execute().actionGet(); assertTrue("Index creation should be acknowledged", response.isAcknowledged()); final Suggester suggester = Suggester.builder().build(client, "test"); @@ -194,8 +190,8 @@ public void testSwitchIndex_unexpectedUpdateIndicesCount() throws Exception { // It could be either "Unexpected number of update indices" or "Unexpected number of search indices" // depending on which check fails first assertTrue("Exception message should mention unexpected indices: " + exceptionMessage, - exceptionMessage.contains("Unexpected number of update indices") || - exceptionMessage.contains("Unexpected number of search indices")); + exceptionMessage.contains("Unexpected number of update indices") + || exceptionMessage.contains("Unexpected number of search indices")); } finally { // Cleanup try { @@ -219,11 +215,7 @@ public void testSwitchIndex_sameUpdateAndSearchIndex() throws Exception { suggester.createIndexIfNothing(); // Get the current indices - final GetAliasesResponse aliasResponse = client.admin() - .indices() - .prepareGetAliases(suggester.getIndex()) - .execute() - .actionGet(); + final GetAliasesResponse aliasResponse = client.admin().indices().prepareGetAliases(suggester.getIndex()).execute().actionGet(); assertNotNull("Should have search alias", aliasResponse.getAliases()); @@ -231,11 +223,7 @@ public void testSwitchIndex_sameUpdateAndSearchIndex() throws Exception { suggester.switchIndex(); // Verify indices still exist and are functional - final GetAliasesResponse afterResponse = client.admin() - .indices() - .prepareGetAliases(suggester.getIndex()) - .execute() - .actionGet(); + final GetAliasesResponse afterResponse = client.admin().indices().prepareGetAliases(suggester.getIndex()).execute().actionGet(); assertNotNull("Aliases should still exist after switch", afterResponse.getAliases()); @@ -269,11 +257,7 @@ public void testIndexLifecycle_withRefactoredMethods() throws Exception { Thread.sleep(100); // Verify initial state - should have one index - GetAliasesResponse aliasResponse = client.admin() - .indices() - .prepareGetAliases(suggester.getIndex()) - .execute() - .actionGet(); + GetAliasesResponse aliasResponse = client.admin().indices().prepareGetAliases(suggester.getIndex()).execute().actionGet(); assertTrue("Should have at least one index initially", aliasResponse.getAliases().size() >= 1); // Create next index - this is the main method we're testing @@ -284,11 +268,7 @@ public void testIndexLifecycle_withRefactoredMethods() throws Exception { // Verify that createNextIndex completed without exceptions // The update alias should now point to the new index final String updateAlias = suggester.getIndex() + ".update"; - aliasResponse = client.admin() - .indices() - .prepareGetAliases(updateAlias) - .execute() - .actionGet(); + aliasResponse = client.admin().indices().prepareGetAliases(updateAlias).execute().actionGet(); assertNotNull("Update alias should exist after createNextIndex", aliasResponse.getAliases()); // Switch to new index @@ -296,11 +276,7 @@ public void testIndexLifecycle_withRefactoredMethods() throws Exception { Thread.sleep(100); // Verify switch was successful - search alias should still exist - aliasResponse = client.admin() - .indices() - .prepareGetAliases(suggester.getIndex()) - .execute() - .actionGet(); + aliasResponse = client.admin().indices().prepareGetAliases(suggester.getIndex()).execute().actionGet(); assertNotNull("Search alias should exist after switch", aliasResponse.getAliases()); assertTrue("Search alias should point to at least one index", aliasResponse.getAliases().size() >= 1); @@ -327,11 +303,7 @@ public void testResourceLoading_viaIndexCreation() throws Exception { assertTrue("Index should be created successfully", created); // Verify index exists - final GetAliasesResponse aliasResponse = client.admin() - .indices() - .prepareGetAliases(suggester.getIndex()) - .execute() - .actionGet(); + final GetAliasesResponse aliasResponse = client.admin().indices().prepareGetAliases(suggester.getIndex()).execute().actionGet(); assertNotNull("Aliases should exist", aliasResponse.getAliases()); assertEquals("Should have exactly one index", 1, aliasResponse.getAliases().size()); diff --git a/src/test/java/org/codelibs/fess/suggest/SuggesterResourceLoadingTest.java b/src/test/java/org/codelibs/fess/suggest/SuggesterResourceLoadingTest.java index 883e579..8075f23 100644 --- a/src/test/java/org/codelibs/fess/suggest/SuggesterResourceLoadingTest.java +++ b/src/test/java/org/codelibs/fess/suggest/SuggesterResourceLoadingTest.java @@ -43,8 +43,7 @@ public class SuggesterResourceLoadingTest { @Test public void testGetDefaultMappings_loadsCorrectly() throws Exception { // Load resource directly to verify it exists - try (InputStream is = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { + try (InputStream is = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { assertNotNull("Mapping resource should exist", is); final String content = new String(is.readAllBytes(), StandardCharsets.UTF_8); assertTrue("Mapping content should not be empty", content.length() > 0); @@ -58,8 +57,7 @@ public void testGetDefaultMappings_loadsCorrectly() throws Exception { @Test public void testGetDefaultIndexSettings_loadsCorrectly() throws Exception { // Load resource directly to verify it exists - try (InputStream is = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest.json")) { + try (InputStream is = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest.json")) { assertNotNull("Settings resource should exist", is); final String content = new String(is.readAllBytes(), StandardCharsets.UTF_8); assertTrue("Settings content should not be empty", content.length() > 0); @@ -93,8 +91,7 @@ public void testResourceLoading_withMissingResource() throws Exception { // Test the pattern used in getDefaultMappings/getDefaultIndexSettings // with a non-existent resource try { - try (final InputStream is = getClass().getClassLoader() - .getResourceAsStream("non/existent/resource.json")) { + try (final InputStream is = getClass().getClassLoader().getResourceAsStream("non/existent/resource.json")) { if (is == null) { throw new IOException("Resource not found: non/existent/resource.json"); } @@ -116,8 +113,7 @@ public void testResourceLoading_withMissingResource() throws Exception { public void testResourceReading_readAllBytesCorrectness() throws Exception { // Read using the new method (readAllBytes) String contentNew; - try (InputStream is = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { + try (InputStream is = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { assertNotNull("Resource should exist", is); contentNew = new String(is.readAllBytes(), StandardCharsets.UTF_8); } @@ -141,14 +137,12 @@ public void testResourceLoading_simultaneousAccess() throws Exception { String settings; // Load both resources - try (InputStream is1 = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { + try (InputStream is1 = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { assertNotNull("Mappings resource should exist", is1); mappings = new String(is1.readAllBytes(), StandardCharsets.UTF_8); } - try (InputStream is2 = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest.json")) { + try (InputStream is2 = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest.json")) { assertNotNull("Settings resource should exist", is2); settings = new String(is2.readAllBytes(), StandardCharsets.UTF_8); } @@ -165,8 +159,7 @@ public void testResourceLoading_simultaneousAccess() throws Exception { */ @Test public void testResourceLoading_utf8Encoding() throws Exception { - try (InputStream is = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { + try (InputStream is = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { assertNotNull("Resource should exist", is); // Read with UTF-8 encoding @@ -190,8 +183,7 @@ public void testResourceLoading_utf8Encoding() throws Exception { @Test public void testResourceLoading_exceptionHandling() { try { - try (InputStream is = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { + try (InputStream is = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { assertNotNull("Resource should exist", is); // Simulate an exception during processing @@ -216,8 +208,7 @@ public void testResourceLoading_exceptionHandling() { @Test public void testResourceContent_integrity() throws Exception { // Test mappings content - try (InputStream is = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { + try (InputStream is = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest/mappings-default.json")) { assertNotNull("Mappings resource should exist", is); final String mappings = new String(is.readAllBytes(), StandardCharsets.UTF_8); @@ -227,8 +218,7 @@ public void testResourceContent_integrity() throws Exception { } // Test settings content - try (InputStream is = getClass().getClassLoader() - .getResourceAsStream("suggest_indices/suggest.json")) { + try (InputStream is = getClass().getClassLoader().getResourceAsStream("suggest_indices/suggest.json")) { assertNotNull("Settings resource should exist", is); final String settings = new String(is.readAllBytes(), StandardCharsets.UTF_8); diff --git a/src/test/java/org/codelibs/fess/suggest/index/SuggestIndexerTest.java b/src/test/java/org/codelibs/fess/suggest/index/SuggestIndexerTest.java index 3d5db2e..94d5054 100644 --- a/src/test/java/org/codelibs/fess/suggest/index/SuggestIndexerTest.java +++ b/src/test/java/org/codelibs/fess/suggest/index/SuggestIndexerTest.java @@ -50,8 +50,10 @@ public static void beforeClass() throws Exception { runner.onBuild((number, settingsBuilder) -> { settingsBuilder.put("http.cors.enabled", true); settingsBuilder.put("discovery.type", "single-node"); - }).build(newConfigs().clusterName("SuggestIndexerTest").numOfNode(1) - .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); + }) + .build(newConfigs().clusterName("SuggestIndexerTest") + .numOfNode(1) + .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); runner.ensureYellow(); } @@ -73,8 +75,8 @@ public void before() throws Exception { public void test_indexSingleItem() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); SuggestIndexResponse response = suggester.indexer().index(item); @@ -91,8 +93,8 @@ public void test_indexMultipleItems() throws Exception { for (int i = 0; i < 3; i++) { String[][] readings = new String[1][]; readings[0] = new String[] { "test" + i }; - items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); } SuggestIndexResponse response = suggester.indexer().index(items); @@ -107,8 +109,8 @@ public void test_indexMultipleItems() throws Exception { public void test_deleteById() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); suggester.indexer().index(item); suggester.refresh(); @@ -123,8 +125,8 @@ public void test_deleteById() throws Exception { public void test_deleteByQueryString() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); suggester.indexer().index(item); suggester.refresh(); @@ -139,8 +141,8 @@ public void test_deleteByQueryString() throws Exception { public void test_deleteByQueryBuilder() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); suggester.indexer().index(item); suggester.refresh(); @@ -157,8 +159,8 @@ public void test_deleteAll() throws Exception { for (int i = 0; i < 3; i++) { String[][] readings = new String[1][]; readings[0] = new String[] { "test" + i }; - items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); } suggester.indexer().index(items); @@ -181,13 +183,13 @@ public void test_deleteDocumentWords() throws Exception { String[][] readings1 = new String[1][]; readings1[0] = new String[] { "doc" }; - items[0] = new SuggestItem(new String[] { "ドキュメント" }, readings1, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[0] = new SuggestItem(new String[] { "ドキュメント" }, readings1, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); String[][] readings2 = new String[1][]; readings2[0] = new String[] { "query" }; - items[1] = new SuggestItem(new String[] { "クエリ" }, readings2, new String[] { "content" }, 0, 1, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); + items[1] = new SuggestItem(new String[] { "クエリ" }, readings2, new String[] { "content" }, 0, 1, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); suggester.indexer().index(items); suggester.refresh(); @@ -213,13 +215,13 @@ public void test_deleteQueryWords() throws Exception { String[][] readings1 = new String[1][]; readings1[0] = new String[] { "doc" }; - items[0] = new SuggestItem(new String[] { "ドキュメント" }, readings1, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[0] = new SuggestItem(new String[] { "ドキュメント" }, readings1, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); String[][] readings2 = new String[1][]; readings2[0] = new String[] { "query" }; - items[1] = new SuggestItem(new String[] { "クエリ" }, readings2, new String[] { "content" }, 0, 1, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); + items[1] = new SuggestItem(new String[] { "クエリ" }, readings2, new String[] { "content" }, 0, 1, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); suggester.indexer().index(items); suggester.refresh(); @@ -373,8 +375,8 @@ public void test_deleteBadWord() throws Exception { @Test public void test_addElevateWord() throws Exception { - ElevateWord elevateWord = new ElevateWord("test", 2.0f, Collections.singletonList("test"), - Collections.singletonList("content"), null, null); + ElevateWord elevateWord = + new ElevateWord("test", 2.0f, Collections.singletonList("test"), Collections.singletonList("content"), null, null); SuggestIndexResponse response = suggester.indexer().addElevateWord(elevateWord, true); @@ -390,8 +392,8 @@ public void test_addElevateWord() throws Exception { @Test public void test_addElevateWordWithoutApply() throws Exception { - ElevateWord elevateWord = new ElevateWord("test", 2.0f, Collections.singletonList("test"), - Collections.singletonList("content"), null, null); + ElevateWord elevateWord = + new ElevateWord("test", 2.0f, Collections.singletonList("test"), Collections.singletonList("content"), null, null); SuggestIndexResponse response = suggester.indexer().addElevateWord(elevateWord, false); @@ -405,8 +407,8 @@ public void test_addElevateWordWithoutApply() throws Exception { @Test public void test_deleteElevateWord() throws Exception { - ElevateWord elevateWord = new ElevateWord("test", 2.0f, Collections.singletonList("test"), - Collections.singletonList("content"), null, null); + ElevateWord elevateWord = + new ElevateWord("test", 2.0f, Collections.singletonList("test"), Collections.singletonList("content"), null, null); suggester.indexer().addElevateWord(elevateWord, true); suggester.refresh(); @@ -425,10 +427,10 @@ public void test_deleteElevateWord() throws Exception { @Test public void test_restoreElevateWord() throws Exception { - ElevateWord elevateWord1 = new ElevateWord("test1", 2.0f, Collections.singletonList("test1"), - Collections.singletonList("content"), null, null); - ElevateWord elevateWord2 = new ElevateWord("test2", 3.0f, Collections.singletonList("test2"), - Collections.singletonList("content"), null, null); + ElevateWord elevateWord1 = + new ElevateWord("test1", 2.0f, Collections.singletonList("test1"), Collections.singletonList("content"), null, null); + ElevateWord elevateWord2 = + new ElevateWord("test2", 3.0f, Collections.singletonList("test2"), Collections.singletonList("content"), null, null); suggester.settings().elevateWord().add(elevateWord1); suggester.settings().elevateWord().add(elevateWord2); @@ -499,8 +501,8 @@ public void test_indexBadWordItem() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "bad" }; - SuggestItem item = new SuggestItem(new String[] { "bad" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "bad" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); SuggestIndexResponse response = suggester.indexer().index(item); @@ -559,20 +561,20 @@ public void test_deleteDocumentWordsWithMixedKinds() throws Exception { // Document only String[][] readings1 = new String[1][]; readings1[0] = new String[] { "doc1" }; - items[0] = new SuggestItem(new String[] { "ドキュメント1" }, readings1, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[0] = new SuggestItem(new String[] { "ドキュメント1" }, readings1, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); // Query only String[][] readings2 = new String[1][]; readings2[0] = new String[] { "query1" }; - items[1] = new SuggestItem(new String[] { "クエリ1" }, readings2, new String[] { "content" }, 0, 1, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); + items[1] = new SuggestItem(new String[] { "クエリ1" }, readings2, new String[] { "content" }, 0, 1, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); // Both Document and Query (simulated by setting both frequencies) String[][] readings3 = new String[1][]; readings3[0] = new String[] { "both" }; - items[2] = new SuggestItem(new String[] { "両方" }, readings3, new String[] { "content" }, 1L, 1L, -1.0f, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[2] = new SuggestItem(new String[] { "両方" }, readings3, new String[] { "content" }, 1L, 1L, -1.0f, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); items[2].setKinds(new SuggestItem.Kind[] { SuggestItem.Kind.DOCUMENT, SuggestItem.Kind.QUERY }); suggester.indexer().index(items); @@ -600,20 +602,20 @@ public void test_deleteQueryWordsWithMixedKinds() throws Exception { // Document only String[][] readings1 = new String[1][]; readings1[0] = new String[] { "doc1" }; - items[0] = new SuggestItem(new String[] { "ドキュメント1" }, readings1, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[0] = new SuggestItem(new String[] { "ドキュメント1" }, readings1, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); // Query only String[][] readings2 = new String[1][]; readings2[0] = new String[] { "query1" }; - items[1] = new SuggestItem(new String[] { "クエリ1" }, readings2, new String[] { "content" }, 0, 1, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); + items[1] = new SuggestItem(new String[] { "クエリ1" }, readings2, new String[] { "content" }, 0, 1, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); // Both Document and Query String[][] readings3 = new String[1][]; readings3[0] = new String[] { "both" }; - items[2] = new SuggestItem(new String[] { "両方" }, readings3, new String[] { "content" }, 1L, 1L, -1.0f, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[2] = new SuggestItem(new String[] { "両方" }, readings3, new String[] { "content" }, 1L, 1L, -1.0f, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); items[2].setKinds(new SuggestItem.Kind[] { SuggestItem.Kind.DOCUMENT, SuggestItem.Kind.QUERY }); suggester.indexer().index(items); @@ -641,14 +643,14 @@ public void test_deleteDocumentWordsWithUserKind() throws Exception { // Document String[][] readings1 = new String[1][]; readings1[0] = new String[] { "doc1" }; - items[0] = new SuggestItem(new String[] { "ドキュメント1" }, readings1, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[0] = new SuggestItem(new String[] { "ドキュメント1" }, readings1, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); // User String[][] readings2 = new String[1][]; readings2[0] = new String[] { "user1" }; - items[1] = new SuggestItem(new String[] { "ユーザー1" }, readings2, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.USER); + items[1] = new SuggestItem(new String[] { "ユーザー1" }, readings2, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.USER); suggester.indexer().index(items); suggester.refresh(); @@ -673,14 +675,14 @@ public void test_deleteQueryWordsWithUserKind() throws Exception { // Query String[][] readings1 = new String[1][]; readings1[0] = new String[] { "query1" }; - items[0] = new SuggestItem(new String[] { "クエリ1" }, readings1, new String[] { "content" }, 0, 1, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); + items[0] = new SuggestItem(new String[] { "クエリ1" }, readings1, new String[] { "content" }, 0, 1, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.QUERY); // User String[][] readings2 = new String[1][]; readings2[0] = new String[] { "user1" }; - items[1] = new SuggestItem(new String[] { "ユーザー1" }, readings2, new String[] { "content" }, 0, 1, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.USER); + items[1] = new SuggestItem(new String[] { "ユーザー1" }, readings2, new String[] { "content" }, 0, 1, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.USER); suggester.indexer().index(items); suggester.refresh(); diff --git a/src/test/java/org/codelibs/fess/suggest/index/contents/DefaultContentsParserTest.java b/src/test/java/org/codelibs/fess/suggest/index/contents/DefaultContentsParserTest.java index 3f24bba..84bed3f 100644 --- a/src/test/java/org/codelibs/fess/suggest/index/contents/DefaultContentsParserTest.java +++ b/src/test/java/org/codelibs/fess/suggest/index/contents/DefaultContentsParserTest.java @@ -56,8 +56,10 @@ public static void beforeClass() throws Exception { runner.onBuild((number, settingsBuilder) -> { settingsBuilder.put("http.cors.enabled", true); settingsBuilder.put("discovery.type", "single-node"); - }).build(newConfigs().clusterName("DefaultContentsParserTest").numOfNode(1) - .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); + }) + .build(newConfigs().clusterName("DefaultContentsParserTest") + .numOfNode(1) + .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); runner.ensureYellow(); } diff --git a/src/test/java/org/codelibs/fess/suggest/index/writer/SuggestIndexWriterTest.java b/src/test/java/org/codelibs/fess/suggest/index/writer/SuggestIndexWriterTest.java index b865a97..5b3682e 100644 --- a/src/test/java/org/codelibs/fess/suggest/index/writer/SuggestIndexWriterTest.java +++ b/src/test/java/org/codelibs/fess/suggest/index/writer/SuggestIndexWriterTest.java @@ -45,8 +45,10 @@ public static void beforeClass() throws Exception { runner.onBuild((number, settingsBuilder) -> { settingsBuilder.put("http.cors.enabled", true); settingsBuilder.put("discovery.type", "single-node"); - }).build(newConfigs().clusterName("SuggestIndexWriterTest").numOfNode(1) - .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); + }) + .build(newConfigs().clusterName("SuggestIndexWriterTest") + .numOfNode(1) + .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); runner.ensureYellow(); writer = new SuggestIndexWriter(); } @@ -69,19 +71,19 @@ public void before() throws Exception { public void test_writeItems() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); - SuggestWriterResult result = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), - new SuggestItem[] { item }, false); + SuggestWriterResult result = + writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[] { item }, false); assertNotNull(result); assertFalse(result.hasFailure()); runner.refresh(); - GetResponse getResponse = runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()) - .get(TimeValue.timeValueSeconds(30)); + GetResponse getResponse = + runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()).get(TimeValue.timeValueSeconds(30)); assertTrue(getResponse.isExists()); } @@ -89,12 +91,12 @@ public void test_writeItems() throws Exception { public void test_writeItemsWithUpdate() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); // First write - SuggestWriterResult result1 = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), - new SuggestItem[] { item }, false); + SuggestWriterResult result1 = + writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[] { item }, false); assertNotNull(result1); assertFalse(result1.hasFailure()); @@ -104,15 +106,15 @@ public void test_writeItemsWithUpdate() throws Exception { SuggestItem updatedItem = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 2, 0, -1, new String[] { "tag2" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); - SuggestWriterResult result2 = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), - new SuggestItem[] { updatedItem }, true); + SuggestWriterResult result2 = + writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[] { updatedItem }, true); assertNotNull(result2); assertFalse(result2.hasFailure()); runner.refresh(); - GetResponse getResponse = runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()) - .get(TimeValue.timeValueSeconds(30)); + GetResponse getResponse = + runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()).get(TimeValue.timeValueSeconds(30)); assertTrue(getResponse.isExists()); } @@ -122,8 +124,8 @@ public void test_writeMultipleItems() throws Exception { for (int i = 0; i < 3; i++) { String[][] readings = new String[1][]; readings[0] = new String[] { "test" + i }; - items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); } SuggestWriterResult result = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), items, false); @@ -134,16 +136,15 @@ public void test_writeMultipleItems() throws Exception { runner.refresh(); for (SuggestItem item : items) { - GetResponse getResponse = runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()) - .get(TimeValue.timeValueSeconds(30)); + GetResponse getResponse = + runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()).get(TimeValue.timeValueSeconds(30)); assertTrue(getResponse.isExists()); } } @Test public void test_writeEmptyItems() throws Exception { - SuggestWriterResult result = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), - new SuggestItem[0], false); + SuggestWriterResult result = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[0], false); assertNotNull(result); assertFalse(result.hasFailure()); @@ -153,14 +154,14 @@ public void test_writeEmptyItems() throws Exception { public void test_delete() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[] { item }, false); runner.refresh(); - GetResponse getResponse1 = runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()) - .get(TimeValue.timeValueSeconds(30)); + GetResponse getResponse1 = + runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()).get(TimeValue.timeValueSeconds(30)); assertTrue(getResponse1.isExists()); SuggestWriterResult result = writer.delete(runner.client(), suggester.settings(), suggester.getIndex(), item.getId()); @@ -170,15 +171,14 @@ public void test_delete() throws Exception { runner.refresh(); - GetResponse getResponse2 = runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()) - .get(TimeValue.timeValueSeconds(30)); + GetResponse getResponse2 = + runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()).get(TimeValue.timeValueSeconds(30)); assertFalse(getResponse2.isExists()); } @Test public void test_deleteNonExistent() throws Exception { - SuggestWriterResult result = writer.delete(runner.client(), suggester.settings(), suggester.getIndex(), - "non-existent-id"); + SuggestWriterResult result = writer.delete(runner.client(), suggester.settings(), suggester.getIndex(), "non-existent-id"); assertNotNull(result); assertFalse(result.hasFailure()); @@ -190,8 +190,8 @@ public void test_deleteByQuery() throws Exception { for (int i = 0; i < 3; i++) { String[][] readings = new String[1][]; readings[0] = new String[] { "test" + i }; - items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); } writer.write(runner.client(), suggester.settings(), suggester.getIndex(), items, false); @@ -216,8 +216,8 @@ public void test_deleteByQueryMatchAll() throws Exception { for (int i = 0; i < 3; i++) { String[][] readings = new String[1][]; readings[0] = new String[] { "test" + i }; - items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + items[i] = new SuggestItem(new String[] { "テスト" + i }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); } writer.write(runner.client(), suggester.settings(), suggester.getIndex(), items, false); @@ -225,8 +225,8 @@ public void test_deleteByQueryMatchAll() throws Exception { assertEquals(3, suggester.getAllWordsNum()); - SuggestWriterResult result = writer.deleteByQuery(runner.client(), suggester.settings(), suggester.getIndex(), - QueryBuilders.matchAllQuery()); + SuggestWriterResult result = + writer.deleteByQuery(runner.client(), suggester.settings(), suggester.getIndex(), QueryBuilders.matchAllQuery()); assertNotNull(result); assertFalse(result.hasFailure()); @@ -241,11 +241,11 @@ public void test_mergeItems() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item1 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item1 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); - SuggestItem item2 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 2, 0, -1, - new String[] { "tag2" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item2 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 2, 0, -1, new String[] { "tag2" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); SuggestItem[] mergedItems = writer.mergeItems(new SuggestItem[] { item1, item2 }); @@ -284,20 +284,20 @@ public void test_writeItemsUsesSettingsTimeout() throws Exception { // instead of a hardcoded timeout value String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); // The timeout value should come from settings, not hardcoded - SuggestWriterResult result = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), - new SuggestItem[] { item }, true); + SuggestWriterResult result = + writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[] { item }, true); assertNotNull(result); assertFalse(result.hasFailure()); runner.refresh(); - GetResponse getResponse = runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()) - .get(TimeValue.timeValueSeconds(30)); + GetResponse getResponse = + runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()).get(TimeValue.timeValueSeconds(30)); assertTrue(getResponse.isExists()); } @@ -305,8 +305,8 @@ public void test_writeItemsUsesSettingsTimeout() throws Exception { public void test_writeWithUpdateAndExistingItem() throws Exception { String[][] readings = new String[1][]; readings[0] = new String[] { "test" }; - SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); // First write without update writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[] { item }, false); @@ -316,8 +316,8 @@ public void test_writeWithUpdateAndExistingItem() throws Exception { SuggestItem updatedItem = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 3, 0, -1, new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); - SuggestWriterResult result = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), - new SuggestItem[] { updatedItem }, true); + SuggestWriterResult result = + writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[] { updatedItem }, true); assertNotNull(result); assertFalse(result.hasFailure()); @@ -325,8 +325,8 @@ public void test_writeWithUpdateAndExistingItem() throws Exception { runner.refresh(); // Verify the item was updated (should have merged frequencies) - GetResponse getResponse = runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()) - .get(TimeValue.timeValueSeconds(30)); + GetResponse getResponse = + runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()).get(TimeValue.timeValueSeconds(30)); assertTrue(getResponse.isExists()); // The actual frequency value would depend on merge logic } @@ -339,8 +339,8 @@ public void test_writeWithUpdateButNonExistentItem() throws Exception { new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); // Write with update=true but item doesn't exist - SuggestWriterResult result = writer.write(runner.client(), suggester.settings(), suggester.getIndex(), - new SuggestItem[] { item }, true); + SuggestWriterResult result = + writer.write(runner.client(), suggester.settings(), suggester.getIndex(), new SuggestItem[] { item }, true); assertNotNull(result); assertFalse(result.hasFailure()); @@ -348,8 +348,8 @@ public void test_writeWithUpdateButNonExistentItem() throws Exception { runner.refresh(); // Should create the item even though update=true - GetResponse getResponse = runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()) - .get(TimeValue.timeValueSeconds(30)); + GetResponse getResponse = + runner.client().prepareGet().setIndex(suggester.getIndex()).setId(item.getId()).get(TimeValue.timeValueSeconds(30)); assertTrue(getResponse.isExists()); } @@ -359,16 +359,16 @@ public void test_mergeItemsWithMultipleDuplicates() throws Exception { readings[0] = new String[] { "test" }; // Create 5 items with the same ID but different frequencies - SuggestItem item1 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); - SuggestItem item2 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 2, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); - SuggestItem item3 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 3, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); - SuggestItem item4 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 4, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); - SuggestItem item5 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 5, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item1 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item2 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 2, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item3 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 3, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item4 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 4, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); + SuggestItem item5 = new SuggestItem(new String[] { "テスト" }, readings, new String[] { "content" }, 5, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT); SuggestItem[] mergedItems = writer.mergeItems(new SuggestItem[] { item1, item2, item3, item4, item5 }); diff --git a/src/test/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizerTest.java b/src/test/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizerTest.java index 644c9bb..80bdfb7 100644 --- a/src/test/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizerTest.java +++ b/src/test/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizerTest.java @@ -36,8 +36,10 @@ public static void beforeClass() throws Exception { runner.onBuild((number, settingsBuilder) -> { settingsBuilder.put("http.cors.enabled", true); settingsBuilder.put("discovery.type", "single-node"); - }).build(newConfigs().clusterName("AnalyzerNormalizerTest").numOfNode(1) - .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); + }) + .build(newConfigs().clusterName("AnalyzerNormalizerTest") + .numOfNode(1) + .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); runner.ensureYellow(); } diff --git a/src/test/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestBuilderTest.java b/src/test/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestBuilderTest.java index 87a6cba..eed08ac 100644 --- a/src/test/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestBuilderTest.java +++ b/src/test/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestBuilderTest.java @@ -37,8 +37,10 @@ public static void beforeClass() throws Exception { runner.onBuild((number, settingsBuilder) -> { settingsBuilder.put("http.cors.enabled", true); settingsBuilder.put("discovery.type", "single-node"); - }).build(newConfigs().clusterName("PopularWordsRequestBuilderTest").numOfNode(1) - .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); + }) + .build(newConfigs().clusterName("PopularWordsRequestBuilderTest") + .numOfNode(1) + .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); runner.ensureYellow(); } @@ -132,8 +134,15 @@ public void test_setQueryFreqThreshold() throws Exception { public void test_chainedBuilder() throws Exception { indexItems(); - PopularWordsResponse response = suggester.popularWords().setSize(10).addTag("tag1").addRole(SuggestConstants.DEFAULT_ROLE) - .addField("content").setWindowSize(30).setQueryFreqThreshold(5).execute().getResponse(); + PopularWordsResponse response = suggester.popularWords() + .setSize(10) + .addTag("tag1") + .addRole(SuggestConstants.DEFAULT_ROLE) + .addField("content") + .setWindowSize(30) + .setQueryFreqThreshold(5) + .execute() + .getResponse(); assertNotNull(response); } diff --git a/src/test/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestTest.java b/src/test/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestTest.java index 0505ec5..65b428f 100644 --- a/src/test/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestTest.java +++ b/src/test/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestTest.java @@ -39,8 +39,10 @@ public static void beforeClass() throws Exception { runner.onBuild((number, settingsBuilder) -> { settingsBuilder.put("http.cors.enabled", true); settingsBuilder.put("discovery.type", "single-node"); - }).build(newConfigs().clusterName("PopularWordsRequestTest").numOfNode(1) - .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); + }) + .build(newConfigs().clusterName("PopularWordsRequestTest") + .numOfNode(1) + .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); runner.ensureYellow(); } @@ -97,8 +99,7 @@ public void test_addTag() throws Exception { public void test_addRole() throws Exception { indexQueryItems(); - PopularWordsResponse response = suggester.popularWords().setSize(10).addRole(SuggestConstants.DEFAULT_ROLE).execute() - .getResponse(); + PopularWordsResponse response = suggester.popularWords().setSize(10).addRole(SuggestConstants.DEFAULT_ROLE).execute().getResponse(); assertNotNull(response); assertTrue(response.getTotal() > 0); diff --git a/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestBuilderTest.java b/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestBuilderTest.java index 5bf22cc..58cbaf5 100644 --- a/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestBuilderTest.java +++ b/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestBuilderTest.java @@ -38,8 +38,10 @@ public static void beforeClass() throws Exception { runner.onBuild((number, settingsBuilder) -> { settingsBuilder.put("http.cors.enabled", true); settingsBuilder.put("discovery.type", "single-node"); - }).build(newConfigs().clusterName("SuggestRequestBuilderTest").numOfNode(1) - .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); + }) + .build(newConfigs().clusterName("SuggestRequestBuilderTest") + .numOfNode(1) + .pluginTypes("org.codelibs.opensearch.extension.ExtensionPlugin")); runner.ensureYellow(); } @@ -108,8 +110,7 @@ public void test_addTag() throws Exception { public void test_addRole() throws Exception { indexItems(); - SuggestResponse response = suggester.suggest().setQuery("test").addRole(SuggestConstants.DEFAULT_ROLE).execute() - .getResponse(); + SuggestResponse response = suggester.suggest().setQuery("test").addRole(SuggestConstants.DEFAULT_ROLE).execute().getResponse(); assertNotNull(response); assertEquals(1, response.getNum()); @@ -165,8 +166,15 @@ public void test_setSuggestDetail() throws Exception { public void test_chainedBuilder() throws Exception { indexItems(); - SuggestResponse response = suggester.suggest().setQuery("test").setSize(10).addTag("tag1") - .addRole(SuggestConstants.DEFAULT_ROLE).addField("content").setSuggestDetail(true).execute().getResponse(); + SuggestResponse response = suggester.suggest() + .setQuery("test") + .setSize(10) + .addTag("tag1") + .addRole(SuggestConstants.DEFAULT_ROLE) + .addField("content") + .setSuggestDetail(true) + .execute() + .getResponse(); assertNotNull(response); } diff --git a/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestResponseTest.java b/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestResponseTest.java index a98d0a9..cb5af4d 100644 --- a/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestResponseTest.java +++ b/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestResponseTest.java @@ -159,8 +159,8 @@ public void test_largeResponse() throws Exception { words.add("word" + i); String[][] readings = new String[1][]; readings[0] = new String[] { "word" + i }; - items.add(new SuggestItem(new String[] { "word" + i }, readings, new String[] { "content" }, 1, 0, -1, - new String[] { "tag1" }, new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT)); + items.add(new SuggestItem(new String[] { "word" + i }, readings, new String[] { "content" }, 1, 0, -1, new String[] { "tag1" }, + new String[] { SuggestConstants.DEFAULT_ROLE }, null, SuggestItem.Kind.DOCUMENT)); } SuggestResponse response = new SuggestResponse("test-index", 500, words, 1000, items); diff --git a/src/test/java/org/codelibs/fess/suggest/util/SuggestUtilTest.java b/src/test/java/org/codelibs/fess/suggest/util/SuggestUtilTest.java index 227b1e5..3e6fd1b 100644 --- a/src/test/java/org/codelibs/fess/suggest/util/SuggestUtilTest.java +++ b/src/test/java/org/codelibs/fess/suggest/util/SuggestUtilTest.java @@ -580,7 +580,7 @@ public void testGetAsListWithListContainingNulls() { @Test(expected = IllegalArgumentException.class) public void testGetAsListWithArray() { // Test with array (should throw exception) - String[] array = {"one", "two"}; + String[] array = { "one", "two" }; SuggestUtil.getAsList(array); } @@ -600,8 +600,8 @@ public void testGetAsListWithBoolean() { @Test(expected = SuggesterException.class) public void testCreateBulkLineWithNullId() { // Test that null ID causes exception - SuggestItem item = new SuggestItem(new String[] { "text" }, new String[0][0], new String[0], 0, 0, 1.0f, - new String[0], new String[0], new String[0], SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "text" }, new String[0][0], new String[0], 0, 0, 1.0f, new String[0], + new String[0], new String[0], SuggestItem.Kind.DOCUMENT); // Explicitly set ID to null (constructor auto-generates ID) item.setId(null); item.setTimestamp(ZonedDateTime.now()); @@ -612,8 +612,8 @@ public void testCreateBulkLineWithNullId() { public void testCreateBulkLineWithNullText() { // Test that null text causes exception // Create item with valid text first, then set to null - SuggestItem item = new SuggestItem(new String[] { "text" }, new String[0][0], new String[0], 0, 0, 1.0f, - new String[0], new String[0], new String[0], SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "text" }, new String[0][0], new String[0], 0, 0, 1.0f, new String[0], + new String[0], new String[0], SuggestItem.Kind.DOCUMENT); // Set text to null after construction item.setText(null); item.setTimestamp(ZonedDateTime.now()); @@ -624,9 +624,8 @@ public void testCreateBulkLineWithNullText() { public void testCreateBulkLineWithMultipleReadings() { // Test with multiple reading levels SuggestItem item = new SuggestItem(new String[] { "test" }, - new String[][] { { "reading1a", "reading1b" }, { "reading2a", "reading2b" }, { "reading3" } }, - new String[] { "field1" }, 5, 3, 1.5f, new String[] { "tag1" }, new String[] { "role1" }, - new String[0], SuggestItem.Kind.QUERY); + new String[][] { { "reading1a", "reading1b" }, { "reading2a", "reading2b" }, { "reading3" } }, new String[] { "field1" }, 5, + 3, 1.5f, new String[] { "tag1" }, new String[] { "role1" }, new String[0], SuggestItem.Kind.QUERY); item.setTimestamp(ZonedDateTime.now()); String bulkLine = SuggestUtil.createBulkLine("test_index", "_doc", item); @@ -639,8 +638,8 @@ public void testCreateBulkLineWithMultipleReadings() { @Test public void testCreateBulkLineWithEmptyArrays() { // Test with empty arrays for optional fields - SuggestItem item = new SuggestItem(new String[] { "text" }, new String[0][0], new String[0], 0, 0, 1.0f, - new String[0], new String[0], new String[0], SuggestItem.Kind.DOCUMENT); + SuggestItem item = new SuggestItem(new String[] { "text" }, new String[0][0], new String[0], 0, 0, 1.0f, new String[0], + new String[0], new String[0], SuggestItem.Kind.DOCUMENT); item.setTimestamp(ZonedDateTime.now()); String bulkLine = SuggestUtil.createBulkLine("test_index", "_doc", item);