Cleanign up warnings

bcgov · Oct 28, 2024 · 8d8e1da · 8d8e1da
1 parent 96eeb56
commit 8d8e1da
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 35 deletions.
diff --git a/lib/vdyp-back/src/test/java/ca/bc/gov/nrs/vdyp/back/BackProcessingEngineTest.java b/lib/vdyp-back/src/test/java/ca/bc/gov/nrs/vdyp/back/BackProcessingEngineTest.java
@@ -6,9 +6,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
@@ -38,7 +35,6 @@
 import ca.bc.gov.nrs.vdyp.model.VdypPolygon;
 import ca.bc.gov.nrs.vdyp.model.VolumeVariable;
 import ca.bc.gov.nrs.vdyp.test.TestUtils;
-import ca.bc.gov.nrs.vdyp.test.VdypMatchers;
 
 class BackProcessingEngineTest {
 

diff --git a/lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/application/VdypProcessingApplication.java b/lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/application/VdypProcessingApplication.java
@@ -74,8 +74,6 @@ public int run(final PrintStream os, final InputStream is, final String... args)
 
 			processor.run(new FileSystemFileResolver(), new FileSystemFileResolver(), controlFileNames, getAllPasses());
 
-			System.err.println("Blah");
-
 		} catch (Exception ex) {
 			logger.error("Error during processing", ex);
 			return PROCESSING_ERROR_EXIT;
@@ -90,7 +88,7 @@ public List<String> getControlFileNamesFromUser(final PrintStream os, final Inpu
 		List<String> controlFileNames;
 		os.print(
 				MessageFormat
-						.format("Enter name of control file (or RETURN for {1}) or *name for both): ", defaultFilename)
+						.format("Enter name of control file (or RETURN for {0}) or *name for both): ", defaultFilename)
 		);
 
 		controlFileNames = new ArrayList<>();

diff --git a/lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/io/parse/model/VdypUtilizationParser.java b/lib/vdyp-common/src/main/java/ca/bc/gov/nrs/vdyp/io/parse/model/VdypUtilizationParser.java
@@ -64,7 +64,7 @@ public ControlKey getControlKey() {
 							)
 					).value(3, GENUS_INDEX, ValueParser.INTEGER) //
 					.space(1) //
-					.value(2, GENUS, ControlledValueParser.optional(ValueParser.GENUS))
+					.value(2, GENUS, ControlledValueParser.optional(ControlledValueParser.GENUS))
 					.value(3, UTILIZATION_CLASS_INDEX, ControlledValueParser.UTILIZATION_CLASS)
 					.value(9, BASAL_AREA, ValueParser.FLOAT_WITH_DEFAULT)
 					.value(9, LIVE_TREES_PER_HECTARE, ValueParser.FLOAT_WITH_DEFAULT)

diff --git a/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/application/LayerProcessingStateTest.java b/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/application/LayerProcessingStateTest.java
@@ -14,7 +14,6 @@
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 import org.hamcrest.Matcher;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;

diff --git a/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/application/ProcessorTest.java b/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/application/ProcessorTest.java
@@ -20,6 +20,7 @@
 
 class ProcessorTest {
 
+	@SuppressWarnings("unchecked")
 	@Test
 	void test() throws IOException, ResourceParseException, ProcessingException {
 

diff --git a/...yp-common/src/test/java/ca/bc/gov/nrs/vdyp/application/VdypProcessingApplicationTest.java b/...yp-common/src/test/java/ca/bc/gov/nrs/vdyp/application/VdypProcessingApplicationTest.java
@@ -24,14 +24,14 @@ class VdypProcessingApplicationTest {
 	@Nested
 	class Run {
 
-		VdypProcessingApplication app;
+		VdypProcessingApplication<?> app;
 		Processor processor;
 
 		@BeforeEach
 		void init() {
 			processor = EasyMock.createMock(Processor.class);
 
-			app = new VdypProcessingApplication() {
+			app = new VdypProcessingApplication<Processor>() {
 
 				@Override
 				public String getDefaultControlFileName() {
@@ -154,11 +154,11 @@ void testErrorWhileProcessing() throws Exception {
 	@Nested
 	class GetControlFileNamesFromUser {
 
-		VdypProcessingApplication app;
+		VdypProcessingApplication<Processor> app;
 
 		@BeforeEach
 		void init() {
-			app = new VdypProcessingApplication() {
+			app = new VdypProcessingApplication<Processor>() {
 
 				@Override
 				public String getDefaultControlFileName() {

diff --git a/...mon/src/test/java/ca/bc/gov/nrs/vdyp/io/parse/model/VdypPolygonDescriptionParserTest.java b/...mon/src/test/java/ca/bc/gov/nrs/vdyp/io/parse/model/VdypPolygonDescriptionParserTest.java
@@ -5,20 +5,15 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.NoSuchElementException;
 
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import ca.bc.gov.nrs.vdyp.io.parse.common.ResourceParseException;
-import ca.bc.gov.nrs.vdyp.model.LayerType;
-import ca.bc.gov.nrs.vdyp.model.UtilizationClass;
 import ca.bc.gov.nrs.vdyp.test.MockFileResolver;
 import ca.bc.gov.nrs.vdyp.test.TestUtils;
-import ca.bc.gov.nrs.vdyp.test.VdypMatchers;
 
 import static ca.bc.gov.nrs.vdyp.test.VdypMatchers.*;
 

diff --git a/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/io/parse/model/VdypPolygonParserTest.java b/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/io/parse/model/VdypPolygonParserTest.java
@@ -5,18 +5,13 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.NoSuchElementException;
 
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
 import ca.bc.gov.nrs.vdyp.io.parse.common.ResourceParseException;
-import ca.bc.gov.nrs.vdyp.model.LayerType;
-import ca.bc.gov.nrs.vdyp.model.UtilizationClass;
 import ca.bc.gov.nrs.vdyp.test.MockFileResolver;
 import ca.bc.gov.nrs.vdyp.test.TestUtils;
-import ca.bc.gov.nrs.vdyp.test.VdypMatchers;
 
 import static ca.bc.gov.nrs.vdyp.test.VdypMatchers.*;
 

diff --git a/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/io/parse/model/VdypSpeciesParserTest.java b/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/io/parse/model/VdypSpeciesParserTest.java
@@ -8,15 +8,12 @@
 import java.util.ArrayList;
 import java.util.NoSuchElementException;
 
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
 
 import ca.bc.gov.nrs.vdyp.io.parse.common.ResourceParseException;
 import ca.bc.gov.nrs.vdyp.io.parse.model.VdypSpeciesParser.Ages;
 import ca.bc.gov.nrs.vdyp.model.LayerType;
-import ca.bc.gov.nrs.vdyp.model.UtilizationClass;
 import ca.bc.gov.nrs.vdyp.test.MockFileResolver;
 import ca.bc.gov.nrs.vdyp.test.TestUtils;
 import ca.bc.gov.nrs.vdyp.test.VdypMatchers;

diff --git a/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/processing_state/BankTest.java b/lib/vdyp-common/src/test/java/ca/bc/gov/nrs/vdyp/processing_state/BankTest.java
@@ -8,9 +8,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeDiagnosingMatcher;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/lib/vdyp-forward/src/test/java/ca/bc/gov/nrs/vdyp/forward/test/ForwardTestUtils.java b/lib/vdyp-forward/src/test/java/ca/bc/gov/nrs/vdyp/forward/test/ForwardTestUtils.java
@@ -3,14 +3,12 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
 
 import org.opentest4j.AssertionFailedError;
 
 import ca.bc.gov.nrs.vdyp.application.VdypApplicationIdentifier;
-import ca.bc.gov.nrs.vdyp.common_calculators.BaseAreaTreeDensityDiameter;
 import ca.bc.gov.nrs.vdyp.forward.ForwardControlParser;
 import ca.bc.gov.nrs.vdyp.forward.ForwardProcessingState;
 import ca.bc.gov.nrs.vdyp.forward.model.ControlVariable;
@@ -19,10 +17,6 @@
 import ca.bc.gov.nrs.vdyp.io.parse.control.BaseControlParser;
 import ca.bc.gov.nrs.vdyp.io.parse.value.ValueParseException;
 import ca.bc.gov.nrs.vdyp.model.Region;
-import ca.bc.gov.nrs.vdyp.model.UtilizationClass;
-import ca.bc.gov.nrs.vdyp.model.UtilizationVector;
-import ca.bc.gov.nrs.vdyp.model.VdypLayer;
-import ca.bc.gov.nrs.vdyp.model.VdypSpecies;
 import ca.bc.gov.nrs.vdyp.test.TestUtils;
 
 public class ForwardTestUtils {
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
     class ProcessorTest {
+    	@SuppressWarnings("unchecked")
     	@Test
     	void test() throws IOException, ResourceParseException, ProcessingException {
@@ Expand Down @@