From 2d8383ab6eca276e3c98ddebd6f4be7fc4ecefd7 Mon Sep 17 00:00:00 2001
From: Andrey Bespalov <andr.bespalov@gmail.com>
Date: Fri, 26 May 2017 23:49:15 +0300
Subject: [PATCH] Submitting the current version: additional implementations of
 Oracle classes (empty)

---
 .gradle/2.13/taskArtifacts/cache.properties   |   1 +
 .gradle/3.1/taskArtifacts/cache.properties    |   1 +
 .gradle/buildOutputCleanup/cache.properties   |   2 +
 .../buildOutputCleanup/cache.properties       |   2 +
 build/resources/main/excel2db.properties      |  17 ++++++
 .../tools/common/ApplicationException.java    |   3 -
 .../mdm/tools/common/AuthOutInterceptor.java  |   3 -
 .../mdm/tools/common/SheetEntityManager.java  |   1 -
 .../com/ge/mdm/tools/common/TaskExecutor.java |   4 +-
 .../excel2db/ApplicationContextUtils.java     |  21 +++++++
 .../java/excel2db/ApplicationException.java   |  25 ++++++++
 src/main/java/excel2db/Excel2dbTask.java      |  13 +++--
 src/main/java/excel2db/excel2db.java          |  21 ++++---
 .../java/excel2db/service/CreateTable.java    |   4 +-
 .../java/excel2db/service/InitInputFiles.java |   2 +-
 .../java/excel2db/service/PopulateTable.java  |   4 +-
 .../service/impl/CreateTableOracleImpl.java   |  19 ++++++
 .../service/impl/CreateTablePostgresImpl.java |  17 ++++--
 .../impl/DBConnectionPostgresImpl.java        |   1 -
 .../service/impl/InitInputFilesImpl.java      |  40 ++++++++++++-
 .../service/impl/PopulateTableOracleImpl.java |  24 ++++++++
 .../impl/PopulateTablePostgresImpl.java       |  12 ++--
 src/main/resources/excel2db.properties        |  13 ++++-
 src/main/resources/spring-batch.xml           |   0
 src/main/resources/spring-job.xml             |   0
 src/main/resources/spring.xml                 |  55 +++++++++++++-----
 src/test/java/InitInputFilesImplTest.java     |  23 ++++++++
 src/test/java/JUnitInitFileCategory.java      |   3 +
 src/test/java/JUnitPopulateTableCategory.java |   3 +
 src/test/java/JUnitSuiteInitFiles.java        |  15 +++++
 src/test/java/JUnitSuitePopulateTable.java    |  11 ++++
 .../java/PopulateTablePostgresImplTest.java   |  41 +++++++++++--
 unitTest.xls                                  | Bin 0 -> 22528 bytes
 33 files changed, 340 insertions(+), 61 deletions(-)
 create mode 100644 .gradle/2.13/taskArtifacts/cache.properties
 create mode 100644 .gradle/3.1/taskArtifacts/cache.properties
 create mode 100644 .gradle/buildOutputCleanup/cache.properties
 create mode 100644 build/resources/main/.gradle/buildOutputCleanup/cache.properties
 create mode 100644 build/resources/main/excel2db.properties
 create mode 100644 src/main/java/excel2db/ApplicationContextUtils.java
 create mode 100644 src/main/java/excel2db/ApplicationException.java
 create mode 100644 src/main/java/excel2db/service/impl/CreateTableOracleImpl.java
 create mode 100644 src/main/java/excel2db/service/impl/PopulateTableOracleImpl.java
 delete mode 100644 src/main/resources/spring-batch.xml
 delete mode 100644 src/main/resources/spring-job.xml
 create mode 100644 src/test/java/JUnitInitFileCategory.java
 create mode 100644 src/test/java/JUnitPopulateTableCategory.java
 create mode 100644 src/test/java/JUnitSuiteInitFiles.java
 create mode 100644 src/test/java/JUnitSuitePopulateTable.java
 create mode 100644 unitTest.xls

