Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Need to handle configoverlay.json created by Solr's ConfigAPI #80

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Need to handle configoverlay.json created by Solr's ConfigAPI #80

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bf149e
Need to handle configoverlay.json created by Solr's ConfigAPI
kevinlacire Nov 3, 2017
6439e64
Update SynonymExpandingExtendedDismaxQParserPlugin.java
kevinlacire Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 45 additions & 9 deletions src/main/java/com/github/healthonnet/search/SynonymExpandingExtendedDismaxQParserPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,21 +189,31 @@ private void parseConfig() {
NamedList<?> synonymAnalyzersList = (NamedList<?>) xmlSynonymAnalyzers;
for (Entry<String, ?> entry : synonymAnalyzersList) {
String analyzerName = entry.getKey();
if (!(entry.getValue() instanceof NamedList)) {
continue;
}
NamedList<?> analyzerAsNamedList = (NamedList<?>) entry.getValue();
if (!(entry.getValue() instanceof NamedList) && !(entry.getValue() instanceof Map)) {
continue;
}
NamedList<?> analyzerAsNamedList;
if (entry.getValue() instanceof Map) {
analyzerAsNamedList = new NamedList((Map) entry.getValue());
} else {
analyzerAsNamedList = (NamedList<?>) entry.getValue();
}

TokenizerFactory tokenizerFactory = null;
TokenFilterFactory filterFactory;
List<TokenFilterFactory> filterFactories = new LinkedList<>();

for (Entry<String, ?> analyzerEntry : analyzerAsNamedList) {
String key = analyzerEntry.getKey();
if (!(entry.getValue() instanceof NamedList)) {
continue;
}
Map<String, String> params = convertNamedListToMap((NamedList<?>)analyzerEntry.getValue());
if (!(analyzerEntry.getValue() instanceof NamedList) && !(analyzerEntry.getValue() instanceof Map)) {
continue;
}
Map<String, String> params;
if (analyzerEntry.getValue() instanceof Map) {
params = convertTypesToString((Map<String, ?>) analyzerEntry.getValue());
} else {
params = convertNamedListToMap((NamedList<?>) analyzerEntry.getValue());
}

String className = params.get("class");
if (className == null) {
Expand All @@ -225,7 +235,7 @@ private void parseConfig() {
if (tokenizerFactory instanceof ResourceLoaderAware) {
((ResourceLoaderAware)tokenizerFactory).inform(loader);
}
} else if (key.equals("filter")) {
} else if (key.startsWith("filter")) {
try {
filterFactory = TokenFilterFactory.forName(className, params);
} catch (IllegalArgumentException iae) {
Expand Down Expand Up @@ -259,6 +269,32 @@ private void parseConfig() {
throw new SolrException(ErrorCode.SERVER_ERROR, "Failed to create parser. Check your config.", e);
}
}
/**
* Converts a Map<String, ?> into a Map<String, String> (used to prevent deep CastException caused by configoverlay.json file)
* Handled types are String, Long, Integer & Boolean
* @param map the map to convert
* @return an empty map if the provided map is null, else apply a toString() on each value
*/
private Map<String, String> convertTypesToString(Map<String, ?> map) {
if (map == null) {
return Collections.emptyMap();
}

Map<String, String> res = new HashMap<>(map.size());
map.forEach((k, v) -> {
if (v instanceof String) {
res.put(k, (String) v);
} else if (v instanceof Long) {
res.put(k, Long.toString((Long) v));
} else if (v instanceof Integer) {
res.put(k, Integer.toString((Integer) v));
} else if (v instanceof Boolean) {
res.put(k, Boolean.toString((Boolean) v));
}
});

return res;
}
}

class SynonymExpandingExtendedDismaxQParser extends QParser {
Expand Down