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

SOLR-12365: Renamed class Config to XmlConfigFile

This commit is contained in:
David Smiley 2019-01-05 09:51:02 -05:00
parent 000d0c1364
commit ca23040baa
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -157,6 +157,8 @@ Other Changes
* SOLR-13086: Improve the error message reported by DocumentObjectBinder when a setter is not found (Gus Heck)
* SOLR-12365: Renamed class Config to XmlConfigFile (David Smiley)
================== 7.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

13
solr/core/src/java/org/apache/solr/core/Config.java
View File

@ -62,9 +62,9 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
*
* Wrapper around an XML DOM object to provide convenient accessors to it. Intended for XML config files.
*/
public class Config {
public class Config { // formerly simply "Config"
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
@ -447,18 +447,21 @@ public class Config {
String val = getVal(path, false);
return val!=null ? Double.parseDouble(val) : def;
}
//TODO belongs on SolrXmlConfig?
public Version getLuceneVersion(String path) {
return parseLuceneVersionString(getVal(path, true));
}
//TODO belongs on SolrXmlConfig?
public Version getLuceneVersion(String path, Version def) {
String val = getVal(path, false);
return val!=null ? parseLuceneVersionString(val) : def;
}
private static final AtomicBoolean versionWarningAlreadyLogged = new AtomicBoolean(false);
//TODO belongs on SolrXmlConfig?
public static final Version parseLuceneVersionString(final String matchVersion) {
final Version version;
try {