diff --git a/.gradle/2.13/taskArtifacts/cache.properties b/.gradle/2.13/taskArtifacts/cache.properties
new file mode 100644
index 0000000..c0e3863
--- /dev/null
+++ b/.gradle/2.13/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Sat Apr 01 20:46:15 MSK 2017
diff --git a/.gradle/3.1/taskArtifacts/cache.properties b/.gradle/3.1/taskArtifacts/cache.properties
new file mode 100644
index 0000000..9caf226
--- /dev/null
+++ b/.gradle/3.1/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Mon Mar 27 14:28:08 MSK 2017
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
new file mode 100644
index 0000000..25dabbf
--- /dev/null
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Fri Mar 24 14:21:21 MSK 2017
+gradle.version=3.4.1
diff --git a/build/resources/main/.gradle/buildOutputCleanup/cache.properties b/build/resources/main/.gradle/buildOutputCleanup/cache.properties
new file mode 100644
index 0000000..617a29b
--- /dev/null
+++ b/build/resources/main/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Tue Mar 28 13:08:49 MSK 2017
+gradle.version=3.4.1
diff --git a/build/resources/main/excel2db.properties b/build/resources/main/excel2db.properties
new file mode 100644
index 0000000..244c517
--- /dev/null
+++ b/build/resources/main/excel2db.properties
@@ -0,0 +1,17 @@
+# names of input tables
+input.files=test-input.xls,test-input1.xls
+
+# db implementation classes
+
+# postgres section
+# dbConnectionImplenentation=excel2db.service.impl.DBConnectionPostgresImpl
+# oracle section
+dbConnectionImplenentation=excel2db.service.impl.DBConnectionOracleImpl
+
+# postgres connection parameters
+db.server=localhost
+db.database=excel2db
+db.port=5433
+db.user=postgres
+db.password=postgres
+
diff --git a/common/src/main/java/com/ge/mdm/tools/common/ApplicationException.java b/common/src/main/java/com/ge/mdm/tools/common/ApplicationException.java
index 4c8278b..35b636e 100644
--- a/common/src/main/java/com/ge/mdm/tools/common/ApplicationException.java
+++ b/common/src/main/java/com/ge/mdm/tools/common/ApplicationException.java
@@ -1,8 +1,5 @@
 package com.ge.mdm.tools.common;
 
