embulk-parser-poi_excel 0.1.7 → 0.1.10

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellValueVisitor.java

@@ -4,6 +4,7 @@ import java.text.MessageFormat;
 import java.util.List;
 
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.CellValue;
 import org.apache.poi.ss.usermodel.CreationHelper;
 import org.apache.poi.ss.usermodel.FormulaError;
@@ -17,7 +18,9 @@ import org.embulk.parser.poi_excel.PoiExcelParserPlugin.FormulaReplaceTask;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean.ErrorStrategy;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean.FormulaHandling;
+import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean.SearchMergedCell;
 import org.embulk.parser.poi_excel.visitor.embulk.CellVisitor;
+import org.embulk.parser.poi_excel.visitor.util.MergedRegionMap;
 import org.embulk.spi.Column;
 import org.embulk.spi.Exec;
 import org.embulk.spi.PageBuilder;
@@ -39,15 +42,15 @@ public class PoiExcelCellValueVisitor {
 
 		Column column = bean.getColumn();
 
-		int cellType = cell.getCellType();
+		CellType cellType = cell.getCellTypeEnum();
 		switch (cellType) {
-		case Cell.CELL_TYPE_NUMERIC:
+		case NUMERIC:
 			visitor.visitCellValueNumeric(column, cell, cell.getNumericCellValue());
 			return;
-		case Cell.CELL_TYPE_STRING:
+		case STRING:
 			visitor.visitCellValueString(column, cell, cell.getStringCellValue());
 			return;
-		case Cell.CELL_TYPE_FORMULA:
+		case FORMULA:
 			PoiExcelColumnValueType valueType = bean.getValueType();
 			if (valueType == PoiExcelColumnValueType.CELL_FORMULA) {
 				visitor.visitCellFormula(column, cell);
@@ -55,13 +58,13 @@ public class PoiExcelCellValueVisitor {
 				visitCellValueFormula(bean, cell, visitor);
 			}
 			return;
-		case Cell.CELL_TYPE_BLANK:
+		case BLANK:
 			visitCellValueBlank(bean, cell, visitor);
 			return;
-		case Cell.CELL_TYPE_BOOLEAN:
+		case BOOLEAN:
 			visitor.visitCellValueBoolean(column, cell, cell.getBooleanCellValue());
 			return;
-		case Cell.CELL_TYPE_ERROR:
+		case ERROR:
 			visitCellValueError(bean, cell, cell.getErrorCellValue(), visitor);
 			return;
 		default:
@@ -70,45 +73,72 @@ public class PoiExcelCellValueVisitor {
 	}
 
 	protected void visitCellValueBlank(PoiExcelColumnBean bean, Cell cell, CellVisitor visitor) {
-		assert cell.getCellType() == Cell.CELL_TYPE_BLANK;
+		assert cell.getCellTypeEnum() == CellType.BLANK;
 
 		Column column = bean.getColumn();
 
-		boolean search = bean.getSearchMergedCell();
-		if (!search) {
-			visitor.visitCellValueBlank(column, cell);
-			return;
+		CellRangeAddress region = findRegion(bean, cell);
+		if (region != null) {
+			Row firstRow = cell.getSheet().getRow(region.getFirstRow());
+			if (firstRow == null) {
+				visitCellNull(column);
+				return;
+			}
+			Cell firstCell = firstRow.getCell(region.getFirstColumn());
+			if (firstCell == null) {
+				visitCellNull(column);
+				return;
+			}
+
+			if (firstCell.getRowIndex() != cell.getRowIndex() || firstCell.getColumnIndex() != cell.getColumnIndex()) {
+				visitCellValue(bean, firstCell, visitor);
+				return;
+			}
+		}
+
+		visitor.visitCellValueBlank(column, cell);
+	}
+
+	protected CellRangeAddress findRegion(PoiExcelColumnBean bean, Cell cell) {
+		SearchMergedCell search = bean.getSearchMergedCell();
+		switch (search) {
+		case NONE:
+			return null;
+		case LINEAR_SEARCH:
+			return findRegionLinearSearch(bean, cell);
+		default:
+			return findRegionTreeSearch(bean, cell);
 		}
+	}
 
+	protected CellRangeAddress findRegionLinearSearch(PoiExcelColumnBean bean, Cell cell) {
+		Sheet sheet = cell.getSheet();
 		int r = cell.getRowIndex();
 		int c = cell.getColumnIndex();
 
-		Sheet sheet = cell.getSheet();
 		int size = sheet.getNumMergedRegions();
 		for (int i = 0; i < size; i++) {
-			CellRangeAddress range = visitorValue.getSheet().getMergedRegion(i);
-			if (range.isInRange(r, c)) {
-				Row firstRow = sheet.getRow(range.getFirstRow());
-				if (firstRow == null) {
-					visitCellNull(column);
-					return;
-				}
-				Cell firstCell = firstRow.getCell(range.getFirstColumn());
-				if (firstCell == null) {
-					visitCellNull(column);
-					return;
-				}
-
-				visitCellValue(bean, firstCell, visitor);
-				return;
+			CellRangeAddress region = sheet.getMergedRegion(i);
+			if (region.isInRange(r, c)) {
+				return region;
 			}
 		}
 
-		visitor.visitCellValueBlank(column, cell);
+		return null;
+	}
+
+	private final MergedRegionMap mergedRegionMap = new MergedRegionMap();
+
+	protected CellRangeAddress findRegionTreeSearch(PoiExcelColumnBean bean, Cell cell) {
+		Sheet sheet = cell.getSheet();
+		int r = cell.getRowIndex();
+		int c = cell.getColumnIndex();
+
+		return mergedRegionMap.get(sheet, r, c);
 	}
 
 	protected void visitCellValueFormula(PoiExcelColumnBean bean, Cell cell, CellVisitor visitor) {
-		assert cell.getCellType() == Cell.CELL_TYPE_FORMULA;
+		assert cell.getCellTypeEnum() == CellType.FORMULA;
 
 		FormulaHandling handling = bean.getFormulaHandling();
 		switch (handling) {
@@ -124,24 +154,24 @@ public class PoiExcelCellValueVisitor {
 	protected void visitCellValueFormulaCashedValue(PoiExcelColumnBean bean, Cell cell, CellVisitor visitor) {
 		Column column = bean.getColumn();
 
-		int cellType = cell.getCachedFormulaResultType();
+		CellType cellType = cell.getCachedFormulaResultTypeEnum();
 		switch (cellType) {
-		case Cell.CELL_TYPE_NUMERIC:
+		case NUMERIC:
 			visitor.visitCellValueNumeric(column, cell, cell.getNumericCellValue());
 			return;
-		case Cell.CELL_TYPE_STRING:
+		case STRING:
 			visitor.visitCellValueString(column, cell, cell.getStringCellValue());
 			return;
-		case Cell.CELL_TYPE_BLANK:
+		case BLANK:
 			visitCellValueBlank(bean, cell, visitor);
 			return;
-		case Cell.CELL_TYPE_BOOLEAN:
+		case BOOLEAN:
 			visitor.visitCellValueBoolean(column, cell, cell.getBooleanCellValue());
 			return;
-		case Cell.CELL_TYPE_ERROR:
+		case ERROR:
 			visitCellValueError(bean, cell, cell.getErrorCellValue(), visitor);
 			return;
-		case Cell.CELL_TYPE_FORMULA:
+		case FORMULA:
 		default:
 			throw new IllegalStateException(MessageFormat.format("unsupported POI cellType={0}", cellType));
 		}
@@ -198,24 +228,24 @@ public class PoiExcelCellValueVisitor {
 			throw new RuntimeException(MessageFormat.format("evaluate error. formula={0}", cell.getCellFormula()), e);
 		}
 
-		int cellType = cellValue.getCellType();
+		CellType cellType = cellValue.getCellTypeEnum();
 		switch (cellType) {
-		case Cell.CELL_TYPE_NUMERIC:
+		case NUMERIC:
 			visitor.visitCellValueNumeric(column, cellValue, cellValue.getNumberValue());
 			return;
-		case Cell.CELL_TYPE_STRING:
+		case STRING:
 			visitor.visitCellValueString(column, cellValue, cellValue.getStringValue());
 			return;
-		case Cell.CELL_TYPE_BLANK:
+		case BLANK:
 			visitor.visitCellValueBlank(column, cellValue);
 			return;
-		case Cell.CELL_TYPE_BOOLEAN:
+		case BOOLEAN:
 			visitor.visitCellValueBoolean(column, cellValue, cellValue.getBooleanValue());
 			return;
-		case Cell.CELL_TYPE_ERROR:
+		case ERROR:
 			visitCellValueError(bean, cellValue, cellValue.getErrorValue(), visitor);
 			return;
-		case Cell.CELL_TYPE_FORMULA:
+		case FORMULA:
 		default:
 			throw new IllegalStateException(MessageFormat.format("unsupported POI cellType={0}", cellType));
 		}

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelClientAnchorVisitor.java

@@ -40,7 +40,7 @@ public class PoiExcelClientAnchorVisitor extends AbstractPoiExcelCellAttributeVi
 		map.put("anchor_type", new AttributeSupplier<ClientAnchor>() {
 			@Override
 			public Object get(Column column, Cell cell, ClientAnchor anchor) {
-				return (long) anchor.getAnchorType();
+				return (long) anchor.getAnchorType().value;
 			}
 		});
 		map.put("col1", new AttributeSupplier<ClientAnchor>() {

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelColumnVisitor.java

@@ -3,10 +3,13 @@ package org.embulk.parser.poi_excel.visitor;
 import java.text.MessageFormat;
 
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellReference;
 import org.embulk.parser.poi_excel.PoiExcelColumnValueType;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean;
+import org.embulk.parser.poi_excel.bean.util.PoiExcelCellAddress;
 import org.embulk.parser.poi_excel.visitor.embulk.CellVisitor;
 import org.embulk.spi.Column;
 import org.embulk.spi.ColumnVisitor;
@@ -79,16 +82,44 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 	protected void visitCell(Column column, CellVisitor visitor) {
 		PoiExcelColumnBean bean = visitorValue.getColumnBean(column);
 		PoiExcelColumnValueType valueType = bean.getValueType();
+		PoiExcelCellAddress cellAddress = bean.getCellAddress();
 
 		switch (valueType) {
 		case SHEET_NAME:
-			visitor.visitSheetName(column);
+			if (cellAddress != null) {
+				Sheet sheet = cellAddress.getSheet(currentRow);
+				visitor.visitSheetName(column, sheet);
+			} else {
+				visitor.visitSheetName(column);
+			}
 			return;
 		case ROW_NUMBER:
-			visitor.visitRowNumber(column, currentRow.getRowNum() + 1);
+			int rowIndex;
+			if (cellAddress != null) {
+				Cell cell = cellAddress.getCell(currentRow);
+				if (cell == null) {
+					visitCellNull(column);
+					return;
+				}
+				rowIndex = cell.getRowIndex();
+			} else {
+				rowIndex = currentRow.getRowNum();
+			}
+			visitor.visitRowNumber(column, rowIndex + 1);
 			return;
 		case COLUMN_NUMBER:
-			visitor.visitColumnNumber(column, bean.getColumnIndex() + 1);
+			int columnIndex;
+			if (cellAddress != null) {
+				Cell cell = cellAddress.getCell(currentRow);
+				if (cell == null) {
+					visitCellNull(column);
+					return;
+				}
+				columnIndex = cell.getColumnIndex();
+			} else {
+				columnIndex = bean.getColumnIndex();
+			}
+			visitor.visitColumnNumber(column, columnIndex + 1);
 			return;
 		case CONSTANT:
 			visitCellConstant(column, bean.getValueTypeSuffix(), visitor);
@@ -98,7 +129,12 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 		}
 
 		assert valueType.useCell();
-		Cell cell = currentRow.getCell(bean.getColumnIndex());
+		Cell cell;
+		if (cellAddress != null) {
+			cell = cellAddress.getCell(currentRow);
+		} else {
+			cell = currentRow.getCell(bean.getColumnIndex());
+		}
 		if (cell == null) {
 			visitCellNull(column);
 			return;
@@ -118,13 +154,13 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 			visitCellComment(bean, cell, visitor);
 			return;
 		case CELL_TYPE:
-			visitCellType(bean, cell, cell.getCellType(), visitor);
+			visitCellType(bean, cell, cell.getCellTypeEnum(), visitor);
 			return;
 		case CELL_CACHED_TYPE:
-			if (cell.getCellType() == Cell.CELL_TYPE_FORMULA) {
-				visitCellType(bean, cell, cell.getCachedFormulaResultType(), visitor);
+			if (cell.getCellTypeEnum() == CellType.FORMULA) {
+				visitCellType(bean, cell, cell.getCachedFormulaResultTypeEnum(), visitor);
 			} else {
-				visitCellType(bean, cell, cell.getCellType(), visitor);
+				visitCellType(bean, cell, cell.getCellTypeEnum(), visitor);
 			}
 			return;
 		default:
@@ -164,7 +200,7 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 		delegator.visit(bean, cell, visitor);
 	}
 
-	private void visitCellType(PoiExcelColumnBean bean, Cell cell, int cellType, CellVisitor visitor) {
+	private void visitCellType(PoiExcelColumnBean bean, Cell cell, CellType cellType, CellVisitor visitor) {
 		PoiExcelCellTypeVisitor delegator = factory.getPoiExcelCellTypeVisitor();
 		delegator.visit(bean, cell, cellType, visitor);
 	}

data/src/main/java/org/embulk/parser/poi_excel/visitor/embulk/BooleanCellVisitor.java

@@ -38,6 +38,11 @@ public class BooleanCellVisitor extends CellVisitor {
 	@Override
 	public void visitSheetName(Column column) {
 		Sheet sheet = visitorValue.getSheet();
+		visitSheetName(column, sheet);
+	}
+
+	@Override
+	public void visitSheetName(Column column, Sheet sheet) {
 		int index = sheet.getWorkbook().getSheetIndex(sheet);
 		pageBuilder.setBoolean(column, index != 0);
 	}

data/src/main/java/org/embulk/parser/poi_excel/visitor/embulk/CellVisitor.java

@@ -3,6 +3,7 @@ package org.embulk.parser.poi_excel.visitor.embulk;
 import java.text.MessageFormat;
 
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.embulk.config.ConfigException;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean.ErrorStrategy;
@@ -40,6 +41,8 @@ public abstract class CellVisitor {
 
 	public abstract void visitSheetName(Column column);
 
+	public abstract void visitSheetName(Column column, Sheet sheet);
+
 	public abstract void visitRowNumber(Column column, int index1);
 
 	public abstract void visitColumnNumber(Column column, int index1);

data/src/main/java/org/embulk/parser/poi_excel/visitor/embulk/DoubleCellVisitor.java

@@ -45,6 +45,11 @@ public class DoubleCellVisitor extends CellVisitor {
 	@Override
 	public void visitSheetName(Column column) {
 		Sheet sheet = visitorValue.getSheet();
+		visitSheetName(column, sheet);
+	}
+
+	@Override
+	public void visitSheetName(Column column, Sheet sheet) {
 		int index = sheet.getWorkbook().getSheetIndex(sheet);
 		pageBuilder.setDouble(column, index);
 	}

data/src/main/java/org/embulk/parser/poi_excel/visitor/embulk/LongCellVisitor.java

@@ -45,6 +45,11 @@ public class LongCellVisitor extends CellVisitor {
 	@Override
 	public void visitSheetName(Column column) {
 		Sheet sheet = visitorValue.getSheet();
+		visitSheetName(column, sheet);
+	}
+
+	@Override
+	public void visitSheetName(Column column, Sheet sheet) {
 		int index = sheet.getWorkbook().getSheetIndex(sheet);
 		pageBuilder.setLong(column, index);
 	}

data/src/main/java/org/embulk/parser/poi_excel/visitor/embulk/StringCellVisitor.java

@@ -70,6 +70,11 @@ public class StringCellVisitor extends CellVisitor {
 	@Override
 	public void visitSheetName(Column column) {
 		Sheet sheet = visitorValue.getSheet();
+		visitSheetName(column, sheet);
+	}
+
+	@Override
+	public void visitSheetName(Column column, Sheet sheet) {
 		pageBuilder.setString(column, sheet.getSheetName());
 	}
 

data/src/main/java/org/embulk/parser/poi_excel/visitor/embulk/TimestampCellVisitor.java

@@ -61,6 +61,11 @@ public class TimestampCellVisitor extends CellVisitor {
 	@Override
 	public void visitSheetName(Column column) {
 		Sheet sheet = visitorValue.getSheet();
+		visitSheetName(column, sheet);
+	}
+
+	@Override
+	public void visitSheetName(Column column, Sheet sheet) {
 		doConvertError(column, sheet.getSheetName(), new UnsupportedOperationException(
 				"unsupported conversion sheet_name to Embulk timestamp"));
 	}

data/src/main/java/org/embulk/parser/poi_excel/visitor/util/MergedRegionMap.java

@@ -0,0 +1,51 @@
+package org.embulk.parser.poi_excel.visitor.util;
+
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+public class MergedRegionMap {
+
+	private final Map<Sheet, Map<Integer, Map<Integer, CellRangeAddress>>> sheetMap = new ConcurrentHashMap<>();
+
+	public CellRangeAddress get(Sheet sheet, int rowIndex, int columnIndex) {
+		Map<Integer, Map<Integer, CellRangeAddress>> rowMap = sheetMap.get(sheet);
+		if (rowMap == null) {
+			synchronized (sheet) {
+				rowMap = createRowMap(sheet);
+				sheetMap.put(sheet, rowMap);
+			}
+		}
+
+		Map<Integer, CellRangeAddress> columnMap = rowMap.get(rowIndex);
+		if (columnMap == null) {
+			return null;
+		}
+		return columnMap.get(columnIndex);
+	}
+
+	protected Map<Integer, Map<Integer, CellRangeAddress>> createRowMap(Sheet sheet) {
+		Map<Integer, Map<Integer, CellRangeAddress>> rowMap = new TreeMap<>();
+
+		for (int i = sheet.getNumMergedRegions() - 1; i >= 0; i--) {
+			CellRangeAddress region = sheet.getMergedRegion(i);
+
+			for (int r = region.getFirstRow(); r <= region.getLastRow(); r++) {
+				Map<Integer, CellRangeAddress> columnMap = rowMap.get(r);
+				if (columnMap == null) {
+					columnMap = new TreeMap<>();
+					rowMap.put(r, columnMap);
+				}
+
+				for (int c = region.getFirstColumn(); c <= region.getLastColumn(); c++) {
+					columnMap.put(c, region);
+				}
+			}
+		}
+
+		return rowMap;
+	}
+}

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin.java

@@ -1,7 +1,7 @@
 package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URL;
 import java.text.ParseException;
@@ -139,56 +139,6 @@ public class TestPoiExcelParserPlugin {
 		assertThat(r.getAsString("col-s"), is("A"));
 	}
 
-	@Theory
-	public void testSearchMergedCell_true(String excelFile) throws ParseException {
-		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
-			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
-
-			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
-			parser.set("sheet", "merged_cell");
-			parser.addColumn("a", "string");
-			parser.addColumn("b", "string");
-
-			URL inFile = getClass().getResource(excelFile);
-			List<OutputRecord> result = tester.runParser(inFile, parser);
-
-			assertThat(result.size(), is(4));
-			check6(result, 0, "test3-a1", "test3-a1");
-			check6(result, 1, "data", "0");
-			check6(result, 2, null, null);
-			check6(result, 3, null, null);
-		}
-	}
-
-	@Theory
-	public void testSearchMergedCell_false(String excelFile) throws ParseException {
-		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
-			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
-
-			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
-			parser.set("sheet", "merged_cell");
-			parser.set("search_merged_cell", false);
-			parser.addColumn("a", "string");
-			parser.addColumn("b", "string");
-
-			URL inFile = getClass().getResource(excelFile);
-			List<OutputRecord> result = tester.runParser(inFile, parser);
-
-			assertThat(result.size(), is(4));
-			check6(result, 0, "test3-a1", null);
-			check6(result, 1, "data", "0");
-			check6(result, 2, null, null);
-			check6(result, 3, null, null);
-		}
-	}
-
-	private void check6(List<OutputRecord> result, int index, String a, String b) {
-		OutputRecord r = result.get(index);
-		// System.out.println(r);
-		assertThat(r.getAsString("a"), is(a));
-		assertThat(r.getAsString("b"), is(b));
-	}
-
 	@Theory
 	public void test_sheets(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellAddress.java

@@ -0,0 +1,69 @@
+package org.embulk.parser.poi_excel;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.net.URL;
+import java.text.ParseException;
+import java.util.List;
+
+import org.embulk.parser.EmbulkPluginTester;
+import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
+import org.embulk.parser.EmbulkTestParserConfig;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
+
+@RunWith(Theories.class)
+public class TestPoiExcelParserPlugin_cellAddress {
+
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testCellAddress(String excelFile) throws ParseException {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "test1");
+			parser.set("skip_header_lines", 1);
+			parser.addColumn("text", "string").set("column_number", "D");
+			parser.addColumn("fix_value", "string").set("cell_address", "B1").set("value", "cell_value");
+			parser.addColumn("fix_sheet", "string").set("cell_address", "B1").set("value", "sheet_name");
+			parser.addColumn("fix_row", "long").set("cell_address", "B1").set("value", "row_number");
+			parser.addColumn("fix_col", "long").set("cell_address", "B1").set("value", "column_number");
+			parser.addColumn("other_sheet_value", "string").set("cell_address", "style!B5").set("value", "cell_value");
+			parser.addColumn("other_sheet_name", "string").set("cell_address", "style!B5").set("value", "sheet_name");
+			parser.addColumn("other_sheet_row", "long").set("cell_address", "style!B5").set("value", "row_number");
+			parser.addColumn("other_sheet_col", "string").set("cell_address", "style!B5").set("value", "column_number");
+
+			URL inFile = getClass().getResource(excelFile);
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(7));
+			check1(result, 0, "abc");
+			check1(result, 1, "def");
+			check1(result, 2, "456");
+			check1(result, 3, "abc");
+			check1(result, 4, "abc");
+			check1(result, 5, "true");
+			check1(result, 6, null);
+		}
+	}
+
+	private void check1(List<OutputRecord> result, int index, String text) {
+		OutputRecord record = result.get(index);
+		// System.out.println(record);
+		assertThat(record.getAsString("text"), is(text));
+		assertThat(record.getAsString("fix_value"), is("long"));
+		assertThat(record.getAsString("fix_sheet"), is("test1"));
+		assertThat(record.getAsLong("fix_row"), is(1L));
+		assertThat(record.getAsLong("fix_col"), is(2L));
+		assertThat(record.getAsString("other_sheet_value"), is("bottom"));
+		assertThat(record.getAsString("other_sheet_name"), is("style"));
+		assertThat(record.getAsLong("other_sheet_row"), is(5L));
+		assertThat(record.getAsString("other_sheet_col"), is("B"));
+	}
+}

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellComment.java

@@ -2,7 +2,7 @@ package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.net.URL;

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellError.java

@@ -2,7 +2,7 @@ package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.net.URL;

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellFont.java

@@ -2,7 +2,7 @@ package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.net.URL;