From b9c4496a711b53dab540873d05143a326880be8b Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Fri, 3 Feb 2017 07:46:29 +0100
Subject: [PATCH] Refactor JExcelHelper

---
 .../java/com/baeldung/excel/JExcelHelper.java | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/spring-mvc-java/src/main/java/com/baeldung/excel/JExcelHelper.java b/spring-mvc-java/src/main/java/com/baeldung/excel/JExcelHelper.java
index eb65987e8b..d0e33bf471 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/excel/JExcelHelper.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/excel/JExcelHelper.java
@@ -1,22 +1,24 @@
 package com.baeldung.excel;
 
-import jxl.*;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
+import jxl.Sheet;
+import jxl.Workbook;
+import jxl.format.Colour;
 import jxl.read.biff.BiffException;
-import java.io.File;
-import java.io.IOException;
-import org.springframework.stereotype.Service;
 import jxl.write.*;
 import jxl.write.Number;
-import jxl.format.Colour;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class JExcelHelper {
 
     public Map<Integer, ArrayList<String>> readJExcel(String fileLocation) throws IOException, BiffException {
-        Map<Integer, ArrayList<String>> data = new HashMap<Integer, ArrayList<String>>();
+        Map<Integer, ArrayList<String>> data = new HashMap<>();
 
         Workbook workbook = Workbook.getWorkbook(new File(fileLocation));
         Sheet sheet = workbook.getSheet(0);
@@ -24,7 +26,7 @@ public class JExcelHelper {
         int columns = sheet.getColumns();
 
         for (int i = 0; i < rows; i++) {
-            data.put(i, new ArrayList<String>());
+            data.put(i, new ArrayList<>());
             for (int j = 0; j < columns; j++) {
                 data.get(i).add(sheet.getCell(j, i).getContents());
             }