-/**
- * @author Stanislav Mamontov
- */
 public class ApplicationException extends Exception {
     static final long serialVersionUID = 1L;
 
diff --git a/common/src/main/java/com/ge/mdm/tools/common/AuthOutInterceptor.java b/common/src/main/java/com/ge/mdm/tools/common/AuthOutInterceptor.java
index ab34335..5f5d1c2 100644
--- a/common/src/main/java/com/ge/mdm/tools/common/AuthOutInterceptor.java
+++ b/common/src/main/java/com/ge/mdm/tools/common/AuthOutInterceptor.java
@@ -10,9 +10,6 @@
 
 import java.util.*;
 
-/**
- * @author Stanislav Mamontov
- */
 public class AuthOutInterceptor extends AbstractPhaseInterceptor<Message> {
 
     private static final Logger logger = LoggerFactory.getLogger(AuthOutInterceptor.class);
diff --git a/common/src/main/java/com/ge/mdm/tools/common/SheetEntityManager.java b/common/src/main/java/com/ge/mdm/tools/common/SheetEntityManager.java
index 7ebaf7a..efc7827 100644
--- a/common/src/main/java/com/ge/mdm/tools/common/SheetEntityManager.java
+++ b/common/src/main/java/com/ge/mdm/tools/common/SheetEntityManager.java
@@ -25,7 +25,6 @@
  * Read Excel files in JPA way, considering sheet as a simple database table with columns and rows.
  * First row is assumed to be header containing column names, which could be mapped to JPA @Entity.
  *
- * @author Stanislav Mamontov
  */
 public class SheetEntityManager implements EntityManager {
 
diff --git a/common/src/main/java/com/ge/mdm/tools/common/TaskExecutor.java b/common/src/main/java/com/ge/mdm/tools/common/TaskExecutor.java
index 2cfcdc7..aa87cc1 100644
--- a/common/src/main/java/com/ge/mdm/tools/common/TaskExecutor.java
+++ b/common/src/main/java/com/ge/mdm/tools/common/TaskExecutor.java
@@ -5,9 +5,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-/**
- * @author Stanislav Mamontov
- */
+
 public class TaskExecutor<T extends Runnable> {
 
     private int poolSize;
diff --git a/src/main/java/excel2db/ApplicationContextUtils.java b/src/main/java/excel2db/ApplicationContextUtils.java
new file mode 100644
index 0000000..a1ef5f4
--- /dev/null
+++ b/src/main/java/excel2db/ApplicationContextUtils.java
@@ -0,0 +1,21 @@
+package excel2db;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public class ApplicationContextUtils implements ApplicationContextAware {
+
+    private static ApplicationContext ctx;
+
+    @Override
+    public void setApplicationContext(ApplicationContext appContext)
+            throws BeansException {
+        ctx = appContext;
+
+    }
+
+    public static ApplicationContext getApplicationContext() {
+        return ctx;
+    }
+}
diff --git a/src/main/java/excel2db/ApplicationException.java b/src/main/java/excel2db/ApplicationException.java
new file mode 100644
index 0000000..b84a96d
--- /dev/null
+++ b/src/main/java/excel2db/ApplicationException.java
@@ -0,0 +1,25 @@
+package excel2db;
+
+/**
+ * Created by Andrey on 5/26/2017.
+ */
+
+public class ApplicationException extends Exception {
+    static final long serialVersionUID = 1L;
+
+    public ApplicationException() {
+        super();
+    }
+
+    public ApplicationException(String message) {
+        super(message);
+    }
+
+    public ApplicationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ApplicationException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/src/main/java/excel2db/Excel2dbTask.java b/src/main/java/excel2db/Excel2dbTask.java
index 34b9b34..9df62b6 100644
--- a/src/main/java/excel2db/Excel2dbTask.java
+++ b/src/main/java/excel2db/Excel2dbTask.java
@@ -4,8 +4,10 @@
 import java.io.IOException;
 import java.sql.SQLException;
 
-import com.ge.mdm.tools.common.ApplicationException;
+import excel2db.ApplicationException;
+import excel2db.excel2db;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.poi.ss.usermodel.Sheet;
 
 public class Excel2dbTask extends Thread {
 
@@ -16,17 +18,20 @@ public Excel2dbTask(excel2db app, File fileName) {
 
     public excel2db app;
     public File fileName;
+    private Sheet sheet;
+
+    static public Integer numberOfProcessedRows = 0;
 
     String tableName;
 
     @Override
     public void run() {
         try {
-            app.initInputFiles.initInputFiles(fileName);
 
+            sheet = app.initInputFiles.initInputFiles(fileName);
             tableName = FilenameUtils.removeExtension(fileName.getName());
-            app.createTable.createTable(tableName);
-            app.populateTable.populateTable(tableName);
+            app.createTable.createTable(sheet, tableName);
+            numberOfProcessedRows = app.populateTable.populateTable(sheet, tableName);
 
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/src/main/java/excel2db/excel2db.java b/src/main/java/excel2db/excel2db.java
index c51a08d..001b582 100644
--- a/src/main/java/excel2db/excel2db.java
+++ b/src/main/java/excel2db/excel2db.java
@@ -4,13 +4,14 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.ge.mdm.tools.common.ApplicationException;
+import excel2db.ApplicationException;
 import excel2db.service.CreateTable;
 import excel2db.service.DBConnection;
 import excel2db.service.GenerateFileList;
 import excel2db.service.InitConstants;
 import excel2db.service.InitInputFiles;
 import excel2db.service.PopulateTable;
+import excel2db.Excel2dbTask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -31,10 +32,8 @@ public excel2db(CreateTable createTable, PopulateTable populateTable) {
         this.populateTable = populateTable;
     }
 
-
     //vars are used in interface implementations
     public static Connection connection = null;
-    public static Short numberProcessedRecords = Short.valueOf((short) 0);
 
 
     // declaring variables to meet to the Spring framework convention
@@ -68,6 +67,11 @@ public static void main(String[] args) {
 
         try {
 
+
+            //for profiling, to launch the VisualVM first,
+            // then start the application by pressing the Enter
+            //System.in.read();
+
             ApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
             excel2db app = (excel2db) context.getBean("excel2db");
 
@@ -76,7 +80,8 @@ public static void main(String[] args) {
             //this way we call methods for objects that is already initialized by the Spring
             app.dbConnection.establishDBConnection();
 
-            // iterate through file name values inn properties file
+            // iterate through file name values in properties file,
+            // for each file start a new thread
             for (String fileNameValue : app.generateFileList.generateFileList()) {
                 File fileName = new File(fileNameValue);
                 taskExecutor.execute(new Excel2dbTask(app, fileName));
@@ -97,17 +102,15 @@ public static void main(String[] args) {
 
     }
 
-
     public void closeConnections() throws ApplicationException, SQLException {
-        logger.info("Closing connections");
+
         connection.close();
+        logger.info("Connections are closed");
 
-        logger.info("Closing task executor ");
         taskExecutor.shutdown();
         logger.info("Task executor is stopped");
 
-        logger.info("The process is completed");
-        logger.info("Number of processed records: " + numberProcessedRecords.toString());
+        logger.info("The process is completed. Number of processed records: " + Excel2dbTask.numberOfProcessedRows.toString());
 
     }
 
diff --git a/src/main/java/excel2db/service/CreateTable.java b/src/main/java/excel2db/service/CreateTable.java
index 3d49482..dfee94e 100644
--- a/src/main/java/excel2db/service/CreateTable.java
+++ b/src/main/java/excel2db/service/CreateTable.java
@@ -2,8 +2,10 @@
 
 import java.sql.SQLException;
 
+import org.apache.poi.ss.usermodel.Sheet;
+
 public interface CreateTable {
 
-    public void createTable(String tableName) throws SQLException;
+    public void createTable(Sheet sheet, String tableName) throws SQLException;
 
 }
diff --git a/src/main/java/excel2db/service/InitInputFiles.java b/src/main/java/excel2db/service/InitInputFiles.java
index 5baf6dd..c2bacec 100644
--- a/src/main/java/excel2db/service/InitInputFiles.java
+++ b/src/main/java/excel2db/service/InitInputFiles.java
@@ -3,7 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import com.ge.mdm.tools.common.ApplicationException;
+import excel2db.ApplicationException;
 import org.apache.poi.ss.usermodel.Sheet;
 
 public interface InitInputFiles {
diff --git a/src/main/java/excel2db/service/PopulateTable.java b/src/main/java/excel2db/service/PopulateTable.java
index 6fe97ea..6f6eb32 100644
--- a/src/main/java/excel2db/service/PopulateTable.java
+++ b/src/main/java/excel2db/service/PopulateTable.java
@@ -2,8 +2,10 @@
 
 import java.sql.SQLException;
 
+import org.apache.poi.ss.usermodel.Sheet;
+
 public interface PopulateTable {
 
-    public Integer populateTable(String tableName) throws SQLException;
+    public Integer populateTable(Sheet sheet, String tableName) throws SQLException;
 
 }
diff --git a/src/main/java/excel2db/service/impl/CreateTableOracleImpl.java b/src/main/java/excel2db/service/impl/CreateTableOracleImpl.java
new file mode 100644
index 0000000..633a033
--- /dev/null
+++ b/src/main/java/excel2db/service/impl/CreateTableOracleImpl.java
@@ -0,0 +1,19 @@
+package excel2db.service.impl;
+
+import java.sql.SQLException;
+import excel2db.service.CreateTable;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CreateTableOracleImpl implements CreateTable {
+
+    public static final Logger logger = LoggerFactory.getLogger(CreateTableOracleImpl.class);
+
+    public void createTable(Sheet sheet, String tableName) throws SQLException {
+
+        logger.info("Create table method : Oracle implementation is not covered yet");
+
+    }
+
+}
diff --git a/src/main/java/excel2db/service/impl/CreateTablePostgresImpl.java b/src/main/java/excel2db/service/impl/CreateTablePostgresImpl.java
index ae2b336..457b923 100644
--- a/src/main/java/excel2db/service/impl/CreateTablePostgresImpl.java
+++ b/src/main/java/excel2db/service/impl/CreateTablePostgresImpl.java
@@ -2,21 +2,28 @@
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
-import com.ge.mdm.tools.common.SheetEntityManager;
+//import com.ge.mdm.tools.common.SheetEntityManager;
 import excel2db.excel2db;
 import excel2db.service.CreateTable;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class CreateTablePostgresImpl implements CreateTable {
 
     public static final Logger logger = LoggerFactory.getLogger(CreateTablePostgresImpl.class);
-    private SheetEntityManager sheetEntityManager;
+    //private SheetEntityManager sheetEntityManager;
 
-    public void createTable(String tableName) throws SQLException {
+    public void createTable(Sheet sheet, String tableName) throws SQLException {
+
+        //sheetEntityManager = new SheetEntityManager(sheet);
+        //initializing var for a header
+        Map<String, Integer> header = new LinkedHashMap<>();
+        header = InitInputFilesImpl.readSheetHeader(sheet);
 
-        sheetEntityManager = new SheetEntityManager(InitInputFilesImpl.sheet);
 
         //dropping statement
         String sqlTableDropStatement = "DROP TABLE IF EXISTS \"" +
@@ -26,7 +33,7 @@ public void createTable(String tableName) throws SQLException {
         StringBuilder sqlTableCreateStatement = new StringBuilder();
         sqlTableCreateStatement.append("CREATE TABLE \"" +
                 tableName + "\"(");
-        for (String headerColumnName : sheetEntityManager.header.keySet()) {
+        for (String headerColumnName : header.keySet()) {
             sqlTableCreateStatement.append("\"" + headerColumnName + "\"" + " text, ");
         }
 
diff --git a/src/main/java/excel2db/service/impl/DBConnectionPostgresImpl.java b/src/main/java/excel2db/service/impl/DBConnectionPostgresImpl.java
index 50287c6..8c4d1f5 100644
--- a/src/main/java/excel2db/service/impl/DBConnectionPostgresImpl.java
+++ b/src/main/java/excel2db/service/impl/DBConnectionPostgresImpl.java
@@ -27,7 +27,6 @@ public class DBConnectionPostgresImpl implements DBConnection {
     @Value("${db.database}")
     String dbDatabase;
 
-
     public static final Logger logger = LoggerFactory.getLogger(DBConnectionPostgresImpl.class);
 
     public void establishDBConnection() {
diff --git a/src/main/java/excel2db/service/impl/InitInputFilesImpl.java b/src/main/java/excel2db/service/impl/InitInputFilesImpl.java
index f297c39..f089c26 100644
--- a/src/main/java/excel2db/service/impl/InitInputFilesImpl.java
+++ b/src/main/java/excel2db/service/impl/InitInputFilesImpl.java
@@ -2,14 +2,19 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
-import com.ge.mdm.tools.common.ApplicationException;
+import excel2db.ApplicationException;
 import excel2db.service.InitInputFiles;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -99,5 +104,38 @@ private static Workbook createWorkbook(NPOIFSFileSystem pkg) throws ApplicationE
         }
     }
 
+    public static Map<String, Integer> readSheetHeader(Sheet sheet) {
+        // first row is always considered as header
+        Row firstRow = sheet.getRow(sheet.getFirstRowNum());
+        if(firstRow == null) {
+            throw new IllegalArgumentException("Sheet is empty");
+        }
+
+        Map<String, Integer> header = new LinkedHashMap<String, Integer>();
+
+        Iterator<Cell> it = firstRow.cellIterator();
+
+        while(it.hasNext()) {
+            Cell cell = it.next();
+
+            if(cell.getCellType() == Cell.CELL_TYPE_STRING) {
+                String name = cell.getStringCellValue();
+                if(! name.equals("")) {
+                    name = name.toUpperCase();
+                    if(! header.containsKey(name)) {
+                        header.put(name, cell.getColumnIndex());
+                    } else {
+                        logger.warn("Ignoring duplicate header name {} at ({}, {})",
+                                name, cell.getRowIndex(), cell.getColumnIndex());
+                    }
+                }
+            } else {
+                logger.warn("Ignoring header cell with non-string type {} at ({}, {})",
+                        cell.getCellType(), cell.getRowIndex(), cell.getColumnIndex());
+            }
+
+        }
+        return header;
+    }
 
 }
diff --git a/src/main/java/excel2db/service/impl/PopulateTableOracleImpl.java b/src/main/java/excel2db/service/impl/PopulateTableOracleImpl.java
new file mode 100644
index 0000000..21d117d
--- /dev/null
+++ b/src/main/java/excel2db/service/impl/PopulateTableOracleImpl.java
@@ -0,0 +1,24 @@
+package excel2db.service.impl;
+
+import java.sql.SQLException;
+import excel2db.service.PopulateTable;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PopulateTableOracleImpl implements PopulateTable {
+
+    public static final Logger logger = LoggerFactory.getLogger(PopulateTablePostgresImpl.class);
+
+    private Integer numOfProcessedRows = 0;
+
+    public Integer populateTable(Sheet sheet, String tableName)
+            throws SQLException {
+
+        logger.info("Populate table method : Oracle implementation is not covered yet");
+
+        return numOfProcessedRows;
+
+    }
+
+}
diff --git a/src/main/java/excel2db/service/impl/PopulateTablePostgresImpl.java b/src/main/java/excel2db/service/impl/PopulateTablePostgresImpl.java
index 2a4ed4f..3f868e1 100644
--- a/src/main/java/excel2db/service/impl/PopulateTablePostgresImpl.java
+++ b/src/main/java/excel2db/service/impl/PopulateTablePostgresImpl.java
@@ -8,6 +8,7 @@
 import excel2db.service.PopulateTable;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,8 +19,7 @@ public class PopulateTablePostgresImpl implements PopulateTable {
     private String cellStringValue;
     private Integer numOfProcessedRows = 0;
 
-
-    public Integer populateTable(String tableName)
+    public Integer populateTable(Sheet sheet, String tableName)
             throws SQLException {
 
         Iterator<Row> rowIterator = InitInputFilesImpl.sheet.rowIterator();
@@ -34,10 +34,9 @@ public Integer populateTable(String tableName)
         while (rowIterator.hasNext()) {
 
             Row row = (Row) rowIterator.next();
-            numOfProcessedRows = numOfProcessedRows++;
 
-            Short localShort1 = excel2db.numberProcessedRecords;
-            Short localShort2 = excel2db.numberProcessedRecords = Short.valueOf((short) (excel2db.numberProcessedRecords.shortValue() + 1));
+            //count rows
+            numOfProcessedRows++;
 
             StringBuilder sqlTableInsertStatement = new StringBuilder();
             sqlTableInsertStatement.append("INSERT INTO \"" +
@@ -45,11 +44,9 @@ public Integer populateTable(String tableName)
 
             sqlTableInsertStatement.append("(");
 
-
             short minColIdx = row.getFirstCellNum();
             short maxColIdx = row.getLastCellNum();
 
-
             for (short colIdx = minColIdx; colIdx < maxColIdx; colIdx = (short) (colIdx + 1)) {
                 cellStringValue = "";
                 Cell cell = row.getCell(colIdx);
@@ -73,5 +70,4 @@ public Integer populateTable(String tableName)
 
     }
 
-
 }
diff --git a/src/main/resources/excel2db.properties b/src/main/resources/excel2db.properties
index 2c3dcc5..244c517 100644
--- a/src/main/resources/excel2db.properties
+++ b/src/main/resources/excel2db.properties
@@ -1,6 +1,17 @@
-# postgres parameters
+# names of input tables
+input.files=test-input.xls,test-input1.xls
+
+# db implementation classes
+
+# postgres section
+# dbConnectionImplenentation=excel2db.service.impl.DBConnectionPostgresImpl
+# oracle section
+dbConnectionImplenentation=excel2db.service.impl.DBConnectionOracleImpl
+
+# postgres connection parameters
 db.server=localhost
 db.database=excel2db
 db.port=5433
 db.user=postgres
 db.password=postgres
+
diff --git a/src/main/resources/spring-batch.xml b/src/main/resources/spring-batch.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/resources/spring-job.xml b/src/main/resources/spring-job.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/resources/spring.xml b/src/main/resources/spring.xml
index b2cc20f..0b600ba 100644
--- a/src/main/resources/spring.xml
+++ b/src/main/resources/spring.xml
@@ -1,35 +1,62 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+   http://www.springframework.org/schema/context
+   http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <beans xmlns="http://www.springframework.org/schema/beans"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:context="http://www.springframework.org/schema/context"
-           xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
+    <context:component-scan base-package="excel2db"/>
+    <context:property-placeholder location="classpath:excel2db.properties, file:excel2db.properties"
+                                  ignore-resource-not-found="true"/>
 
-    <context:component-scan base-package="excel2db" />
-    <context:property-placeholder location="classpath:excel2db.properties, file:excel2db.properties" ignore-resource-not-found="true"/>
 
+    <bean id="excel2db" class="excel2db.excel2db" scope="singleton">
 
-    <bean id = "excel2db" class = "excel2db.excel2db" scope="singleton">
+        <!--<property name="dbConnection" ref="dbConnection"></property>-->
         <property name="dbConnection" ref="dbConnection"></property>
-        <!--<property name="createTable" ref="createTable"></property>-->
+        <property name="initInputFiles" ref="initInputFiles"></property>
+        <property name="generateFileList" ref="generateFileList"></property>
+        <property name="initConstants" ref="initConstants"></property>
+
         <constructor-arg>
             <ref bean="createTable"/>
         </constructor-arg>
         <constructor-arg>
             <ref bean="populateTable"/>
         </constructor-arg>
+
     </bean>
 
-    <bean id = "dbConnection" class = "excel2db.service.impl.DBConnectionPostgresImpl"></bean>
 
-    <bean id = "createTable" class = "excel2db.service.impl.CreateTablePostgresImpl"></bean>
 
-    <bean id = "populateTable" class = "excel2db.service.impl.PopulateTablePostgresImpl"></bean>
+    <bean id="dbConnection" class="excel2db.service.impl.DBConnectionPostgresImpl"></bean>
+    <!--<bean id="dbConnection" class="${dbConnectionImplenentation}"></bean>-->
+
+
+    <bean id="createTable" class="excel2db.service.impl.CreateTablePostgresImpl"></bean>
+
+    <bean id="populateTable" class="excel2db.service.impl.PopulateTablePostgresImpl"></bean>
+
+    <bean id="initInputFiles" class="excel2db.service.impl.InitInputFilesImpl"></bean>
+
+    <bean id="generateFileList" class="excel2db.service.impl.GenerateFileListImpl"></bean>
+
+    <bean id="initConstants" class="excel2db.service.InitConstants"></bean>
+
+
+    <bean id="taskExecutor"
+          class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
+        <property name="corePoolSize" value="10"/>
+        <property name="maxPoolSize" value="20"/>
+        <!--<property name="queueCapacity" value="2000" />-->
+        <!--<property name="WaitForTasksToCompleteOnShutdown" value="true" />-->
+    </bean>
+
+    <bean id="applicationContextUtils" class="excel2db.ApplicationContextUtils"></bean>
 
 
 </beans>
\ No newline at end of file
diff --git a/src/test/java/InitInputFilesImplTest.java b/src/test/java/InitInputFilesImplTest.java
index 8a12445..ea19f69 100644
--- a/src/test/java/InitInputFilesImplTest.java
+++ b/src/test/java/InitInputFilesImplTest.java
@@ -1,19 +1,42 @@
+// verify if the application reads the Excel sheet by checking sheet name
+
 import java.io.File;
 
+import excel2db.ApplicationContextUtils;
 import excel2db.excel2db;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import static org.junit.Assert.assertEquals;
 
+//specify category of the class + runner
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "/spring.xml")
+@Category(JUnitInitFileCategory.class)
+@TestPropertySource("/excel2db.properties")
 public class InitInputFilesImplTest {
 
     @Test
     public void testInitInputFilesImpl() throws Exception {
 
+        //initializing application context
+        //need to check if we really need to get the spring.xml if the config is in "locations"
+//        AbstractApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
+//        ApplicationContextUtils appcontext= (ApplicationContextUtils) context.getBean("applicationContextUtils");
+//        ApplicationContext appCon = appcontext.getApplicationContext();
+//        excel2db app = (excel2db) appCon.getBean("excel2db");
+
         ApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
         excel2db app = (excel2db) context.getBean("excel2db");
+
+        //executing the test
         File fileName = new File(app.initConstants.workingDir + "/unitTest.xls");
 
         //here we should initialize the sheet object
diff --git a/src/test/java/JUnitInitFileCategory.java b/src/test/java/JUnitInitFileCategory.java
new file mode 100644
index 0000000..714a9a9
--- /dev/null
+++ b/src/test/java/JUnitInitFileCategory.java
@@ -0,0 +1,3 @@
+
+public interface JUnitInitFileCategory {
+}
diff --git a/src/test/java/JUnitPopulateTableCategory.java b/src/test/java/JUnitPopulateTableCategory.java
new file mode 100644
index 0000000..74978df
--- /dev/null
+++ b/src/test/java/JUnitPopulateTableCategory.java
@@ -0,0 +1,3 @@
+
+public interface JUnitPopulateTableCategory {
+}
diff --git a/src/test/java/JUnitSuiteInitFiles.java b/src/test/java/JUnitSuiteInitFiles.java
new file mode 100644
index 0000000..04457cd
--- /dev/null
+++ b/src/test/java/JUnitSuiteInitFiles.java
@@ -0,0 +1,15 @@
+import org.junit.experimental.categories.Categories;
+import org.junit.experimental.categories.Categories.IncludeCategory;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Categories.class)
+@IncludeCategory(JUnitInitFileCategory.class)
+@SuiteClasses({InitInputFilesImplTest.class})
+public class JUnitSuiteInitFiles {
+
+
+}
+
+
+
diff --git a/src/test/java/JUnitSuitePopulateTable.java b/src/test/java/JUnitSuitePopulateTable.java
new file mode 100644
index 0000000..58483f3
--- /dev/null
+++ b/src/test/java/JUnitSuitePopulateTable.java
@@ -0,0 +1,11 @@
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+
+@RunWith(Categories.class)
+@Categories.IncludeCategory(JUnitPopulateTableCategory.class)
+@Suite.SuiteClasses({PopulateTablePostgresImplTest.class})
+public class JUnitSuitePopulateTable {
+
+}
diff --git a/src/test/java/PopulateTablePostgresImplTest.java b/src/test/java/PopulateTablePostgresImplTest.java
index 467b684..72c1b46 100644
--- a/src/test/java/PopulateTablePostgresImplTest.java
+++ b/src/test/java/PopulateTablePostgresImplTest.java
@@ -1,16 +1,47 @@
-import excel2db.service.impl.PopulateTablePostgresImpl;
+import java.io.File;
+
+import excel2db.ApplicationContextUtils;
+import excel2db.excel2db;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
 import static org.junit.Assert.assertEquals;
 
-public class PopulateTablePostgresImplTest {
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "/spring.xml")
+@Category(JUnitPopulateTableCategory.class)
+public class PopulateTablePostgresImplTest  {
+
+    private Sheet sheet;
 
     @Test
     public void testPopulateTable() throws Exception {
-        Integer processedRows = 100;
-        PopulateTablePostgresImpl popTableObject = new PopulateTablePostgresImpl();
+
+        //initializing application context
+//        AbstractApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
+//        ApplicationContextUtils appcontext= (ApplicationContextUtils) context.getBean("applicationContextUtils");
+//        ApplicationContext appCon =appcontext.getApplicationContext();
+//        excel2db app = (excel2db) appCon.getBean("excel2db");
+
+        ApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
+        excel2db app = (excel2db) context.getBean("excel2db");
+
+        //executing the test
+        File fileName = new File(app.initConstants.workingDir + "/unitTest.xls");
+        sheet = app.initInputFiles.initInputFiles(fileName);
+        app.dbConnection.establishDBConnection();
+        app.createTable.createTable(sheet, "testTable");
 
         //here we should initialize the sheet object
-        assertEquals(processedRows, processedRows );
+        Integer numOfProcessedRows = app.populateTable.populateTable(sheet, "testTable");
+        assertEquals(Integer.valueOf(9), numOfProcessedRows);
 
     }
 }
\ No newline at end of file
diff --git a/unitTest.xls b/unitTest.xls
new file mode 100644
index 0000000000000000000000000000000000000000..3b58ff314a4824b3f08dad748785db33e05409b1
GIT binary patch
literal 22528
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

literal 0
HcmV?d00001