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

Made DataImporter#loadDataConfig private and tests changed to use DataImporter#loadAndInt instead 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@826074 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2009-10-16 20:34:16 +00:00
parent ff3fd6f77f
commit 461757eb14
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
View File

@ -63,7 +63,7 @@ public class TestMailEntityProcessor {
paramMap.put("recurse", "false"); paramMap.put("recurse", "false");
paramMap.put("processAttachement", "false"); paramMap.put("processAttachement", "false");
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(getConfigFromMap(paramMap)); di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0); DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true; ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams(); DataImporter.RequestParams rp = new DataImporter.RequestParams();
@ -80,7 +80,7 @@ public class TestMailEntityProcessor {
paramMap.put("recurse", "true"); paramMap.put("recurse", "true");
paramMap.put("processAttachement", "false"); paramMap.put("processAttachement", "false");
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(getConfigFromMap(paramMap)); di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0); DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true; ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams(); DataImporter.RequestParams rp = new DataImporter.RequestParams();
@ -98,7 +98,7 @@ public class TestMailEntityProcessor {
paramMap.put("processAttachement", "false"); paramMap.put("processAttachement", "false");
paramMap.put("exclude", ".*grandchild.*"); paramMap.put("exclude", ".*grandchild.*");
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(getConfigFromMap(paramMap)); di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0); DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true; ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams(); DataImporter.RequestParams rp = new DataImporter.RequestParams();
@ -116,7 +116,7 @@ public class TestMailEntityProcessor {
paramMap.put("processAttachement", "false"); paramMap.put("processAttachement", "false");
paramMap.put("include", ".*grandchild.*"); paramMap.put("include", ".*grandchild.*");
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(getConfigFromMap(paramMap)); di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0); DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true; ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams(); DataImporter.RequestParams rp = new DataImporter.RequestParams();
@ -135,7 +135,7 @@ public class TestMailEntityProcessor {
paramMap.put("exclude", ".*top1.*"); paramMap.put("exclude", ".*top1.*");
paramMap.put("include", ".*grandchild.*"); paramMap.put("include", ".*grandchild.*");
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(getConfigFromMap(paramMap)); di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0); DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true; ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams(); DataImporter.RequestParams rp = new DataImporter.RequestParams();
@ -153,7 +153,7 @@ public class TestMailEntityProcessor {
paramMap.put("processAttachement", "false"); paramMap.put("processAttachement", "false");
paramMap.put("fetchMailsSince", "2008-12-26 00:00:00"); paramMap.put("fetchMailsSince", "2008-12-26 00:00:00");
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(getConfigFromMap(paramMap)); di.loadAndInit(getConfigFromMap(paramMap));
DataConfig.Entity ent = di.getConfig().document.entities.get(0); DataConfig.Entity ent = di.getConfig().document.entities.get(0);
ent.isDocRoot = true; ent.isDocRoot = true;
DataImporter.RequestParams rp = new DataImporter.RequestParams(); DataImporter.RequestParams rp = new DataImporter.RequestParams();

2
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
View File

@ -164,7 +164,7 @@ public class DataImporter {
} }
void loadDataConfig(String configFile) { private void loadDataConfig(String configFile) {
try { try {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

10
contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
View File

@ -43,7 +43,7 @@ public class TestDocBuilder {
public void singleEntityNoRows() { public void singleEntityNoRows() {
try { try {
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(dc_singleEntity); di.loadAndInit(dc_singleEntity);
DataConfig cfg = di.getConfig(); DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0); DataConfig.Entity ent = cfg.document.entities.get(0);
MockDataSource.setIterator("select * from x", new ArrayList().iterator()); MockDataSource.setIterator("select * from x", new ArrayList().iterator());
@ -71,7 +71,7 @@ public class TestDocBuilder {
public void testDeltaImportNoRows_MustNotCommit() { public void testDeltaImportNoRows_MustNotCommit() {
try { try {
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(dc_deltaConfig); di.loadAndInit(dc_deltaConfig);
DataConfig cfg = di.getConfig(); DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0); DataConfig.Entity ent = cfg.document.entities.get(0);
MockDataSource.setIterator("select * from x", new ArrayList().iterator()); MockDataSource.setIterator("select * from x", new ArrayList().iterator());
@ -96,7 +96,7 @@ public class TestDocBuilder {
public void singleEntityOneRow() { public void singleEntityOneRow() {
try { try {
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(dc_singleEntity); di.loadAndInit(dc_singleEntity);
DataConfig cfg = di.getConfig(); DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0); DataConfig.Entity ent = cfg.document.entities.get(0);
List l = new ArrayList(); List l = new ArrayList();
@ -135,7 +135,7 @@ public class TestDocBuilder {
public void testImportCommand() { public void testImportCommand() {
try { try {
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(dc_singleEntity); di.loadAndInit(dc_singleEntity);
DataConfig cfg = di.getConfig(); DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0); DataConfig.Entity ent = cfg.document.entities.get(0);
List l = new ArrayList(); List l = new ArrayList();
@ -173,7 +173,7 @@ public class TestDocBuilder {
public void singleEntityMultipleRows() { public void singleEntityMultipleRows() {
try { try {
DataImporter di = new DataImporter(); DataImporter di = new DataImporter();
di.loadDataConfig(dc_singleEntity); di.loadAndInit(dc_singleEntity);
DataConfig cfg = di.getConfig(); DataConfig cfg = di.getConfig();
DataConfig.Entity ent = cfg.document.entities.get(0); DataConfig.Entity ent = cfg.document.entities.get(0);
ent.isDocRoot = true; ent.isDocRoot = true;