From b456903b8304a1e08998bac866553cabf1b46718 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Sat, 23 Dec 2023 13:40:44 +0900 Subject: [PATCH 1/7] fess-parent 15.0.0-SNAPSHOT --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9a82efa..72c9c17 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>fess-suggest</artifactId> - <version>14.12.0-SNAPSHOT</version> + <version>15.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>fess-suggest</name> <scm> @@ -13,7 +13,7 @@ <parent> <groupId>org.codelibs.fess</groupId> <artifactId>fess-parent</artifactId> - <version>14.12.0-SNAPSHOT</version> + <version>15.0.0-SNAPSHOT</version> <relativePath /> </parent> <build> From 426c8804d78609f3fabce9fb0e284ebd591856c3 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Sat, 23 Dec 2023 19:29:00 +0900 Subject: [PATCH 2/7] bump up to java 21 --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/maven.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6270953..f8f62de 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -70,10 +70,10 @@ jobs: # make bootstrap # make release - uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Cache Maven packages uses: actions/cache@v2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b00ac8e..9572cf2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,10 +20,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - uses: actions/cache@v1 with: From 479f7c6895ce68f855107f3086dab64be537cdd4 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Mon, 1 Jan 2024 12:29:25 +0900 Subject: [PATCH 3/7] add jacoco --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 72c9c17..e7d7654 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,10 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + </plugin> </plugins> </build> <repositories> From 698955d57c23a7189ea14804da52581e18c6f672 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Thu, 22 Feb 2024 10:27:10 +0900 Subject: [PATCH 4/7] sync up with fess-parent --- pom.xml | 6 ------ .../kuromoji/index/analysis/KuromojiTokenizerFactory.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e7d7654..ba47ba6 100644 --- a/pom.xml +++ b/pom.xml @@ -101,12 +101,6 @@ <version>${opensearch.runner.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.elasticsearch</groupId> - <artifactId>jna</artifactId> - <version>${jna.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiTokenizerFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiTokenizerFactory.java index c12d11e..e2e04b9 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiTokenizerFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiTokenizerFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.ja.JapaneseTokenizer; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; import org.apache.lucene.analysis.ja.dict.UserDictionary; -import org.apache.lucene.analysis.ja.util.CSVUtil; +import org.apache.lucene.analysis.util.CSVUtil; import org.opensearch.OpenSearchException; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; From 2ad3d1a65605483260c660d739430bfd39c7e9dd Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Thu, 22 Feb 2024 10:46:32 +0900 Subject: [PATCH 5/7] Update copyright headers to 2024 --- src/main/java/org/codelibs/fess/suggest/Suggester.java | 2 +- src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java | 2 +- .../org/codelibs/fess/suggest/analysis/SuggestAnalyzer.java | 2 +- .../java/org/codelibs/fess/suggest/concurrent/Deferred.java | 2 +- .../java/org/codelibs/fess/suggest/constants/FieldNames.java | 2 +- .../org/codelibs/fess/suggest/constants/SuggestConstants.java | 2 +- .../org/codelibs/fess/suggest/converter/AnalyzerConverter.java | 2 +- .../org/codelibs/fess/suggest/converter/KatakanaConverter.java | 2 +- .../fess/suggest/converter/KatakanaToAlphabetConverter.java | 2 +- .../org/codelibs/fess/suggest/converter/ReadingConverter.java | 2 +- .../codelibs/fess/suggest/converter/ReadingConverterChain.java | 2 +- src/main/java/org/codelibs/fess/suggest/entity/ElevateWord.java | 2 +- src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java | 2 +- .../codelibs/fess/suggest/exception/SuggestIndexException.java | 2 +- .../fess/suggest/exception/SuggestSettingsException.java | 2 +- .../org/codelibs/fess/suggest/exception/SuggesterException.java | 2 +- .../org/codelibs/fess/suggest/index/SuggestDeleteResponse.java | 2 +- .../org/codelibs/fess/suggest/index/SuggestIndexResponse.java | 2 +- .../java/org/codelibs/fess/suggest/index/SuggestIndexer.java | 2 +- .../codelibs/fess/suggest/index/contents/ContentsParser.java | 2 +- .../fess/suggest/index/contents/DefaultContentsParser.java | 2 +- .../fess/suggest/index/contents/document/DocumentReader.java | 2 +- .../fess/suggest/index/contents/document/ESSourceReader.java | 2 +- .../codelibs/fess/suggest/index/contents/querylog/QueryLog.java | 2 +- .../fess/suggest/index/contents/querylog/QueryLogReader.java | 2 +- .../fess/suggest/index/writer/SuggestBulkFileWriter.java | 2 +- .../codelibs/fess/suggest/index/writer/SuggestIndexWriter.java | 2 +- .../org/codelibs/fess/suggest/index/writer/SuggestWriter.java | 2 +- .../codelibs/fess/suggest/index/writer/SuggestWriterResult.java | 2 +- .../codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java | 2 +- .../normalizer/FullWidthToHalfWidthAlphabetNormalizer.java | 2 +- .../fess/suggest/normalizer/HankakuKanaToZenkakuKana.java | 2 +- .../org/codelibs/fess/suggest/normalizer/ICUNormalizer.java | 2 +- .../java/org/codelibs/fess/suggest/normalizer/Normalizer.java | 2 +- .../org/codelibs/fess/suggest/normalizer/NormalizerChain.java | 2 +- src/main/java/org/codelibs/fess/suggest/request/Request.java | 2 +- .../java/org/codelibs/fess/suggest/request/RequestBuilder.java | 2 +- src/main/java/org/codelibs/fess/suggest/request/Response.java | 2 +- .../fess/suggest/request/popularwords/PopularWordsRequest.java | 2 +- .../request/popularwords/PopularWordsRequestBuilder.java | 2 +- .../fess/suggest/request/popularwords/PopularWordsResponse.java | 2 +- .../codelibs/fess/suggest/request/suggest/SuggestRequest.java | 2 +- .../fess/suggest/request/suggest/SuggestRequestBuilder.java | 2 +- .../codelibs/fess/suggest/request/suggest/SuggestResponse.java | 2 +- .../org/codelibs/fess/suggest/settings/AnalyzerSettings.java | 2 +- .../java/org/codelibs/fess/suggest/settings/ArraySettings.java | 2 +- .../org/codelibs/fess/suggest/settings/BadWordSettings.java | 2 +- .../org/codelibs/fess/suggest/settings/ElevateWordSettings.java | 2 +- .../org/codelibs/fess/suggest/settings/SuggestSettings.java | 2 +- .../codelibs/fess/suggest/settings/SuggestSettingsBuilder.java | 2 +- src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java | 2 +- .../java/org/codelibs/fess/suggest/SuggesterBuilderTest.java | 2 +- src/test/java/org/codelibs/fess/suggest/SuggesterTest.java | 2 +- .../java/org/codelibs/fess/suggest/concurrent/DeferredTest.java | 2 +- .../codelibs/fess/suggest/converter/KatakanaConverterTest.java | 2 +- .../fess/suggest/converter/KatakanaToAlphabetConverterTest.java | 2 +- .../fess/suggest/converter/ReadingConverterChainTest.java | 2 +- .../fess/suggest/index/contents/DefaultContentsParserTest.java | 2 +- .../suggest/index/contents/document/ESSourceReaderTest.java | 2 +- .../codelibs/fess/suggest/normalizer/DefaultNormalizerTest.java | 2 +- .../org/codelibs/fess/suggest/normalizer/ICUNormalizerTest.java | 2 +- .../fess/suggest/request/suggest/SuggestRequestTest.java | 2 +- .../codelibs/fess/suggest/settings/AnalyzerSettingsTest.java | 2 +- .../org/codelibs/fess/suggest/settings/ArraySettingsTest.java | 2 +- .../org/codelibs/fess/suggest/settings/BadWordSettingsTest.java | 2 +- .../codelibs/fess/suggest/settings/ElevateWordSettingsTest.java | 2 +- .../org/codelibs/fess/suggest/settings/SuggestSettingsTest.java | 2 +- .../java/org/codelibs/opensearch/extension/ExtensionPlugin.java | 2 +- .../extension/analysis/AlphaNumWordFilterFactory.java | 2 +- .../opensearch/extension/analysis/CharTypeFilterFactory.java | 2 +- .../extension/analysis/DisableGraphFilterFactory.java | 2 +- .../extension/analysis/FlexiblePorterStemFilterFactory.java | 2 +- .../extension/analysis/IterationMarkCharFilterFactory.java | 2 +- .../opensearch/extension/analysis/KanjiNumberFilterFactory.java | 2 +- .../opensearch/extension/analysis/NGramSynonymTokenizer.java | 2 +- .../extension/analysis/NGramSynonymTokenizerFactory.java | 2 +- .../extension/analysis/NumberConcatenationFilterFactory.java | 2 +- .../extension/analysis/PatternConcatenationFilterFactory.java | 2 +- .../extension/analysis/PosConcatenationFilterFactory.java | 2 +- .../extension/analysis/ProlongedSoundMarkCharFilterFactory.java | 2 +- .../analysis/ReloadableKeywordMarkerFilterFactory.java | 2 +- .../extension/analysis/ReloadableKuromojiTokenizerFactory.java | 2 +- .../extension/analysis/ReloadableStopFilterFactory.java | 2 +- .../extension/analysis/StopTokenPrefixFilterFactory.java | 2 +- .../extension/analysis/StopTokenSuffixFilterFactory.java | 2 +- .../codelibs/opensearch/extension/analysis/SynonymLoader.java | 2 +- .../kuromoji/index/analysis/JapaneseStopTokenFilterFactory.java | 2 +- .../kuromoji/index/analysis/KuromojiBaseFormFilterFactory.java | 2 +- .../index/analysis/KuromojiIterationMarkCharFilterFactory.java | 2 +- .../kuromoji/index/analysis/KuromojiKatakanaStemmerFactory.java | 2 +- .../kuromoji/index/analysis/KuromojiNumberFilterFactory.java | 2 +- .../index/analysis/KuromojiPartOfSpeechFilterFactory.java | 2 +- .../index/analysis/KuromojiReadingFormFilterFactory.java | 2 +- .../kuromoji/index/analysis/KuromojiTokenizerFactory.java | 2 +- 94 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/main/java/org/codelibs/fess/suggest/Suggester.java b/src/main/java/org/codelibs/fess/suggest/Suggester.java index c87ae8d..f7b9b3e 100644 --- a/src/main/java/org/codelibs/fess/suggest/Suggester.java +++ b/src/main/java/org/codelibs/fess/suggest/Suggester.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java b/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java index 98e5a0c..8ff91cf 100644 --- a/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java +++ b/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/analysis/SuggestAnalyzer.java b/src/main/java/org/codelibs/fess/suggest/analysis/SuggestAnalyzer.java index 6f056e6..a4b204a 100644 --- a/src/main/java/org/codelibs/fess/suggest/analysis/SuggestAnalyzer.java +++ b/src/main/java/org/codelibs/fess/suggest/analysis/SuggestAnalyzer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/concurrent/Deferred.java b/src/main/java/org/codelibs/fess/suggest/concurrent/Deferred.java index 5d98acd..f080904 100644 --- a/src/main/java/org/codelibs/fess/suggest/concurrent/Deferred.java +++ b/src/main/java/org/codelibs/fess/suggest/concurrent/Deferred.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/constants/FieldNames.java b/src/main/java/org/codelibs/fess/suggest/constants/FieldNames.java index 023c99e..2f2a563 100644 --- a/src/main/java/org/codelibs/fess/suggest/constants/FieldNames.java +++ b/src/main/java/org/codelibs/fess/suggest/constants/FieldNames.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/constants/SuggestConstants.java b/src/main/java/org/codelibs/fess/suggest/constants/SuggestConstants.java index bc40b73..e8910ff 100644 --- a/src/main/java/org/codelibs/fess/suggest/constants/SuggestConstants.java +++ b/src/main/java/org/codelibs/fess/suggest/constants/SuggestConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/converter/AnalyzerConverter.java b/src/main/java/org/codelibs/fess/suggest/converter/AnalyzerConverter.java index 7be8ab2..bc9aa72 100644 --- a/src/main/java/org/codelibs/fess/suggest/converter/AnalyzerConverter.java +++ b/src/main/java/org/codelibs/fess/suggest/converter/AnalyzerConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/converter/KatakanaConverter.java b/src/main/java/org/codelibs/fess/suggest/converter/KatakanaConverter.java index 21575b6..815053a 100644 --- a/src/main/java/org/codelibs/fess/suggest/converter/KatakanaConverter.java +++ b/src/main/java/org/codelibs/fess/suggest/converter/KatakanaConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/converter/KatakanaToAlphabetConverter.java b/src/main/java/org/codelibs/fess/suggest/converter/KatakanaToAlphabetConverter.java index 8d006bd..1a79e34 100644 --- a/src/main/java/org/codelibs/fess/suggest/converter/KatakanaToAlphabetConverter.java +++ b/src/main/java/org/codelibs/fess/suggest/converter/KatakanaToAlphabetConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/converter/ReadingConverter.java b/src/main/java/org/codelibs/fess/suggest/converter/ReadingConverter.java index ebc753b..ad3dbe2 100644 --- a/src/main/java/org/codelibs/fess/suggest/converter/ReadingConverter.java +++ b/src/main/java/org/codelibs/fess/suggest/converter/ReadingConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/converter/ReadingConverterChain.java b/src/main/java/org/codelibs/fess/suggest/converter/ReadingConverterChain.java index aadace9..49dc1e6 100644 --- a/src/main/java/org/codelibs/fess/suggest/converter/ReadingConverterChain.java +++ b/src/main/java/org/codelibs/fess/suggest/converter/ReadingConverterChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/entity/ElevateWord.java b/src/main/java/org/codelibs/fess/suggest/entity/ElevateWord.java index f7cb958..f3b5232 100644 --- a/src/main/java/org/codelibs/fess/suggest/entity/ElevateWord.java +++ b/src/main/java/org/codelibs/fess/suggest/entity/ElevateWord.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java b/src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java index 4051ed0..fde8468 100644 --- a/src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java +++ b/src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/exception/SuggestIndexException.java b/src/main/java/org/codelibs/fess/suggest/exception/SuggestIndexException.java index b860988..6942011 100644 --- a/src/main/java/org/codelibs/fess/suggest/exception/SuggestIndexException.java +++ b/src/main/java/org/codelibs/fess/suggest/exception/SuggestIndexException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/exception/SuggestSettingsException.java b/src/main/java/org/codelibs/fess/suggest/exception/SuggestSettingsException.java index 2e25f43..9a0d797 100644 --- a/src/main/java/org/codelibs/fess/suggest/exception/SuggestSettingsException.java +++ b/src/main/java/org/codelibs/fess/suggest/exception/SuggestSettingsException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/exception/SuggesterException.java b/src/main/java/org/codelibs/fess/suggest/exception/SuggesterException.java index bb62a3b..4980c92 100644 --- a/src/main/java/org/codelibs/fess/suggest/exception/SuggesterException.java +++ b/src/main/java/org/codelibs/fess/suggest/exception/SuggesterException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/SuggestDeleteResponse.java b/src/main/java/org/codelibs/fess/suggest/index/SuggestDeleteResponse.java index 94017ac..99bae34 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/SuggestDeleteResponse.java +++ b/src/main/java/org/codelibs/fess/suggest/index/SuggestDeleteResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexResponse.java b/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexResponse.java index cc052ca..5e0c287 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexResponse.java +++ b/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 fc99950..72d971e 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexer.java +++ b/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/contents/ContentsParser.java b/src/main/java/org/codelibs/fess/suggest/index/contents/ContentsParser.java index 53cef02..2ed90a9 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/contents/ContentsParser.java +++ b/src/main/java/org/codelibs/fess/suggest/index/contents/ContentsParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 83dcde3..3cdc63c 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/contents/document/DocumentReader.java b/src/main/java/org/codelibs/fess/suggest/index/contents/document/DocumentReader.java index 7c0be6e..d8c5533 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/contents/document/DocumentReader.java +++ b/src/main/java/org/codelibs/fess/suggest/index/contents/document/DocumentReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 2d95965..c6b2c77 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLog.java b/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLog.java index 8651d2f..285fc4d 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLog.java +++ b/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLogReader.java b/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLogReader.java index 961989b..5d21021 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLogReader.java +++ b/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLogReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestBulkFileWriter.java b/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestBulkFileWriter.java index d864975..61276f3 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestBulkFileWriter.java +++ b/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestBulkFileWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestIndexWriter.java b/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestIndexWriter.java index 649935f..3fcb326 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestIndexWriter.java +++ b/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestIndexWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestWriter.java b/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestWriter.java index 2b88880..b7d7871 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestWriter.java +++ b/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestWriterResult.java b/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestWriterResult.java index 48164a7..5136bec 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestWriterResult.java +++ b/src/main/java/org/codelibs/fess/suggest/index/writer/SuggestWriterResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java b/src/main/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java index bd320d7..1a93672 100644 --- a/src/main/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java +++ b/src/main/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/normalizer/FullWidthToHalfWidthAlphabetNormalizer.java b/src/main/java/org/codelibs/fess/suggest/normalizer/FullWidthToHalfWidthAlphabetNormalizer.java index 09615b2..299b8c5 100644 --- a/src/main/java/org/codelibs/fess/suggest/normalizer/FullWidthToHalfWidthAlphabetNormalizer.java +++ b/src/main/java/org/codelibs/fess/suggest/normalizer/FullWidthToHalfWidthAlphabetNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/normalizer/HankakuKanaToZenkakuKana.java b/src/main/java/org/codelibs/fess/suggest/normalizer/HankakuKanaToZenkakuKana.java index 814be0e..a63c1dd 100644 --- a/src/main/java/org/codelibs/fess/suggest/normalizer/HankakuKanaToZenkakuKana.java +++ b/src/main/java/org/codelibs/fess/suggest/normalizer/HankakuKanaToZenkakuKana.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/normalizer/ICUNormalizer.java b/src/main/java/org/codelibs/fess/suggest/normalizer/ICUNormalizer.java index 372ab57..6bd49fd 100644 --- a/src/main/java/org/codelibs/fess/suggest/normalizer/ICUNormalizer.java +++ b/src/main/java/org/codelibs/fess/suggest/normalizer/ICUNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/normalizer/Normalizer.java b/src/main/java/org/codelibs/fess/suggest/normalizer/Normalizer.java index 2a0408a..d9310af 100644 --- a/src/main/java/org/codelibs/fess/suggest/normalizer/Normalizer.java +++ b/src/main/java/org/codelibs/fess/suggest/normalizer/Normalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/normalizer/NormalizerChain.java b/src/main/java/org/codelibs/fess/suggest/normalizer/NormalizerChain.java index 3d0df12..98cf04f 100644 --- a/src/main/java/org/codelibs/fess/suggest/normalizer/NormalizerChain.java +++ b/src/main/java/org/codelibs/fess/suggest/normalizer/NormalizerChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/Request.java b/src/main/java/org/codelibs/fess/suggest/request/Request.java index 5016e93..57745c4 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/Request.java +++ b/src/main/java/org/codelibs/fess/suggest/request/Request.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/RequestBuilder.java b/src/main/java/org/codelibs/fess/suggest/request/RequestBuilder.java index 278d8e7..bba8eac 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/RequestBuilder.java +++ b/src/main/java/org/codelibs/fess/suggest/request/RequestBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/Response.java b/src/main/java/org/codelibs/fess/suggest/request/Response.java index c4fa39e..726736c 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/Response.java +++ b/src/main/java/org/codelibs/fess/suggest/request/Response.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequest.java b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequest.java index dc02d5e..2f7e56d 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequest.java +++ b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestBuilder.java b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestBuilder.java index 630df4c..53e62b2 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestBuilder.java +++ b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequestBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsResponse.java b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsResponse.java index e700e12..d76e4ac 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsResponse.java +++ b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequest.java b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequest.java index 5a796e7..48faf14 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequest.java +++ b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestBuilder.java b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestBuilder.java index 6b10fb1..946e608 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestBuilder.java +++ b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestResponse.java b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestResponse.java index 262f821..9d87d2a 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestResponse.java +++ b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/settings/AnalyzerSettings.java b/src/main/java/org/codelibs/fess/suggest/settings/AnalyzerSettings.java index 63a10dc..7b77849 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/AnalyzerSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/AnalyzerSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 4fe41d8..644a21b 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/ArraySettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/ArraySettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/settings/BadWordSettings.java b/src/main/java/org/codelibs/fess/suggest/settings/BadWordSettings.java index 9ded89c..74ad2af 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/BadWordSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/BadWordSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 e776cca..f719ab0 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/ElevateWordSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/ElevateWordSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 308321e..58e0540 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettingsBuilder.java b/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettingsBuilder.java index f88f303..029bda7 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettingsBuilder.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettingsBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java b/src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java index 95abaea..bcb1347 100644 --- a/src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java +++ b/src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/SuggesterBuilderTest.java b/src/test/java/org/codelibs/fess/suggest/SuggesterBuilderTest.java index 2aba4cc..9600197 100644 --- a/src/test/java/org/codelibs/fess/suggest/SuggesterBuilderTest.java +++ b/src/test/java/org/codelibs/fess/suggest/SuggesterBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/SuggesterTest.java b/src/test/java/org/codelibs/fess/suggest/SuggesterTest.java index 68f7c7b..010e1c3 100644 --- a/src/test/java/org/codelibs/fess/suggest/SuggesterTest.java +++ b/src/test/java/org/codelibs/fess/suggest/SuggesterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/concurrent/DeferredTest.java b/src/test/java/org/codelibs/fess/suggest/concurrent/DeferredTest.java index ef99383..740c5b8 100644 --- a/src/test/java/org/codelibs/fess/suggest/concurrent/DeferredTest.java +++ b/src/test/java/org/codelibs/fess/suggest/concurrent/DeferredTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/converter/KatakanaConverterTest.java b/src/test/java/org/codelibs/fess/suggest/converter/KatakanaConverterTest.java index b887feb..3c3100f 100644 --- a/src/test/java/org/codelibs/fess/suggest/converter/KatakanaConverterTest.java +++ b/src/test/java/org/codelibs/fess/suggest/converter/KatakanaConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/converter/KatakanaToAlphabetConverterTest.java b/src/test/java/org/codelibs/fess/suggest/converter/KatakanaToAlphabetConverterTest.java index c2a36d7..c20d87a 100644 --- a/src/test/java/org/codelibs/fess/suggest/converter/KatakanaToAlphabetConverterTest.java +++ b/src/test/java/org/codelibs/fess/suggest/converter/KatakanaToAlphabetConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/converter/ReadingConverterChainTest.java b/src/test/java/org/codelibs/fess/suggest/converter/ReadingConverterChainTest.java index 27e24da..cab0ef3 100644 --- a/src/test/java/org/codelibs/fess/suggest/converter/ReadingConverterChainTest.java +++ b/src/test/java/org/codelibs/fess/suggest/converter/ReadingConverterChainTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 58c47c6..d90b7a7 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/index/contents/document/ESSourceReaderTest.java b/src/test/java/org/codelibs/fess/suggest/index/contents/document/ESSourceReaderTest.java index 7ebc4c2..05b4930 100644 --- a/src/test/java/org/codelibs/fess/suggest/index/contents/document/ESSourceReaderTest.java +++ b/src/test/java/org/codelibs/fess/suggest/index/contents/document/ESSourceReaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/normalizer/DefaultNormalizerTest.java b/src/test/java/org/codelibs/fess/suggest/normalizer/DefaultNormalizerTest.java index 79cf183..abd454c 100644 --- a/src/test/java/org/codelibs/fess/suggest/normalizer/DefaultNormalizerTest.java +++ b/src/test/java/org/codelibs/fess/suggest/normalizer/DefaultNormalizerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/normalizer/ICUNormalizerTest.java b/src/test/java/org/codelibs/fess/suggest/normalizer/ICUNormalizerTest.java index 08baeca..56aec7b 100644 --- a/src/test/java/org/codelibs/fess/suggest/normalizer/ICUNormalizerTest.java +++ b/src/test/java/org/codelibs/fess/suggest/normalizer/ICUNormalizerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestTest.java b/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestTest.java index ff0b78c..3ea43c5 100644 --- a/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestTest.java +++ b/src/test/java/org/codelibs/fess/suggest/request/suggest/SuggestRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/settings/AnalyzerSettingsTest.java b/src/test/java/org/codelibs/fess/suggest/settings/AnalyzerSettingsTest.java index df172c8..05d25b0 100644 --- a/src/test/java/org/codelibs/fess/suggest/settings/AnalyzerSettingsTest.java +++ b/src/test/java/org/codelibs/fess/suggest/settings/AnalyzerSettingsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/settings/ArraySettingsTest.java b/src/test/java/org/codelibs/fess/suggest/settings/ArraySettingsTest.java index 2c6cda4..f6ba5ef 100644 --- a/src/test/java/org/codelibs/fess/suggest/settings/ArraySettingsTest.java +++ b/src/test/java/org/codelibs/fess/suggest/settings/ArraySettingsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/settings/BadWordSettingsTest.java b/src/test/java/org/codelibs/fess/suggest/settings/BadWordSettingsTest.java index d154336..4c78cfd 100644 --- a/src/test/java/org/codelibs/fess/suggest/settings/BadWordSettingsTest.java +++ b/src/test/java/org/codelibs/fess/suggest/settings/BadWordSettingsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/settings/ElevateWordSettingsTest.java b/src/test/java/org/codelibs/fess/suggest/settings/ElevateWordSettingsTest.java index 13455ae..291c246 100644 --- a/src/test/java/org/codelibs/fess/suggest/settings/ElevateWordSettingsTest.java +++ b/src/test/java/org/codelibs/fess/suggest/settings/ElevateWordSettingsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/suggest/settings/SuggestSettingsTest.java b/src/test/java/org/codelibs/fess/suggest/settings/SuggestSettingsTest.java index db3e385..4ac90aa 100644 --- a/src/test/java/org/codelibs/fess/suggest/settings/SuggestSettingsTest.java +++ b/src/test/java/org/codelibs/fess/suggest/settings/SuggestSettingsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/ExtensionPlugin.java b/src/test/java/org/codelibs/opensearch/extension/ExtensionPlugin.java index 5a05e12..51fdc27 100644 --- a/src/test/java/org/codelibs/opensearch/extension/ExtensionPlugin.java +++ b/src/test/java/org/codelibs/opensearch/extension/ExtensionPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/AlphaNumWordFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/AlphaNumWordFilterFactory.java index 877d481..f962a4b 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/AlphaNumWordFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/AlphaNumWordFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/CharTypeFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/CharTypeFilterFactory.java index 1f22572..56e2aba 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/CharTypeFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/CharTypeFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/DisableGraphFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/DisableGraphFilterFactory.java index 6dba0f2..441ade3 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/DisableGraphFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/DisableGraphFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/FlexiblePorterStemFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/FlexiblePorterStemFilterFactory.java index 86f9879..273a6c4 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/FlexiblePorterStemFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/FlexiblePorterStemFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/IterationMarkCharFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/IterationMarkCharFilterFactory.java index 160b9cb..83c4e41 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/IterationMarkCharFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/IterationMarkCharFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/KanjiNumberFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/KanjiNumberFilterFactory.java index 89f6879..606131c 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/KanjiNumberFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/KanjiNumberFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/NGramSynonymTokenizer.java b/src/test/java/org/codelibs/opensearch/extension/analysis/NGramSynonymTokenizer.java index b95f2fc..15e29fa 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/NGramSynonymTokenizer.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/NGramSynonymTokenizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/NGramSynonymTokenizerFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/NGramSynonymTokenizerFactory.java index 0782088..556abde 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/NGramSynonymTokenizerFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/NGramSynonymTokenizerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/NumberConcatenationFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/NumberConcatenationFilterFactory.java index bd733bb..3cba909 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/NumberConcatenationFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/NumberConcatenationFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/PatternConcatenationFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/PatternConcatenationFilterFactory.java index fd5b9d6..b855bdf 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/PatternConcatenationFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/PatternConcatenationFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/PosConcatenationFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/PosConcatenationFilterFactory.java index d136b27..2ac0c69 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/PosConcatenationFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/PosConcatenationFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/ProlongedSoundMarkCharFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/ProlongedSoundMarkCharFilterFactory.java index 72ce21c..1e9d0a9 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/ProlongedSoundMarkCharFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/ProlongedSoundMarkCharFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableKeywordMarkerFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableKeywordMarkerFilterFactory.java index de22f5d..b9aa069 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableKeywordMarkerFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableKeywordMarkerFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableKuromojiTokenizerFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableKuromojiTokenizerFactory.java index 65a58d9..b91cf28 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableKuromojiTokenizerFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableKuromojiTokenizerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableStopFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableStopFilterFactory.java index e467137..d22c499 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableStopFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/ReloadableStopFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/StopTokenPrefixFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/StopTokenPrefixFilterFactory.java index 2c0ec37..a979669 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/StopTokenPrefixFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/StopTokenPrefixFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/StopTokenSuffixFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/analysis/StopTokenSuffixFilterFactory.java index 9c75f78..9efc1e4 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/StopTokenSuffixFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/StopTokenSuffixFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/analysis/SynonymLoader.java b/src/test/java/org/codelibs/opensearch/extension/analysis/SynonymLoader.java index 469702c..5be8366 100644 --- a/src/test/java/org/codelibs/opensearch/extension/analysis/SynonymLoader.java +++ b/src/test/java/org/codelibs/opensearch/extension/analysis/SynonymLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/JapaneseStopTokenFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/JapaneseStopTokenFilterFactory.java index 75eb910..f8567c2 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/JapaneseStopTokenFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/JapaneseStopTokenFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiBaseFormFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiBaseFormFilterFactory.java index 832d78a..9e37e03 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiBaseFormFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiBaseFormFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiIterationMarkCharFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiIterationMarkCharFilterFactory.java index e24412f..758f9b3 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiIterationMarkCharFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiIterationMarkCharFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiKatakanaStemmerFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiKatakanaStemmerFactory.java index 8381f3c..d039d49 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiKatakanaStemmerFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiKatakanaStemmerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiNumberFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiNumberFilterFactory.java index c565a20..c2d37f8 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiNumberFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiNumberFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiPartOfSpeechFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiPartOfSpeechFilterFactory.java index dbdf2fb..9131e8b 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiPartOfSpeechFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiPartOfSpeechFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiReadingFormFilterFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiReadingFormFilterFactory.java index 5e89070..76b4f20 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiReadingFormFilterFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiReadingFormFilterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiTokenizerFactory.java b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiTokenizerFactory.java index e2e04b9..059ed75 100644 --- a/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiTokenizerFactory.java +++ b/src/test/java/org/codelibs/opensearch/extension/kuromoji/index/analysis/KuromojiTokenizerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 9513c91a49bfd411eba4edbdc44918008b888653 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Thu, 29 Aug 2024 18:08:51 +0900 Subject: [PATCH 6/7] add log4j2.disable.jmx --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index ba47ba6..2fc2c8f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,14 @@ <groupId>net.revelc.code.formatter</groupId> <artifactId>formatter-maven-plugin</artifactId> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <log4j2.disable.jmx>true</log4j2.disable.jmx> + </systemPropertyVariables> + </configuration> + </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> </plugin> From 55bae430d0ea2daf989f8a89705b339222454658 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Sat, 12 Oct 2024 09:10:39 +0900 Subject: [PATCH 7/7] Refactor code: Replace redundant conditions and enhance readability across several classes. --- .../org/codelibs/fess/suggest/Suggester.java | 6 +++--- .../codelibs/fess/suggest/SuggesterBuilder.java | 8 ++++---- .../suggest/converter/AnalyzerConverter.java | 2 +- .../fess/suggest/entity/SuggestItem.java | 8 ++++---- .../fess/suggest/index/SuggestIndexer.java | 16 ++++++++-------- .../index/contents/document/ESSourceReader.java | 6 +++--- .../index/contents/querylog/QueryLog.java | 4 ++-- .../suggest/normalizer/AnalyzerNormalizer.java | 2 +- .../normalizer/HankakuKanaToZenkakuKana.java | 2 +- .../popularwords/PopularWordsRequest.java | 10 +++++----- .../popularwords/PopularWordsResponse.java | 2 +- .../suggest/request/suggest/SuggestRequest.java | 10 +++++----- .../suggest/request/suggest/SuggestResponse.java | 2 +- .../fess/suggest/settings/AnalyzerSettings.java | 2 +- .../fess/suggest/settings/ArraySettings.java | 2 +- .../fess/suggest/settings/BadWordSettings.java | 2 +- .../suggest/settings/ElevateWordSettings.java | 2 +- .../fess/suggest/settings/SuggestSettings.java | 4 ++-- .../codelibs/fess/suggest/util/SuggestUtil.java | 2 +- 19 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/main/java/org/codelibs/fess/suggest/Suggester.java b/src/main/java/org/codelibs/fess/suggest/Suggester.java index f7b9b3e..5d38b04 100644 --- a/src/main/java/org/codelibs/fess/suggest/Suggester.java +++ b/src/main/java/org/codelibs/fess/suggest/Suggester.java @@ -69,16 +69,16 @@ public Suggester(final Client client, final SuggestSettings settings, final Read final ReadingConverter contentsReadingConverter, final Normalizer normalizer, final SuggestAnalyzer analyzer, final ExecutorService threadPool) { this.client = client; - this.suggestSettings = settings; + suggestSettings = settings; this.readingConverter = readingConverter; this.contentsReadingConverter = contentsReadingConverter; this.normalizer = normalizer; this.analyzer = analyzer; - this.index = settings.getAsString(SuggestSettings.DefaultKeys.INDEX, StringUtil.EMPTY); + index = settings.getAsString(SuggestSettings.DefaultKeys.INDEX, StringUtil.EMPTY); this.threadPool = threadPool; if (logger.isDebugEnabled()) { - logger.debug("Create suggester instance for {}", this.index); + logger.debug("Create suggester instance for {}", index); } } diff --git a/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java b/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java index 8ff91cf..e22e33b 100644 --- a/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java +++ b/src/main/java/org/codelibs/fess/suggest/SuggesterBuilder.java @@ -42,13 +42,13 @@ public class SuggesterBuilder { public SuggesterBuilder settings(final SuggestSettings settings) { this.settings = settings; - this.settingsBuilder = null; + settingsBuilder = null; return this; } public SuggesterBuilder settings(final SuggestSettingsBuilder settingsBuilder) { this.settingsBuilder = settingsBuilder; - this.settings = null; + settings = null; return this; } @@ -57,8 +57,8 @@ public SuggesterBuilder readingConverter(final ReadingConverter readingConverter return this; } - public SuggesterBuilder contentsReadigConverter(final ReadingConverter contentsReadigConverter) { - this.contentsReadingConverter = contentsReadigConverter; + public SuggesterBuilder contentsReadigConverter(final ReadingConverter contentsReadingConverter) { + this.contentsReadingConverter = contentsReadingConverter; return this; } diff --git a/src/main/java/org/codelibs/fess/suggest/converter/AnalyzerConverter.java b/src/main/java/org/codelibs/fess/suggest/converter/AnalyzerConverter.java index bc9aa72..ca19cef 100644 --- a/src/main/java/org/codelibs/fess/suggest/converter/AnalyzerConverter.java +++ b/src/main/java/org/codelibs/fess/suggest/converter/AnalyzerConverter.java @@ -38,7 +38,7 @@ public class AnalyzerConverter implements ReadingConverter { public AnalyzerConverter(final Client client, final SuggestSettings settings) { this.client = client; this.settings = settings; - this.analyzerSettings = settings.analyzer(); + analyzerSettings = settings.analyzer(); } @Override diff --git a/src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java b/src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java index fde8468..3201e64 100644 --- a/src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java +++ b/src/main/java/org/codelibs/fess/suggest/entity/SuggestItem.java @@ -97,7 +97,7 @@ public SuggestItem(final String[] text, final String[][] readings, final String[ this.languages = languages != null ? languages : new String[] {}; - this.kinds = new Kind[] { kind }; + kinds = new Kind[] { kind }; if (userBoost > 1) { this.userBoost = userBoost; } else { @@ -105,9 +105,9 @@ public SuggestItem(final String[] text, final String[][] readings, final String[ } this.docFreq = docFreq; this.queryFreq = queryFreq; - this.timestamp = ZonedDateTime.now(); - this.emptySource = createEmptyMap(); - this.id = SuggestUtil.createSuggestTextId(this.text); + timestamp = ZonedDateTime.now(); + emptySource = createEmptyMap(); + id = SuggestUtil.createSuggestTextId(this.text); } public String getText() { 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 72d971e..dc604e1 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexer.java +++ b/src/main/java/org/codelibs/fess/suggest/index/SuggestIndexer.java @@ -86,20 +86,20 @@ public SuggestIndexer(final Client client, final String index, final ReadingConv this.client = client; this.index = index; - this.supportedFields = settings.array().get(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS); - this.badWords = settings.badword().get(true); - this.tagFieldNames = settings.getAsString(SuggestSettings.DefaultKeys.TAG_FIELD_NAME, StringUtil.EMPTY).split(","); - this.roleFieldName = settings.getAsString(SuggestSettings.DefaultKeys.ROLE_FIELD_NAME, StringUtil.EMPTY); - this.langFieldName = settings.getAsString(SuggestSettings.DefaultKeys.LANG_FIELD_NAME, StringUtil.EMPTY); - this.parallel = settings.getAsBoolean(SuggestSettings.DefaultKeys.PARALLEL_PROCESSING, false); + supportedFields = settings.array().get(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS); + badWords = settings.badword().get(true); + tagFieldNames = settings.getAsString(SuggestSettings.DefaultKeys.TAG_FIELD_NAME, StringUtil.EMPTY).split(","); + roleFieldName = settings.getAsString(SuggestSettings.DefaultKeys.ROLE_FIELD_NAME, StringUtil.EMPTY); + langFieldName = settings.getAsString(SuggestSettings.DefaultKeys.LANG_FIELD_NAME, StringUtil.EMPTY); + parallel = settings.getAsBoolean(SuggestSettings.DefaultKeys.PARALLEL_PROCESSING, false); this.readingConverter = readingConverter; this.contentsReadingConverter = contentsReadingConverter; this.normalizer = normalizer; this.analyzer = analyzer; this.settings = settings; - this.contentsParser = new DefaultContentsParser(); - this.suggestWriter = new SuggestIndexWriter(); + contentsParser = new DefaultContentsParser(); + suggestWriter = new SuggestIndexWriter(); this.threadPool = threadPool; } 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 c6b2c77..9ecd0cf 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 @@ -65,8 +65,8 @@ public ESSourceReader(final Client client, final SuggestSettings settings, final this.client = client; this.settings = settings; this.indexName = indexName; - this.supportedFields = settings.array().get(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS); - this.totalDocNum = getTotal(); + supportedFields = settings.array().get(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS); + totalDocNum = getTotal(); } @Override @@ -100,7 +100,7 @@ public void setQuery(final QueryBuilder queryBuilder) { } public void addSort(final SortBuilder<?> sortBuilder) { - this.sortList.add(sortBuilder); + sortList.add(sortBuilder); } public void setLimitDocNumPercentage(final String limitPercentage) { diff --git a/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLog.java b/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLog.java index 285fc4d..3270995 100644 --- a/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLog.java +++ b/src/main/java/org/codelibs/fess/suggest/index/contents/querylog/QueryLog.java @@ -22,8 +22,8 @@ public class QueryLog { private final String fq; public QueryLog(final String queryString, @Nullable final String filterQueryString) { - this.q = queryString; - this.fq = filterQueryString; + q = queryString; + fq = filterQueryString; } public String getQueryString() { diff --git a/src/main/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java b/src/main/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java index 1a93672..6b2a988 100644 --- a/src/main/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java +++ b/src/main/java/org/codelibs/fess/suggest/normalizer/AnalyzerNormalizer.java @@ -31,7 +31,7 @@ public class AnalyzerNormalizer implements Normalizer { public AnalyzerNormalizer(final Client client, final SuggestSettings settings) { this.client = client; this.settings = settings; - this.analyzerSettings = settings.analyzer(); + analyzerSettings = settings.analyzer(); } @Override diff --git a/src/main/java/org/codelibs/fess/suggest/normalizer/HankakuKanaToZenkakuKana.java b/src/main/java/org/codelibs/fess/suggest/normalizer/HankakuKanaToZenkakuKana.java index a63c1dd..39f70a4 100644 --- a/src/main/java/org/codelibs/fess/suggest/normalizer/HankakuKanaToZenkakuKana.java +++ b/src/main/java/org/codelibs/fess/suggest/normalizer/HankakuKanaToZenkakuKana.java @@ -117,7 +117,7 @@ public static char mergeChar(final char c1, final char c2) { break; } } - } else if ((c2 == '゚') && ("ハヒフヘホ".indexOf(c1) >= 0)) { + } else if (c2 == '゚' && "ハヒフヘホ".indexOf(c1) >= 0) { switch (c1) { case 'ハ': return 'パ'; diff --git a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequest.java b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequest.java index 2f7e56d..c47e33a 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequest.java +++ b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsRequest.java @@ -78,19 +78,19 @@ public void setWindowSize(final int windowSize) { } public void addTag(final String tag) { - this.tags.add(tag); + tags.add(tag); } public void addRole(final String role) { - this.roles.add(role); + roles.add(role); } public void addField(final String field) { - this.fields.add(field); + fields.add(field); } public void addLanguage(final String lang) { - this.languages.add(lang); + languages.add(lang); } public void setDetail(final boolean detail) { @@ -98,7 +98,7 @@ public void setDetail(final boolean detail) { } public void addExcludeWord(final String excludeWord) { - this.excludeWords.add(excludeWord); + excludeWords.add(excludeWord); } public void setQueryFreqThreshold(final int queryFreqThreshold) { diff --git a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsResponse.java b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsResponse.java index d76e4ac..a08592a 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsResponse.java +++ b/src/main/java/org/codelibs/fess/suggest/request/popularwords/PopularWordsResponse.java @@ -38,7 +38,7 @@ public PopularWordsResponse(final String index, final long tookMs, final List<St this.index = index; this.tookMs = tookMs; this.words = words; - this.num = words.size(); + num = words.size(); this.total = total; this.items = items; } diff --git a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequest.java b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequest.java index 48faf14..918f057 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequest.java +++ b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestRequest.java @@ -87,19 +87,19 @@ public void setQuery(final String query) { } public void addTag(final String tag) { - this.tags.add(tag); + tags.add(tag); } public void addRole(final String role) { - this.roles.add(role); + roles.add(role); } public void addField(final String field) { - this.fields.add(field); + fields.add(field); } public void addKind(final String kind) { - this.kinds.add(kind); + kinds.add(kind); } public void setSuggestDetail(final boolean suggestDetail) { @@ -127,7 +127,7 @@ public void setSkipDuplicateWords(final boolean skipDuplicateWords) { } public void addLang(final String lang) { - this.languages.add(lang); + languages.add(lang); } @Override diff --git a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestResponse.java b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestResponse.java index 9d87d2a..57b6cde 100644 --- a/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestResponse.java +++ b/src/main/java/org/codelibs/fess/suggest/request/suggest/SuggestResponse.java @@ -38,7 +38,7 @@ public SuggestResponse(final String index, final long tookMs, final List<String> this.index = index; this.tookMs = tookMs; this.words = words; - this.num = words.size(); + num = words.size(); this.total = total; this.items = items; } diff --git a/src/main/java/org/codelibs/fess/suggest/settings/AnalyzerSettings.java b/src/main/java/org/codelibs/fess/suggest/settings/AnalyzerSettings.java index 7b77849..0db7039 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/AnalyzerSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/AnalyzerSettings.java @@ -213,7 +213,7 @@ protected String loadIndexSettings() throws IOException { } protected String getSuggestAnalyzerPath() { - final Object typeObj = this.settings.get("search_engine.type"); + final Object typeObj = settings.get("search_engine.type"); if (typeObj != null) { final String path = "suggest_indices/_" + typeObj.toString() + "/suggest_analyzer.json"; if (ResourceUtil.getResourceNoException(path) != null) { 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 644a21b..981a1c9 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/ArraySettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/ArraySettings.java @@ -58,7 +58,7 @@ public class ArraySettings { protected ArraySettings(final SuggestSettings settings, final Client client, final String settingsIndexName, final String settingsId) { this.settings = settings; this.client = client; - this.arraySettingsIndexName = createArraySettingsIndexName(settingsIndexName); + arraySettingsIndexName = createArraySettingsIndexName(settingsIndexName); this.settingsId = settingsId; createMappingIfEmpty(arraySettingsIndexName, settingsId, client); } diff --git a/src/main/java/org/codelibs/fess/suggest/settings/BadWordSettings.java b/src/main/java/org/codelibs/fess/suggest/settings/BadWordSettings.java index 74ad2af..8e498a1 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/BadWordSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/BadWordSettings.java @@ -37,7 +37,7 @@ public class BadWordSettings { protected BadWordSettings(final SuggestSettings settings, final Client client, final String settingsIndexName, final String settingsId) { - this.arraySettings = new ArraySettings(settings, client, settingsIndexName, settingsId) { + arraySettings = new ArraySettings(settings, client, settingsIndexName, settingsId) { @Override protected String createArraySettingsIndexName(final String settingsIndexName) { return settingsIndexName + "_badword"; 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 f719ab0..c5abddf 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/ElevateWordSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/ElevateWordSettings.java @@ -41,7 +41,7 @@ public class ElevateWordSettings { protected ElevateWordSettings(final SuggestSettings settings, final Client client, final String settingsIndexName, final String settingsId) { - this.arraySettings = new ArraySettings(settings, client, settingsIndexName, settingsId) { + arraySettings = new ArraySettings(settings, client, settingsIndexName, settingsId) { @Override protected String createArraySettingsIndexName(final String settingsIndexName) { return settingsIndexName + "_elevate"; 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 58e0540..2e1aa83 100644 --- a/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettings.java +++ b/src/main/java/org/codelibs/fess/suggest/settings/SuggestSettings.java @@ -73,8 +73,8 @@ public SuggestSettings(final Client client, final String settingsId, final Map<S this.initialSettings = initialSettings; this.timeoutSettings = timeoutSettings; - this.badWordIndexName = settingsIndexName + "-badword"; - this.elevateWordIndexName = settingsIndexName + "-elevateword"; + badWordIndexName = settingsIndexName + "-badword"; + elevateWordIndexName = settingsIndexName + "-elevateword"; } public void init() { diff --git a/src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java b/src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java index bcb1347..20ef677 100644 --- a/src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java +++ b/src/main/java/org/codelibs/fess/suggest/util/SuggestUtil.java @@ -101,7 +101,7 @@ public static List<String> getKeywords(final String q, final String[] fields) { } for (final TermQuery tq : termQueryList) { final String text = tq.getTerm().text(); - if ((0 == text.length()) || keywords.contains(text)) { + if (0 == text.length() || keywords.contains(text)) { continue; } keywords.add(text);