You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/10/16 22:34:16 UTC
svn commit: r826074 - in /lucene/solr/trunk/contrib/dataimporthandler/src:
extras/test/java/org/apache/solr/handler/dataimport/
main/java/org/apache/solr/handler/dataimport/
test/java/org/apache/solr/handler/dataimport/
Author: shalin
Date: Fri Oct 16 20:34:16 2009
New Revision: 826074
URL: http://svn.apache.org/viewvc?rev=826074&view=rev
Log:
Made DataImporter#loadDataConfig private and tests changed to use DataImporter#loadAndInt instead
Modified:
lucene/solr/trunk/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java?rev=826074&r1=826073&r2=826074&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java Fri Oct 16 20:34:16 2009
@@ -63,7 +63,7 @@
paramMap.put("recurse", "false");
paramMap.put("processAttachement", "false");
DataImporter di = new DataImporter();
- di.loadDataConfig(getConfigFromMap(paramMap));
+ di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams();
@@ -80,7 +80,7 @@
paramMap.put("recurse", "true");
paramMap.put("processAttachement", "false");
DataImporter di = new DataImporter();
- di.loadDataConfig(getConfigFromMap(paramMap));
+ di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams();
@@ -98,7 +98,7 @@
paramMap.put("processAttachement", "false");
paramMap.put("exclude", ".*grandchild.*");
DataImporter di = new DataImporter();
- di.loadDataConfig(getConfigFromMap(paramMap));
+ di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams();
@@ -116,7 +116,7 @@
paramMap.put("processAttachement", "false");
paramMap.put("include", ".*grandchild.*");
DataImporter di = new DataImporter();
- di.loadDataConfig(getConfigFromMap(paramMap));
+ di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams();
@@ -135,7 +135,7 @@
paramMap.put("exclude", ".*top1.*");
paramMap.put("include", ".*grandchild.*");
DataImporter di = new DataImporter();
- di.loadDataConfig(getConfigFromMap(paramMap));
+ di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams();
@@ -153,7 +153,7 @@
paramMap.put("processAttachement", "false");
paramMap.put("fetchMailsSince", "2008-12-26 00:00:00");
DataImporter di = new DataImporter();
- di.loadDataConfig(getConfigFromMap(paramMap));
+ di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams();
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=826074&r1=826073&r2=826074&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java Fri Oct 16 20:34:16 2009
@@ -164,7 +164,7 @@
}
- void loadDataConfig(String configFile) {
+ private void loadDataConfig(String configFile) {
try {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java?rev=826074&r1=826073&r2=826074&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java Fri Oct 16 20:34:16 2009
@@ -43,7 +43,7 @@
public void singleEntityNoRows() {
try {
DataImporter di = new DataImporter();
- di.loadDataConfig(dc_singleEntity);
+ di.loadAndInit(dc_singleEntity);
DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0);
MockDataSource.setIterator("select * from x", new ArrayList().iterator());
@@ -71,7 +71,7 @@
public void testDeltaImportNoRows_MustNotCommit() {
try {
DataImporter di = new DataImporter();
- di.loadDataConfig(dc_deltaConfig);
+ di.loadAndInit(dc_deltaConfig);
DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0);
MockDataSource.setIterator("select * from x", new ArrayList().iterator());
@@ -96,7 +96,7 @@
public void singleEntityOneRow() {
try {
DataImporter di = new DataImporter();
- di.loadDataConfig(dc_singleEntity);
+ di.loadAndInit(dc_singleEntity);
DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0);
List l = new ArrayList();
@@ -135,7 +135,7 @@
public void testImportCommand() {
try {
DataImporter di = new DataImporter();
- di.loadDataConfig(dc_singleEntity);
+ di.loadAndInit(dc_singleEntity);
DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0);
List l = new ArrayList();
@@ -173,7 +173,7 @@
public void singleEntityMultipleRows() {
try {
DataImporter di = new DataImporter();
- di.loadDataConfig(dc_singleEntity);
+ di.loadAndInit(dc_singleEntity);
DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0);
ent.isDocRoot = true;