fixed findbugs issues

locationtech · Aug 30, 2018 · 78be43d · 78be43d
1 parent a3f02d9
commit 78be43d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...s/raster/src/main/java/mil/nga/giat/geowave/adapter/raster/adapter/RasterDataAdapter.java b/...s/raster/src/main/java/mil/nga/giat/geowave/adapter/raster/adapter/RasterDataAdapter.java
@@ -90,6 +90,7 @@
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.PrecisionModel;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import mil.nga.giat.geowave.adapter.raster.FitToIndexGridCoverage;
 import mil.nga.giat.geowave.adapter.raster.RasterUtils;
 import mil.nga.giat.geowave.adapter.raster.Resolution;
@@ -454,6 +455,7 @@ public RasterDataAdapter(
 		init();
 	}
 
+	@SuppressFBWarnings
 	private static void staticInit() {
 		// check outside of synchronized block to optimize performance
 		if (!classInit) {

diff --git a/...r/src/main/java/mil/nga/giat/geowave/adapter/raster/util/SampleModelPersistenceUtils.java b/...r/src/main/java/mil/nga/giat/geowave/adapter/raster/util/SampleModelPersistenceUtils.java
@@ -19,6 +19,7 @@
 import com.google.common.primitives.Ints;
 import com.google.protobuf.InvalidProtocolBufferException;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import mil.nga.giat.geowave.adapter.raster.adapter.RasterDataAdapter;
 import mil.nga.giat.geowave.adapter.raster.protobuf.SampleModelProtos;
 
@@ -392,8 +393,8 @@ private long getBufferSize() {
 
 			long size = 0;
 			if (maxBandOff >= 0) size += maxBandOff + 1;
-			if (pixelStride > 0) size += pixelStride * (width - 1);
-			if (scanlineStride > 0) size += scanlineStride * (height - 1);
+			if (pixelStride > 0) size += (long) pixelStride * (width - 1);
+			if (scanlineStride > 0) size += (long) scanlineStride * (height - 1);
 			return size;
 		}
 
@@ -1563,6 +1564,7 @@ public double[] getPixels(
 		 * Returns a <code>String</code> containing the values of all valid
 		 * fields.
 		 */
+		@SuppressFBWarnings
 		public String toString() {
 			String ret = "ComponentSampleModelJAI: " + "  dataType=" + this.getDataType() + "  numBands="
 					+ this.getNumBands() + "  width=" + this.getWidth() + "  height=" + this.getHeight()