Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-9558: Clean up package name conflicts for analyzers-icu. (#1946)

This commit is contained in:
Tomoko Uchida 2020-10-05 17:52:23 +09:00 committed by GitHub
parent 0864b39a11
commit b70eaeee5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 19 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gradle/documentation/render-javadoc.gradle
View File

@ -146,16 +146,6 @@ configure([
}
}
configure(project(":lucene:analysis:icu")) {
project.tasks.withType(RenderJavadocTask) {
// TODO: clean up split packages
javadocMissingIgnore = [
"org.apache.lucene.collation",
"org.apache.lucene.collation.tokenattributes"
]
}
}
configure(project(":lucene:backward-codecs")) {
project.tasks.withType(RenderJavadocTask) {
// TODO: fix missing @param tags

6
lucene/CHANGES.txt
View File

@ -12,9 +12,6 @@ System Requirements
API Changes
* LUCENE-9317: Clean up package name conflicts between core and analyzers-common.
See MIGRATE.md for details. (David Ryan, Tomoko Uchida, Uwe Schindler, Dawid Weiss)
* LUCENE-8474: RAMDirectory and associated deprecated classes have been
removed. (Dawid Weiss)
@ -68,6 +65,9 @@ API Changes
in Lucenes IndexWriter. The interface is not sufficient to efficiently
replace the functionality with reasonable efforts. (Simon Willnauer)
* LUCENE-9317 LUCENE-9558: Clean up package name conflicts between modules.
See MIGRATE.md for details. (David Ryan, Tomoko Uchida, Uwe Schindler, Dawid Weiss)
Improvements
* LUCENE-9463: Query match region retrieval component, passage scoring and formatting

5
lucene/MIGRATE.md
View File

@ -1,5 +1,10 @@
# Apache Lucene Migration Guide
## ICUCollationKeyAnalyzer is renamed (LUCENE-9558)
o.a.l.collation.ICUCollationAnalyzer is renamed to o.a.l.a.icu.ICUCollationKeyAnalyzer.
Also, its dependant classes are renamed in the same way.
## Base and concrete analysis factories are moved / package renamed (LUCENE-9317)
1. Base analysis factories are moved to `lucene-core`, also their package names are renamed.

5
lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationAttributeFactory.java → lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUCollationAttributeFactory.java
View File

@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.collation;
package org.apache.lucene.analysis.icu;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.collation.tokenattributes.ICUCollatedTermAttributeImpl;
import org.apache.lucene.collation.CollationAttributeFactory;
import org.apache.lucene.analysis.icu.tokenattributes.ICUCollatedTermAttributeImpl;
import org.apache.lucene.util.AttributeFactory;
import com.ibm.icu.text.Collator;

2
lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java → lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUCollationDocValuesField.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.collation;
package org.apache.lucene.analysis.icu;
import org.apache.lucene.document.Field;

3
lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java → lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUCollationKeyAnalyzer.java
View File

@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.collation;
package org.apache.lucene.analysis.icu;
import com.ibm.icu.text.Collator;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import org.apache.lucene.collation.CollationKeyAnalyzer;
/**
* <p>

2
lucene/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/ICUCollatedTermAttributeImpl.java → lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ICUCollatedTermAttributeImpl.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.collation.tokenattributes;
package org.apache.lucene.analysis.icu.tokenattributes;
import org.apache.lucene.analysis.tokenattributes.CharTermAttributeImpl;

23
lucene/analysis/icu/src/java/org/apache/lucene/collation/package.html
View File

@ -1,23 +0,0 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- not a package-info.java, because we already defined this package in common/ -->
<html>
<body>
Unicode Collation support.
</body>
</html>

23
lucene/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/package.html
View File

@ -1,23 +0,0 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- not a package-info.java, because we already defined this package in common/ -->
<html>
<body>
Custom {@link org.apache.lucene.util.AttributeImpl} for indexing collation keys as index terms.
</body>
</html>

2
lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java → lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.collation;
package org.apache.lucene.analysis.icu;
import org.apache.lucene.document.Document;

3
lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java → lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationKeyAnalyzer.java
View File

@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.collation;
package org.apache.lucene.analysis.icu;
import com.ibm.icu.text.Collator;

2
lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
View File

@ -44,7 +44,7 @@ public class NewCollationAnalyzerTask extends PerfTask {
public enum Implementation {
JDK("org.apache.lucene.collation.CollationKeyAnalyzer",
"java.text.Collator"),
ICU("org.apache.lucene.collation.ICUCollationKeyAnalyzer",
ICU("org.apache.lucene.analysis.icu.ICUCollationKeyAnalyzer",
"com.ibm.icu.text.Collator");
String className;

2
solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
View File

@ -28,7 +28,7 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.collation.ICUCollationKeyAnalyzer;
import org.apache.lucene.analysis.icu.ICUCollationKeyAnalyzer;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.IndexableField;