Skip to content

Commit 4c93513

Browse files
committed
Update to elasticsearch 1.0.0.RC1
Closes #16.
1 parent 51a96c1 commit 4c93513

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>org.elasticsearch</groupId>
88
<artifactId>elasticsearch-analysis-icu</artifactId>
9-
<version>1.14.0-SNAPSHOT</version>
9+
<version>2.0.0.RC1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111
<description>ICU Analysis for ElasticSearch</description>
1212
<inceptionYear>2009</inceptionYear>
@@ -31,7 +31,7 @@
3131
</parent>
3232

3333
<properties>
34-
<elasticsearch.version>0.90.8</elasticsearch.version>
34+
<elasticsearch.version>1.0.0.RC1-SNAPSHOT</elasticsearch.version>
3535
<lucene.version>4.6.0</lucene.version>
3636
<tests.jvms>1</tests.jvms>
3737
<tests.shuffle>true</tests.shuffle>

src/main/java/org/elasticsearch/index/analysis/IcuCollationTokenFilterFactory.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.ibm.icu.util.ULocale;
2525
import org.apache.lucene.analysis.TokenStream;
2626
import org.apache.lucene.collation.ICUCollationKeyFilter;
27-
import org.elasticsearch.ElasticSearchIllegalArgumentException;
27+
import org.elasticsearch.ElasticsearchIllegalArgumentException;
2828
import org.elasticsearch.common.inject.Inject;
2929
import org.elasticsearch.common.inject.assistedinject.Assisted;
3030
import org.elasticsearch.common.settings.Settings;
@@ -63,15 +63,15 @@ public IcuCollationTokenFilterFactory(Index index, @IndexSettings Settings index
6363
} catch (FailedToResolveConfigException e) {
6464
failureToResolve = e;
6565
} catch (IOException e) {
66-
throw new ElasticSearchIllegalArgumentException("Failed to load collation rules", e);
66+
throw new ElasticsearchIllegalArgumentException("Failed to load collation rules", e);
6767
}
6868
try {
6969
collator = new RuleBasedCollator(rules);
7070
} catch (Exception e) {
7171
if (failureToResolve != null) {
72-
throw new ElasticSearchIllegalArgumentException("Failed to resolve collation rules location", failureToResolve);
72+
throw new ElasticsearchIllegalArgumentException("Failed to resolve collation rules location", failureToResolve);
7373
} else {
74-
throw new ElasticSearchIllegalArgumentException("Failed to parse collation rules", e);
74+
throw new ElasticsearchIllegalArgumentException("Failed to parse collation rules", e);
7575
}
7676
}
7777
} else {
@@ -109,7 +109,7 @@ public IcuCollationTokenFilterFactory(Index index, @IndexSettings Settings index
109109
} else if (strength.equalsIgnoreCase("identical")) {
110110
collator.setStrength(Collator.IDENTICAL);
111111
} else {
112-
throw new ElasticSearchIllegalArgumentException("Invalid strength: " + strength);
112+
throw new ElasticsearchIllegalArgumentException("Invalid strength: " + strength);
113113
}
114114
}
115115

@@ -121,7 +121,7 @@ public IcuCollationTokenFilterFactory(Index index, @IndexSettings Settings index
121121
} else if (decomposition.equalsIgnoreCase("canonical")) {
122122
collator.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
123123
} else {
124-
throw new ElasticSearchIllegalArgumentException("Invalid decomposition: " + decomposition);
124+
throw new ElasticsearchIllegalArgumentException("Invalid decomposition: " + decomposition);
125125
}
126126
}
127127

@@ -134,7 +134,7 @@ public IcuCollationTokenFilterFactory(Index index, @IndexSettings Settings index
134134
} else if (alternate.equalsIgnoreCase("non-ignorable")) {
135135
rbc.setAlternateHandlingShifted(false);
136136
} else {
137-
throw new ElasticSearchIllegalArgumentException("Invalid alternate: " + alternate);
137+
throw new ElasticsearchIllegalArgumentException("Invalid alternate: " + alternate);
138138
}
139139
}
140140

@@ -150,7 +150,7 @@ public IcuCollationTokenFilterFactory(Index index, @IndexSettings Settings index
150150
} else if (caseFirst.equalsIgnoreCase("upper")) {
151151
rbc.setUpperCaseFirst(true);
152152
} else {
153-
throw new ElasticSearchIllegalArgumentException("Invalid caseFirst: " + caseFirst);
153+
throw new ElasticsearchIllegalArgumentException("Invalid caseFirst: " + caseFirst);
154154
}
155155
}
156156

0 commit comments

Comments
 (0)