VDYP-168: FIPStart data validation

.github/workflows/maven.yml

@@ -22,6 +22,8 @@ jobs:
 
  steps:
  - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
  - name: Set up JDK 17
  uses: actions/setup-java@v3
  with:
@@ -44,7 +46,6 @@ jobs:
  run: mvn -Pcoverage package verify
  - name: Run Sonar Analysis
  run: mvn sonar:sonar
- -Pcoverage
  -Dsonar.host.url=https://sonarcloud.io
  -Dsonar.organization=bcgov-sonarcloud
  -Dsonar.projectKey=bcgov_VDYP

.gitignore

@@ -237,3 +237,6 @@ $RECYCLE.BIN/
 *.lnk
 
 # End of https://www.toptal.com/developers/gitignore/api/java,emacs,linux,maven,eclipse,windows,macos
+
+# nohup logs
+nohup.out

pom.xml

@@ -12,13 +12,13 @@
  <properties>
 
  <maven.compiler.release>17</maven.compiler.release>
- 
+
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
  <junit.version>5.9.2</junit.version>
  <hamcrest.version>2.2</hamcrest.version>
  <easymock.version>5.1.0</easymock.version>
- 
+
  </properties>
 
  <modules>
@@ -29,14 +29,37 @@
 
  <dependencyManagement>
  <dependencies>
-
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-engine</artifactId>
  <version>${junit.version}</version>
  <scope>test</scope>
  </dependency>
 
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
  <dependency>
  <groupId>org.hamcrest</groupId>
  <artifactId>hamcrest</artifactId>
@@ -115,6 +138,7 @@
  </execution>
  </executions>
  </plugin>
+
  </plugins>
 
  </build>

report-aggregate/pom.xml

@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>ca.bc.gov.nrs.vdyp</groupId>
+ <artifactId>report-aggregate</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>Variable Density Yield Project - Report Aggregation</name>
+ <description>Aggregate Coverage Report</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>vdyp-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>vdyp-fip</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>report-aggregate</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>report-aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>

vdyp-core/pom.xml

@@ -14,6 +14,40 @@
  <version>0.0.1-SNAPSHOT</version>
  </parent>
 
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
  <build>
  <pluginManagement>
  <plugins>
@@ -28,6 +62,17 @@
  </dependency>
  </dependencies>
  </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
  </plugins>
  </pluginManagement>
  </build>

vdyp-core/src/main/java/ca/bc/gov/nrs/vdyp/common/ExpectationDifference.java

@@ -0,0 +1,66 @@
+package ca.bc.gov.nrs.vdyp.common;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * The difference between a set of values and what they are expaected to be
+ *
+ * @author Kevin Smith, Vivid Solutions
+ *
+ * @param <T>
+ */
+public class ExpectationDifference<T> {
+ final Set<T> missing;
+ final Set<T> unexpected;
+
+ public ExpectationDifference(Set<T> missing, Set<T> unexpected) {
+ super();
+ this.missing = missing;
+ this.unexpected = unexpected;
+ }
+
+ /**
+ * Find the missing and expected values in a collections of values.
+ *
+ * @param <U>
+ * @param values
+ * @param expected
+ * @return
+ */
+ public static <U> ExpectationDifference<U> difference(Collection<U> values, Collection<U> expected) {
+ var missing = new HashSet<U>(expected);
+ missing.removeAll(values);
+ var unexpected = new HashSet<U>(values);
+ unexpected.removeAll(expected);
+ return new ExpectationDifference<U>(missing, unexpected);
+ }
+
+ /**
+ * Which values are missing
+ *
+ * @return
+ */
+ public Set<T> getMissing() {
+ return missing;
+ }
+
+ /**
+ * Which values were unexpected
+ *
+ * @return
+ */
+ public Set<T> getUnexpected() {
+ return unexpected;
+ }
+
+ /**
+ * Were the values as expected
+ *
+ * @return
+ */
+ public boolean isSame() {
+ return getMissing().isEmpty() && getUnexpected().isEmpty();
+ }
+}

vdyp-core/src/main/java/ca/bc/gov/nrs/vdyp/common/Utils.java

@@ -0,0 +1,26 @@
+package ca.bc.gov.nrs.vdyp.common;
+
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+public class Utils {
+
+ /**
+ * Returns a singleton set containing the value if it's not null, otherwise an
+ * empty set
+ *
+ * @param <T>
+ * @param value
+ * @return
+ */
+ public static <T> Set<T> singletonOrEmpty(@Nullable T value) {
+ if (Objects.isNull(value)) {
+ return Collections.emptySet();
+ }
+ return Collections.singleton(value);
+ }
+
+}