fix warnings

ozlerhakan · Oct 2, 2020 · 9806626 · 9806626
1 parent 311da05
commit 9806626
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 12 deletions.
diff --git a/src/main/java/com/poiji/bind/mapping/HSSFPropertyFile.java b/src/main/java/com/poiji/bind/mapping/HSSFPropertyFile.java
@@ -41,7 +41,9 @@ public <T> T returnFromExcelFile(Class<T> type) {
         try (OPCPackage open = OPCPackage.open(file, PackageAccess.READ)) {
             XSSFWorkbook xssfWorkbook = new XSSFWorkbook(open);
             PropertyHandler propertyHandler = new PropertyHandler();
-            return propertyHandler.unmarshal(type, xssfWorkbook.getProperties());
+            T ret = propertyHandler.unmarshal(type, xssfWorkbook.getProperties());
+            xssfWorkbook.close();
+            return ret;
         } catch (IOException | OpenXML4JException e) {
             throw new PoijiException("Problem occurred while reading data", e);
         }
@@ -54,7 +56,9 @@ public <T> T returnFromEncryptedFile(Class<T> type) {
             try (OPCPackage open = OPCPackage.open(stream)) {
                 XSSFWorkbook xssfWorkbook = new XSSFWorkbook(open);
                 PropertyHandler propertyHandler = new PropertyHandler();
-                return propertyHandler.unmarshal(type, xssfWorkbook.getProperties());
+                T ret =  propertyHandler.unmarshal(type, xssfWorkbook.getProperties());
+                xssfWorkbook.close();
+                return ret;
             } catch (IOException | OpenXML4JException e) {
                 IOUtils.closeQuietly(fs);
                 throw new PoijiException("Problem occurred while reading data", e);

diff --git a/src/main/java/com/poiji/bind/mapping/HSSFPropertyStream.java b/src/main/java/com/poiji/bind/mapping/HSSFPropertyStream.java
@@ -39,7 +39,9 @@ public <T> T returnFromExcelFile(Class<T> type) {
         try (OPCPackage open = OPCPackage.open(inputStream)) {
             PropertyHandler propertyHandler = new PropertyHandler();
             XSSFWorkbook xssfWorkbook = new XSSFWorkbook(open);
-            return propertyHandler.unmarshal(type, xssfWorkbook.getProperties());
+            T ret = propertyHandler.unmarshal(type, xssfWorkbook.getProperties());
+            xssfWorkbook.close();
+            return ret;
         } catch (IOException | OpenXML4JException e) {
             throw new PoijiException("Problem occurred while reading data", e);
         }
@@ -52,7 +54,9 @@ public <T> T returnFromEncryptedFile(Class<T> type) {
             try (OPCPackage open = OPCPackage.open(stream)) {
                 PropertyHandler propertyHandler = new PropertyHandler();
                 XSSFWorkbook xssfWorkbook = new XSSFWorkbook(open);
-                return propertyHandler.unmarshal(type, xssfWorkbook.getProperties());
+                T ret = propertyHandler.unmarshal(type, xssfWorkbook.getProperties());
+                xssfWorkbook.close();
+                return ret;
             } catch (IOException | OpenXML4JException e) {
                 IOUtils.closeQuietly(fs);
                 throw new PoijiException("Problem occurred while reading data", e);

diff --git a/src/main/java/com/poiji/bind/mapping/HSSFUnmarshallerFile.java b/src/main/java/com/poiji/bind/mapping/HSSFUnmarshallerFile.java
@@ -1,7 +1,6 @@
 package com.poiji.bind.mapping;
 
 import com.poiji.bind.PoijiFile;
-import com.poiji.bind.Unmarshaller;
 import com.poiji.exception.PoijiException;
 import com.poiji.option.PoijiOptions;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -13,7 +12,7 @@
  *
  * Created by hakan on 16/01/2017.
  */
-final class HSSFUnmarshallerFile extends HSSFUnmarshaller implements Unmarshaller {
+final class HSSFUnmarshallerFile extends HSSFUnmarshaller {
 
     private final PoijiFile<?> poijiFile;
 

diff --git a/src/main/java/com/poiji/bind/mapping/HSSFUnmarshallerStream.java b/src/main/java/com/poiji/bind/mapping/HSSFUnmarshallerStream.java
@@ -1,7 +1,6 @@
 package com.poiji.bind.mapping;
 
 import com.poiji.bind.PoijiInputStream;
-import com.poiji.bind.Unmarshaller;
 import com.poiji.exception.PoijiException;
 import com.poiji.option.PoijiOptions;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -12,7 +11,7 @@
 /**
  * Created by hakan on 08/03/2018.
  */
-final class HSSFUnmarshallerStream extends HSSFUnmarshaller implements Unmarshaller {
+final class HSSFUnmarshallerStream extends HSSFUnmarshaller {
 
     private final PoijiInputStream<?> poijiInputStream;
 

diff --git a/src/main/java/com/poiji/bind/mapping/PoijiHandler.java b/src/main/java/com/poiji/bind/mapping/PoijiHandler.java
@@ -84,6 +84,7 @@ private Object getInstance(Field field) {
         return ins;
     }
 
+    @SuppressWarnings("unchecked")
     private boolean setValue(String content, Class<? super T> type, int column) {
         Stream.of(type.getDeclaredFields())
                 .filter(field -> field.getAnnotation(ExcelUnknownCells.class) == null)
@@ -122,7 +123,7 @@ private boolean setValue(String content, Class<? super T> type, int column) {
                                 excelUnknownCellsMap = new HashMap<>();
                                 ReflectUtil.setFieldData(field, excelUnknownCellsMap, instance);
                             } else {
-                                excelUnknownCellsMap = (Map) field.get(instance);
+                                excelUnknownCellsMap = (Map<String, String>) field.get(instance);
                             }
                             excelUnknownCellsMap.put(titlePerColumnIndex.get(column), content);
                         } catch (IllegalAccessException e) {

diff --git a/src/main/java/com/poiji/config/DefaultCasting.java b/src/main/java/com/poiji/config/DefaultCasting.java
@@ -189,7 +189,7 @@ private LocalDateTime localDateTimeValue(String value, String sheetName, int row
     }
 
 
-    private Object enumValue(String value, String sheetName, int row, int col, Class type) {
+    private Object enumValue(String value, String sheetName, int row, int col, Class<?> type) {
         return Arrays.stream(type.getEnumConstants())
                 .filter(o -> ((Enum<?>) o).name().equals(value))
                 .findFirst()

diff --git a/src/main/java/com/poiji/exception/HeaderMissingException.java b/src/main/java/com/poiji/exception/HeaderMissingException.java
@@ -4,6 +4,7 @@
  * Exception thrown if namedHeaderMandatory is set in the options, but a header specified in an @ExcelCellName
  * is missing in the sheet.
  */
+@SuppressWarnings("serial")
 public class HeaderMissingException extends PoijiException {
     public HeaderMissingException(String message) {
         super(message);

diff --git a/src/main/java/com/poiji/parser/BooleanParser.java b/src/main/java/com/poiji/parser/BooleanParser.java
@@ -25,7 +25,7 @@ public Boolean parse(String value) {
 
         throw new BooleanParseException(value);
     }
-
+    @SuppressWarnings("serial")
     public static class BooleanParseException extends RuntimeException {
         public BooleanParseException(String value) {
             super("Can't parse value to Boolean: " + value);

diff --git a/src/test/java/com/poiji/deserialize/IllegalAcessTest.java b/src/test/java/com/poiji/deserialize/IllegalAcessTest.java
@@ -8,6 +8,7 @@
 import java.io.File;
 import java.util.List;
 
+@SuppressWarnings("unused")
 public class IllegalAcessTest {
 
     @Test(expected = IllegalCastException.class)

diff --git a/src/test/java/com/poiji/deserialize/PoijiOptionsTest.java b/src/test/java/com/poiji/deserialize/PoijiOptionsTest.java
@@ -12,6 +12,7 @@
 /**
  * Created by hakan on 19.07.2020
  */
+@SuppressWarnings("unused")
 public class PoijiOptionsTest {
 
     @Test(expected = PoijiException.class)

diff --git a/src/test/java/com/poiji/util/DecimalSeparatorParseTest.java b/src/test/java/com/poiji/util/DecimalSeparatorParseTest.java
@@ -24,7 +24,6 @@ public class DecimalSeparatorParseTest {
 
     private static class Row {
 
-        @SuppressWarnings("unused")
         @ExcelCellName("decimalNumber")
         private double decimalNumber;