You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2019/01/05 14:51:10 UTC
lucene-solr:master: SOLR-12365: Renamed class Config to XmlConfigFile
Repository: lucene-solr
Updated Branches:
refs/heads/master 000d0c136 -> ca23040ba
SOLR-12365: Renamed class Config to XmlConfigFile
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ca23040b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ca23040b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ca23040b
Branch: refs/heads/master
Commit: ca23040baa94b6b4ab833994c2af00bbb2c72f27
Parents: 000d0c1
Author: David Smiley <ds...@apache.org>
Authored: Sat Jan 5 09:51:02 2019 -0500
Committer: David Smiley <ds...@apache.org>
Committed: Sat Jan 5 09:51:02 2019 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/Config.java | 13 ++++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca23040b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6006f43..be1195b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca23040b/solr/core/src/java/org/apache/solr/core/Config.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/Config.java b/solr/core/src/java/org/apache/solr/core/Config.java
index 11a381e..6852c59 100644
--- a/solr/core/src/java/org/apache/solr/core/Config.java
+++ b/solr/core/src/java/org/apache/solr/core/Config.java
@@ -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 {