cleanup

TomBlock · TomBlock · commit b043ce927f15 · 2021-07-21T09:50:17.000+02:00
diff --git a/core/src/main/java/com/bc/fiduceo/archive/Archive.java b/core/src/main/java/com/bc/fiduceo/archive/Archive.java
@@ -42,7 +42,7 @@ public class Archive {
     private final HashMap<String, String[]> pathMaps;
     private final String[] defaultPath;
 
-    private Path rootPath;
+    private final Path rootPath;
 
     public Archive(ArchiveConfig config) {
         rootPath = config.getRootPath();
@@ -117,7 +117,7 @@ public Path[] get(Date startDate, Date endDate, String processingVersion, String
             final Path productsDir = createValidProductPath(processingVersion, sensorType, year, month, day);
 
             if (Files.exists(productsDir)) {
-                log.info("The product directory: " + productsDir.toString());
+                log.info("The product directory: " + productsDir);
                 final Iterator<Path> iterator = Files.list(productsDir).iterator();
                 while (iterator.hasNext()) {
                     final Path next = iterator.next();
@@ -129,7 +129,7 @@ public Path[] get(Date startDate, Date endDate, String processingVersion, String
                     pathArrayList.add(next);
                 }
             } else {
-                log.warning("The directory doest not exist: " + productsDir.toString());
+                log.warning("The directory doest not exist: " + productsDir);
             }
             utcCalendar.add(Calendar.DAY_OF_MONTH, 1);
         }
diff --git a/core/src/main/java/com/bc/fiduceo/geometry/s2/BcS2MultiLineString.java b/core/src/main/java/com/bc/fiduceo/geometry/s2/BcS2MultiLineString.java
@@ -29,7 +29,7 @@
 
 class BcS2MultiLineString implements MultiLineString {
 
-    private List<S2Polyline> s2PolylineList;
+    private final List<S2Polyline> s2PolylineList;
 
 
     BcS2MultiLineString(List<S2Polyline> s2Polylines) {
diff --git a/core/src/main/java/com/bc/fiduceo/geometry/s2/BcS2MultiPolygon.java b/core/src/main/java/com/bc/fiduceo/geometry/s2/BcS2MultiPolygon.java
@@ -32,7 +32,7 @@
  * @author muhammad.bc
  */
 class BcS2MultiPolygon implements MultiPolygon {
-    private List<Polygon> polygonList;
+    private final List<Polygon> polygonList;
 
     BcS2MultiPolygon(List<Polygon> polygonList) {
         this.polygonList = polygonList;
@@ -90,7 +90,7 @@ public Point[] getCoordinates() {
             pointList.addAll(polygonPointList);
 
         }
-        return pointList.toArray(new Point[pointList.size()]);
+        return pointList.toArray(new Point[0]);
     }
 
     @Override
diff --git a/core/src/main/java/com/bc/fiduceo/geometry/s2/BcS2TimeAxis.java b/core/src/main/java/com/bc/fiduceo/geometry/s2/BcS2TimeAxis.java
@@ -32,7 +32,7 @@
 class BcS2TimeAxis implements TimeAxis {
 
     private final S2Polyline polyline;
-    private LineString originalGeometry;
+    private final LineString originalGeometry;
     private final double invLength;
     private final Date startTime;
     private final long timeInterval;
diff --git a/core/src/main/java/com/bc/fiduceo/reader/airs/AIRS_L1B_Reader.java b/core/src/main/java/com/bc/fiduceo/reader/airs/AIRS_L1B_Reader.java
@@ -225,19 +225,8 @@ public ArrayInt.D2 readAcquisitionTime(int x, int y, Interval interval) throws I
         final int targetFillValue = NetCDFUtils.getDefaultFillValue(int.class).intValue();
         final String variableName = "Time";
         final Array taiSeconds = readRaw(x, y, interval, variableName);
-        final Array utcSecondsSince1970 = Array.factory(DataType.INT, taiSeconds.getShape());
         final Number fillValue = fillValueMap.get(variableName);
-        for (int i = 0; i < taiSeconds.getSize(); i++) {
-            double val = taiSeconds.getDouble(i);
-            final int targetVal;
-            if (fillValue.equals(val)) {
-                targetVal = targetFillValue;
-            } else {
-                targetVal = (int) Math.round(TimeUtils.tai1993ToUtcInstantSeconds(val));
-            }
-            utcSecondsSince1970.setInt(i, targetVal);
-        }
-        return (ArrayInt.D2) utcSecondsSince1970;
+        return TimeUtils.tai1993ToUtc(taiSeconds, fillValue, targetFillValue);
     }
 
     @Override
diff --git a/core/src/main/java/com/bc/fiduceo/reader/caliop/CALIOP_L2_VFM_Reader.java b/core/src/main/java/com/bc/fiduceo/reader/caliop/CALIOP_L2_VFM_Reader.java
@@ -221,18 +221,7 @@ public ArrayInt.D2 readAcquisitionTime(int x, int y, Interval interval) throws I
         final Number fillValue = getFillValue(variableName);
         final Array taiSeconds = readRaw(x, y, interval, variableName).reshapeNoCopy(new int[]{interval.getY(), interval.getX()});
         final int targetFillValue = NetCDFUtils.getDefaultFillValue(int.class).intValue();
-        final Array utcSecondsSince1970 = Array.factory(DataType.INT, taiSeconds.getShape());
-        for (int i = 0; i < taiSeconds.getSize(); i++) {
-            double val = taiSeconds.getDouble(i);
-            final int targetVal;
-            if (fillValue.equals(val)) {
-                targetVal = targetFillValue;
-            } else {
-                targetVal = (int) Math.round(TimeUtils.tai1993ToUtcInstantSeconds(val));
-            }
-            utcSecondsSince1970.setInt(i, targetVal);
-        }
-        return (ArrayInt.D2) utcSecondsSince1970;
+        return TimeUtils.tai1993ToUtc(taiSeconds, fillValue, targetFillValue);
     }
 
     @Override
diff --git a/core/src/main/java/com/bc/fiduceo/reader/caliop/CALIOP_SST_WP100_CLay_Reader.java b/core/src/main/java/com/bc/fiduceo/reader/caliop/CALIOP_SST_WP100_CLay_Reader.java
@@ -147,18 +147,7 @@ public ArrayInt.D2 readAcquisitionTime(int x, int y, Interval interval) throws I
         final String variableName = "Profile_Time";
         final Number fillValue = getFillValue(variableName);
         final Array taiSeconds = readRaw(x, y, interval, variableName).reshapeNoCopy(new int[]{interval.getY(), interval.getX()});
-        final Array utcSecondsSince1970 = Array.factory(DataType.INT, taiSeconds.getShape());
-        for (int i = 0; i < taiSeconds.getSize(); i++) {
-            double val = taiSeconds.getDouble(i);
-            final int targetVal;
-            if (fillValue.equals(val)) {
-                targetVal = targetFillValue;
-            } else {
-                targetVal = (int) Math.round(TimeUtils.tai1993ToUtcInstantSeconds(val));
-            }
-            utcSecondsSince1970.setInt(i, targetVal);
-        }
-        return (ArrayInt.D2) utcSecondsSince1970;
+        return TimeUtils.tai1993ToUtc(taiSeconds, fillValue, targetFillValue);
     }
 
     @Override
diff --git a/core/src/main/java/com/bc/fiduceo/reader/fiduceo_fcdr/AVHRR_FCDR_Reader.java b/core/src/main/java/com/bc/fiduceo/reader/fiduceo_fcdr/AVHRR_FCDR_Reader.java
@@ -25,7 +25,7 @@ public class AVHRR_FCDR_Reader extends FCDR_Reader {
 
     // these variables do not have dimensionality that can be handled by the core MMS engine. They need to be
     // transferred using a post-processing step tb 2019-01-08
-    private static String[] VARIABLE_NAMES_TO_REMOVE = {"SRF_wavelengths",
+    private static final String[] VARIABLE_NAMES_TO_REMOVE = {"SRF_wavelengths",
             "SRF_weights",
             "channel",
             "channel_correlation_matrix_common",
diff --git a/core/src/main/java/com/bc/fiduceo/reader/modis/BowTiePixelLocator.java b/core/src/main/java/com/bc/fiduceo/reader/modis/BowTiePixelLocator.java
@@ -50,7 +50,7 @@ class BowTiePixelLocator implements PixelLocator {
     private int sceneWidth;
     private int sceneHeight;
     private int listSize;
-    private int stripHeight;
+    private final int stripHeight;
 
 
     BowTiePixelLocator(Array longitudes, Array latitudes, GeometryFactory geometryFactory, int stripHeight) throws IOException {
diff --git a/core/src/main/java/com/bc/fiduceo/util/TempFileUtils.java b/core/src/main/java/com/bc/fiduceo/util/TempFileUtils.java
@@ -39,8 +39,8 @@ public TempFileUtils() {
         this(System.getProperty("java.io.tmpdir"));
     }
 
-    public TempFileUtils(String testDir) {
-        tempDir = new File(testDir);
+    public TempFileUtils(String tempDir) {
+        this.tempDir = new File(tempDir);
         validateTempDir();
         tempFileList = new ArrayList<>();
         keepAfterCleanup = false;
diff --git a/core/src/main/java/com/bc/fiduceo/util/TimeUtils.java b/core/src/main/java/com/bc/fiduceo/util/TimeUtils.java
@@ -21,6 +21,9 @@
 package com.bc.fiduceo.util;
 
 import org.esa.snap.core.datamodel.ProductData;
+import ucar.ma2.Array;
+import ucar.ma2.ArrayInt;
+import ucar.ma2.DataType;
 
 import java.sql.Timestamp;
 import java.text.ParseException;
@@ -35,7 +38,7 @@ public class TimeUtils {
     private static final double MILLIS_PER_DAY = 86400000.0;
     private static final long TAI_REFERENCE_SECONDS = 725846400L;   // 1993-01-01T00:00:00 as UTC since Epoch
 
-    private static ThreadLocal<Calendar> calendarThreadLocal = new CalendarThreadLocal();
+    private static final ThreadLocal<Calendar> calendarThreadLocal = new CalendarThreadLocal();
 
     public static final long millisSince1978;
     public static final int secondsSince1978;
@@ -180,6 +183,23 @@ public static double tai1993ToUtcInstantSeconds(double taiSeconds) {
         return taiInstant - getTaiToUtcOffset(taiInstant);
     }
 
+    public static ArrayInt.D2 tai1993ToUtc(Array taiSeconds, Number fillValue, int targetFillValue) {
+        final Array utcSecondsSince1970 = Array.factory(DataType.INT, taiSeconds.getShape());
+
+        for (int i = 0; i < taiSeconds.getSize(); i++) {
+            double val = taiSeconds.getDouble(i);
+            final int targetVal;
+            if (fillValue.equals(val)) {
+                targetVal = targetFillValue;
+            } else {
+                targetVal = (int) Math.round(TimeUtils.tai1993ToUtcInstantSeconds(val));
+            }
+            utcSecondsSince1970.setInt(i, targetVal);
+        }
+
+        return (ArrayInt.D2) utcSecondsSince1970;
+    }
+
     public static Date getDate(int year, int dayOfYear, int millisecsInDay) {
         final Calendar calendar = getUTCCalendar();
         calendar.set(Calendar.YEAR, year);
diff --git a/core/src/test/java/com/bc/fiduceo/archive/ArchiveTest.java b/core/src/test/java/com/bc/fiduceo/archive/ArchiveTest.java
@@ -38,9 +38,10 @@
 
 public class ArchiveTest {
 
+    private final static String processingVersion = "1.0";
+    private final static String sensorType = "amsub";
+
     private Archive archive;
-    private String processingVersion = "1.0";
-    private String sensorType = "amsub";
     private Path root;
     private String separator;
 
diff --git a/core/src/test/java/com/bc/fiduceo/util/TimeUtilsTest.java b/core/src/test/java/com/bc/fiduceo/util/TimeUtilsTest.java
@@ -22,6 +22,9 @@
 
 import com.bc.fiduceo.TestUtil;
 import org.junit.Test;
+import ucar.ma2.Array;
+import ucar.ma2.ArrayInt;
+import ucar.ma2.DataType;
 
 import java.sql.Timestamp;
 import java.util.Calendar;
@@ -231,4 +234,40 @@ public void testGetEndOfMonth() {
         endOfMonth = TimeUtils.getEndOfMonth(date);
         TestUtil.assertCorrectUTCDate(2010, 8, 31, 23, 59, 59, 999, endOfMonth);
     }
+
+    @Test
+    public void testTai1993ToUtc_array() {
+        final Array taiSeconds = Array.factory(DataType.DOUBLE, new int[]{3, 2}, new double[]{5.370609313595469E8, 5.37060958026189E8,
+                5.3706098469286E8, 5.370610113595469E8,
+                5.37061038026204E8, 5.3706106469286E8
+        });
+
+        final ArrayInt.D2 unixEpoch = TimeUtils.tai1993ToUtc(taiSeconds, 0.0, 0);
+        final int[] shape = unixEpoch.getShape();
+        assertEquals(2, shape.length);
+        assertEquals(3, shape[0]);
+        assertEquals(2, shape[1]);
+
+        assertEquals(1262907297, unixEpoch.getInt(0));
+        assertEquals(1262907351, unixEpoch.getInt(2));
+        assertEquals(1262907404, unixEpoch.getInt(4));
+    }
+
+    @Test
+    public void testTai1993ToUtc_array_fillValue() {
+        final Array taiSeconds = Array.factory(DataType.DOUBLE, new int[]{3, 2}, new double[]{5.370609313595469E8, 5.37060958026189E8,
+                5.3706098469286E8, Double.NaN,
+                5.37061038026204E8, 5.3706106469286E8
+        });
+
+        final ArrayInt.D2 unixEpoch = TimeUtils.tai1993ToUtc(taiSeconds, Double.NaN, -11);
+        final int[] shape = unixEpoch.getShape();
+        assertEquals(2, shape.length);
+        assertEquals(3, shape[0]);
+        assertEquals(2, shape[1]);
+
+        assertEquals(1262907297, unixEpoch.getInt(0));
+        assertEquals(-11, unixEpoch.getInt(3));
+        assertEquals(1262907404, unixEpoch.getInt(4));
+    }
 }
diff --git a/matchup-tool/src/main/java/com/bc/fiduceo/matchup/condition/ConditionEngineContext.java b/matchup-tool/src/main/java/com/bc/fiduceo/matchup/condition/ConditionEngineContext.java
@@ -32,8 +32,8 @@ public class ConditionEngineContext {
     private Date endDate;
     private Dimension primarySize;
     private Dimension primaryExtractSize;
-    private Map<String, Dimension> secondarySize = new HashMap<>();
-    private Map<String, Dimension> secondaryExtractSize = new HashMap<>();
+    private final Map<String, Dimension> secondarySize = new HashMap<>();
+    private final Map<String, Dimension> secondaryExtractSize = new HashMap<>();
 
     public Date getStartDate() {
         return startDate;

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`* @author muhammad.bc`
`33`	`33`	`*/`
`34`	`34`	`class BcS2MultiPolygon implements MultiPolygon {`
`35`		`- private List<Polygon> polygonList;`
	`35`	`+ private final List<Polygon> polygonList;`
`36`	`36`
`37`	`37`	`BcS2MultiPolygon(List<Polygon> polygonList) {`
`38`	`38`	`this.polygonList = polygonList;`
`@@ -90,7 +90,7 @@ public Point[] getCoordinates() {`
`90`	`90`	`pointList.addAll(polygonPointList);`
`91`	`91`
`92`	`92`	`}`
`93`		`- return pointList.toArray(new Point[pointList.size()]);`
	`93`	`+ return pointList.toArray(new Point[0]);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`@Override`