Clean up the code

hprange · Sep 3, 2020 · c7980eb · c7980eb
1 parent de408b3
commit c7980eb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/src/main/java/com/woreports/jasper/data/JasperEOBatchDataSource.java b/src/main/java/com/woreports/jasper/data/JasperEOBatchDataSource.java
@@ -48,7 +48,7 @@
  * @author <a href="mailto:hprange@gmail.com">Henrique Prange</a>
  */
 public class JasperEOBatchDataSource implements JRDataSource, JRRewindableDataSource {
-    private final ERXFetchSpecificationBatchIterator iterator;
+    private final ERXFetchSpecificationBatchIterator<NSDictionary<String, Object>> iterator;
 
     private NSDictionary<String, Object> row;
 
@@ -80,7 +80,7 @@ public JasperEOBatchDataSource(EOEditingContext editingContext, String entityNam
             fetchSpecification.setRawRowKeyPaths(keyPaths);
         }
 
-        iterator = new ERXFetchSpecificationBatchIterator(fetchSpecification, editingContext);
+        iterator = new ERXFetchSpecificationBatchIterator<>(fetchSpecification, editingContext);
 
     }
 
@@ -97,12 +97,11 @@ public void moveFirst() throws JRException {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public boolean next() throws JRException {
         boolean hasNext = iterator.hasNext();
 
         if (hasNext) {
-            row = (NSDictionary<String, Object>) iterator.next();
+            row = iterator.next();
         }
 
         return hasNext;

diff --git a/src/main/java/com/woreports/jasper/data/JasperEOGlobaIDDataSource.java b/src/main/java/com/woreports/jasper/data/JasperEOGlobaIDDataSource.java
@@ -41,7 +41,6 @@ public JasperEOGlobaIDDataSource(ERXEC.Factory editingContextFactory, NSArray<EO
         this.globalIds = globalIds;
     }
 
-    @SuppressWarnings("unchecked")
     private JasperKeyValueDataSource dataSource() {
         if (dataSource == null) {
             EOEditingContext editingContext = editingContextFactory._newEditingContext();

diff --git a/src/test/java/com/woreports/jasper/TestJasperReportInput.java b/src/test/java/com/woreports/jasper/TestJasperReportInput.java
@@ -8,7 +8,6 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.woreports.jasper.JasperReportInput;
 import com.woreports.jasper.stubs.JRStubDataSource;
 
 /**

diff --git a/src/test/java/com/woreports/jasper/TestJasperReportProcessor.java b/src/test/java/com/woreports/jasper/TestJasperReportProcessor.java
@@ -9,8 +9,6 @@
 import org.mockito.runners.MockitoJUnitRunner;
 
 import com.woreports.api.ReportModel;
-import com.woreports.jasper.JasperReportProcessor;
-import com.woreports.jasper.JasperReportRecipeFactory;
 
 /**
  * @author <a href="mailto:hprange@gmail.com">Henrique Prange</a>