get rid of CsvContext in favor of DataLoaderContext

JumpMind · Oct 18, 2007 · 3f17e51 · 3f17e51
1 parent e2d2910
commit 3f17e51
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 79 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/load/DataLoaderContext.java b/symmetric/src/main/java/org/jumpmind/symmetric/load/DataLoaderContext.java
@@ -21,6 +21,9 @@
 
 package org.jumpmind.symmetric.load;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 public class DataLoaderContext implements IDataLoaderContext {
 
@@ -29,16 +32,26 @@ public class DataLoaderContext implements IDataLoaderContext {
     private String clientId;
 
     private String tableName;
-
-    private String[] keyNames;
-
-    private String[] columnNames;
 
     private String batchId;
 
     private boolean isSkipping;
 
+    private transient Map<String, TableTemplate> tableTemplateMap;
+
+    private TableTemplate tableTemplate;
+
     public DataLoaderContext() {
+        this.tableTemplateMap = new HashMap<String, TableTemplate>();
+    }
+
+    public TableTemplate getTableTemplate() {
+        return tableTemplate;
+    }
+
+    public void setTableTemplate(TableTemplate tableTemplate) {
+        this.tableTemplate = tableTemplate;
+        tableTemplateMap.put(getTableName(), tableTemplate);
     }
 
     public String getBatchId() {
@@ -64,6 +77,7 @@ public String getTableName() {
 
     public void setTableName(String tableName) {
         this.tableName = tableName;
+        this.tableTemplate = tableTemplateMap.get(tableName);
     }
 
     public String getVersion() {
@@ -83,19 +97,19 @@ public void setSkipping(boolean isSkipping) {
     }
 
     public String[] getColumnNames() {
-        return columnNames;
+        return tableTemplate.getColumnNames();
     }
 
     public void setColumnNames(String[] columnNames) {
-        this.columnNames = columnNames;
+        tableTemplate.setColumnNames(columnNames);
     }
 
     public String[] getKeyNames() {
-        return keyNames;
+        return tableTemplate.getKeyNames();
     }
 
     public void setKeyNames(String[] keyNames) {
-        this.keyNames = keyNames;
+        tableTemplate.setKeyNames(keyNames);
     }
 
 }
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/load/csv/CsvContext.java b/symmetric/src/main/java/org/jumpmind/symmetric/load/csv/CsvContext.java
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/load/csv/CsvLoader.java b/symmetric/src/main/java/org/jumpmind/symmetric/load/csv/CsvLoader.java
@@ -31,6 +31,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jumpmind.symmetric.common.csv.CsvConstants;
 import org.jumpmind.symmetric.db.IDbDialect;
+import org.jumpmind.symmetric.load.DataLoaderContext;
 import org.jumpmind.symmetric.load.DataLoaderStatistics;
 import org.jumpmind.symmetric.load.IColumnFilter;
 import org.jumpmind.symmetric.load.IDataLoader;
@@ -53,7 +54,7 @@ public class CsvLoader implements IDataLoader {
 
     protected CsvReader csvReader;
 
-    protected CsvContext context;
+    protected DataLoaderContext context;
 
     protected DataLoaderStatistics stats;
 
@@ -70,7 +71,7 @@ public class CsvLoader implements IDataLoader {
     public void open(BufferedReader reader) throws IOException {
         csvReader = new CsvReader(reader);
         csvReader.setEscapeMode(CsvReader.ESCAPE_MODE_BACKSLASH);
-        context = new CsvContext();
+        context = new DataLoaderContext();
         stats = new DataLoaderStatistics();
     }