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

LUCENE-2510: Fix generics and remove Häckidy-Hick-Hack (its not needed here, as names should be unique; we dont have the preflex codec special case) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene2510@1365026 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-07-24 12:58:13 +00:00
parent 5249e46aee
commit 6e966079b1
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java
View File

@ -30,15 +30,7 @@ import java.util.ServiceLoader;
*/
public final class AnalysisSPILoader<S extends AbstractAnalysisFactory> {
private final Map<String,Class<S>> services;
/** This field is a hack for LuceneTestCase to get access
* to the modifiable map (to work around bugs in IBM J9) */
@SuppressWarnings("unused")
@Deprecated
// Hackidy-Häck-Hack for bugs in IBM J9 ServiceLoader
private final Map<String,Class<S>> modifiableServices;
private final Map<String,Class<? extends S>> services;
private final Class<S> clazz;
public AnalysisSPILoader(Class<S> clazz) {
@ -48,7 +40,7 @@ public final class AnalysisSPILoader<S extends AbstractAnalysisFactory> {
public AnalysisSPILoader(Class<S> clazz, String[] suffixes) {
this.clazz = clazz;
final ServiceLoader<S> loader = ServiceLoader.load(clazz);
final LinkedHashMap<String,Class<S>> services = new LinkedHashMap<String,Class<S>>();
final LinkedHashMap<String,Class<? extends S>> services = new LinkedHashMap<String,Class<? extends S>>();
for (final S service : loader) {
final String clazzName = service.getClass().getSimpleName();
int suffixIndex = -1;
@ -64,10 +56,11 @@ public final class AnalysisSPILoader<S extends AbstractAnalysisFactory> {
// them used instead of others
if (!services.containsKey(name)) {
assert checkServiceName(name);
services.put(name, (Class<S>) service.getClass());
@SuppressWarnings("unchecked")
final Class<? extends S> sclazz = (Class<? extends S>) service.getClass();
services.put(name, sclazz);
}
}
this.modifiableServices = services; // hack, remove when IBM J9 is fixed!
this.services = Collections.unmodifiableMap(services);
}
@ -103,13 +96,13 @@ public final class AnalysisSPILoader<S extends AbstractAnalysisFactory> {
}
public S newInstance(String name) {
final Class<S> service = services.get(name.toLowerCase(Locale.ROOT));
final Class<? extends S> service = services.get(name.toLowerCase(Locale.ROOT));
if (service != null) {
try {
return service.newInstance();
} catch (Exception e) {
throw new IllegalArgumentException("SPI class of type "+clazz.getName()+" with name '"+name+"' cannot be instantiated. " +
"This is likely due to a misconfiguration of the java class '" + service.getName() + "': ", e);
"This is likely due to a misconfiguration of the java class '" + service.getName() + "': ", e);
}
} else {
throw new IllegalArgumentException("A SPI class of type "+clazz.getName()+" with name '"+name+"' does not exist. "+