Updated dependencies

Author: depryf

CHANGELOG.md

@@ -1,7 +1,8 @@
 ## Validation Framework Version History
 
-**Version 4.7 (not released yet)**
+**Version 4.7**
 
+- Added new differenceInDays methods to the edits context.
 - Changed the minimum Java language for this library from Java 11 to Java 21.
 - Updated dependencies.
 

build.gradle

@@ -3,10 +3,10 @@ import com.vanniktech.maven.publish.*
 plugins {
     id 'java-library'
     id 'jacoco'
-    id 'com.vanniktech.maven.publish' version '0.34.0' // publish to Maven Central
-    id 'com.github.ben-manes.versions' version '0.52.0' // check for out-of-date dependencies (run 'dependencyUpdates' manually)
-    id 'com.github.spotbugs' version '6.4.2' // spotbugs code analysis
-    id 'org.sonarqube' version '6.3.1.5724' // sonarQube analysis
+    id 'com.vanniktech.maven.publish' version '0.35.0' // publish to Maven Central
+    id 'com.github.ben-manes.versions' version '0.53.0' // check for out-of-date dependencies (run 'dependencyUpdates' manually)
+    id 'com.github.spotbugs' version '6.4.8' // spotbugs code analysis
+    id 'org.sonarqube' version '7.2.2.6593' // sonarQube analysis
 }
 
 group = 'com.imsweb'
@@ -20,21 +20,19 @@ repositories {
 }
 
 dependencies {
-    api 'com.imsweb:staging-client-java:11.5.1'
-    api 'org.apache.groovy:groovy:4.0.27'
+    api 'com.imsweb:staging-client-java:11.8.1'
+    api 'org.apache.groovy:groovy:4.0.29'
     api 'com.thoughtworks.xstream:xstream:1.4.21'
 
-    implementation 'commons-codec:commons-codec:1.19.0'
-    implementation 'org.apache.commons:commons-lang3:3.19.0'
+    implementation 'commons-codec:commons-codec:1.20.0'
+    implementation 'org.apache.commons:commons-lang3:3.20.0'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'commons-io:commons-io:2.20.0'
-    testImplementation 'com.imsweb:layout:6.4'
-    testImplementation 'com.imsweb:staging-client-java-cs:11.5.1'
-    testImplementation 'com.imsweb:staging-client-java-eod-public:11.5.1'
-    testImplementation 'com.imsweb:staging-client-java-tnm:11.5.1'
-    testImplementation('com.imsweb:validation-edits-seer:025-08') { exclude module: 'validation' }
-    testImplementation('com.imsweb:validation-edits-naaccr-translated:022-01') { exclude module: 'validation' }
+    testImplementation 'commons-io:commons-io:2.21.0'
+    testImplementation 'com.imsweb:layout:7.0'
+    testImplementation 'org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3'
+    testImplementation('com.imsweb:validation-edits-seer:025-10') { exclude module: 'validation' }
+    testImplementation('com.imsweb:validation-edits-naaccr-translated:023-01') { exclude module: 'validation' }
 }
 
 java {
@@ -151,6 +149,6 @@ mavenPublishing {
 
 // Gradle wrapper, this allows to build the project without having to install Gradle!
 wrapper {
-    gradleVersion = '8.14'
+    gradleVersion = '9.2.1'
     distributionType = Wrapper.DistributionType.ALL
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -7,6 +7,8 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -533,5 +535,57 @@ public long getNumRegexCacheHit() {
     public long getNumRegexCacheMiss() {
         return _numRegexCacheMiss == null ? 0L : _numRegexCacheMiss.get();
     }
+
+        /**
+     * Returns the difference in days between the two day/month/year. Returns -1 if it cannot be calculated.
+     * <p/>
+     * Created on Dec 27, 2007 by depryf
+     * @param day1 first day
+     * @param month1 first month
+     * @param year1 first year
+     * @param day2 second day
+     * @param month2 second month
+     * @param year2 second year
+     * @return difference in days between the two dates
+     */
+    @SuppressWarnings("MagicConstant")
+    @ContextFunctionDocAnnotation(paramName1 = "day1", param1 = "day of first date", paramName2 = "month1", param2 = "month of first date", paramName3 = "year1", param3 = "year of first date",
+            paramName4 = "day2", param4 = "day of second date", paramName5 = "month2", param5 = "month of second day", paramName6 = "year2", param6 = "year of second date",
+            desc = "Returns the difference in days between the first provided day/month/year and the second provided day/month/year, returns -1 if that cannot be determined.",
+            example = "def days = differenceInDays(day1, month1, year1, day2, month2, year2)")
+    public int differenceInDays(Object day1, Object month1, Object year1, Object day2, Object month2, Object year2) {
+
+        Integer y1 = asInt(year1);
+        if (y1 != null)
+            y1 = y1 == 9999 ? null : y1;
+        Integer m1 = asInt(month1);
+        if (m1 != null)
+            m1 = m1 == 99 ? null : m1;
+        Integer d1 = asInt(day1);
+        if (d1 != null)
+            d1 = d1 == 99 ? null : d1;
+        Integer y2 = asInt(year2);
+        if (y2 != null)
+            y2 = y2 == 9999 ? null : y2;
+        Integer m2 = asInt(month2);
+        if (m2 != null)
+            m2 = m2 == 99 ? null : m2;
+        Integer d2 = asInt(day2);
+        if (d2 != null)
+            d2 = d2 == 99 ? null : d2;
+
+        if (y1 == null || m1 == null || y2 == null || m2 == null)
+            return -1;
+
+        Calendar cal1 = new GregorianCalendar(y1, m1 - 1, d1 == null ? 1 : d1);
+        Calendar cal2 = new GregorianCalendar(y2, m2 - 1, d2 == null ? 1 : d2);
+
+        // fix possible daylight saving time problem
+        long fromL = cal1.getTimeInMillis() + cal1.getTimeZone().getOffset(cal1.getTimeInMillis());
+        long toL = cal2.getTimeInMillis() + cal2.getTimeZone().getOffset(cal2.getTimeInMillis());
+        long difference = toL - fromL;
+
+        return (int)(difference / (1000 * 60 * 60 * 24));
+    }
 }
 

gradlew

@@ -113,12 +113,6 @@ public class MetafileContextFunctions extends StagingContextFunctions {
      * relied on the CS DLL, but not on any TNM or EOD DLL.
      * <br/><br/>
      * You may provide null for the CS staging object, but any CS-related context methods won't work correctly.
-     * <br/><br/>
-     * Here is an example of how to create the required CS staging object:
-     * <code>
-     * Staging csStaging = Staging.getInstance(CsDataProvider.getInstance(CsDataProvider.CsVersion.v020550));
-     * </code>
-     * You will also need to add a dependency to the CS algorithm in your project, see https://github.com/imsweb/staging-algorithm-cs
      */
     public MetafileContextFunctions(Staging csStaging) {
         super(csStaging, null, null);

gradlew.bat

@@ -17,6 +17,7 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 
+import com.imsweb.staging.Staging;
 import com.imsweb.validation.entities.EditableValidator;
 import com.imsweb.validation.entities.RuleFailure;
 import com.imsweb.validation.entities.Validator;
@@ -25,6 +26,10 @@ public final class TestingUtils {
 
     public static File TMP_DIR = new File(getWorkingDirectory() + "/build/test-tmp");
 
+    private static Staging _CS_STAGING;
+    private static Staging _TNM_STAGING;
+    private static Staging _EOD_STAGING;
+
     public static void init() {
 
         if (!TMP_DIR.exists() && !TMP_DIR.mkdirs())
@@ -39,6 +44,34 @@ public static void init() {
             options.enableEngineStats();
             ValidationEngine.getInstance().initialize(options);
         }
+
+        if (_CS_STAGING == null)
+            _CS_STAGING = loadStagingInstance("cs-02.05.50.zip");
+        if (_TNM_STAGING == null)
+            _TNM_STAGING = loadStagingInstance("tnm-2.0.zip");
+        if (_EOD_STAGING == null)
+            _EOD_STAGING = loadStagingInstance("eod_public-3.3.zip");
+    }
+
+    private static Staging loadStagingInstance(String data) {
+        try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("staging/" + data)) {
+            return Staging.getInstance(is);
+        }
+        catch (IOException e) {
+            throw new IllegalStateException("Unable to initialize staging from " + data, e);
+        }
+    }
+
+    public static Staging getCsStaging() {
+        return _CS_STAGING;
+    }
+
+    public static Staging getTnmStaging() {
+        return _TNM_STAGING;
+    }
+
+    public static Staging getEodStaging() {
+        return _EOD_STAGING;
     }
 
     public static String getWorkingDirectory() {
@@ -98,7 +131,7 @@ public static void assertEditFailure(Collection<RuleFailure> results, String...
                 StringBuilder buf = new StringBuilder();
                 for (RuleFailure rf : results)
                     buf.append("  ").append(rf.getRule().getId()).append(": ").append(rf.getMessage()).append("\n");
-                if (buf.length() == 0)
+                if (buf.isEmpty())
                     buf.append("none");
                 Assert.fail("\nWas expecting a failure for '" + ruleId + "' but didn't get it; failures:\n" + buf);
             }
@@ -127,7 +160,7 @@ public static void assertNoEditFailure(Collection<RuleFailure> results, String..
                     else
                         buf.append("  ").append(rf.getRule().getId()).append(": ").append(rf.getMessage()).append("\n");
                 }
-                if (buf.length() == 0)
+                if (buf.isEmpty())
                     buf.append("none");
                 Assert.fail("\nWas expecting no failure for '" + ruleId + "' but got it; failures:\n" + buf);
             }

src/main/java/com/imsweb/validation/ValidationContextFunctions.java

@@ -18,7 +18,7 @@
 
 public class ValidationContextFunctionsTest {
 
-    private ValidationContextFunctions _functions = new ValidationContextFunctions();
+    private final ValidationContextFunctions _functions = new ValidationContextFunctions();
 
     @Before
     public void setUp() {
@@ -327,4 +327,32 @@ public void testMatches() {
             _functions.disableRegexCaching();
         }
     }
+
+    @Test
+    public void testDifferenceInDays() {
+        Assert.assertEquals(-1, _functions.differenceInDays(1, 1, null, 1, 1, 2000));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, null, 2000, 1, 1, 2000));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, 1, 2000, 1, 1, null));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, 1, 2000, 1, null, 2000));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, 1, 2000, 1, 1, 9999));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, 1, 2000, 1, 99, 2000));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, 1, "A", 1, 1, 2000));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, "A", 2000, 1, 1, 2000));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, 1, 2000, 1, 1, "A"));
+        Assert.assertEquals(-1, _functions.differenceInDays(1, 1, 2000, 1, "A", 2000));
+
+        Assert.assertEquals(0, _functions.differenceInDays(1, 1, 2000, 1, 1, 2000));
+        Assert.assertEquals(0, _functions.differenceInDays(null, 1, 2000, null, 1, 2000));
+        Assert.assertEquals(1, _functions.differenceInDays("A", 1, 2000, 2, 1, 2000));
+        Assert.assertEquals(31, _functions.differenceInDays(1, 1, 2000, 1, 2, 2000));
+        Assert.assertEquals(366, _functions.differenceInDays(1, 1, 2000, 1, 1, 2001));
+        Assert.assertEquals(2, _functions.differenceInDays(31, 12, 2000, 2, 1, 2001));
+        Assert.assertEquals(87, _functions.differenceInDays(null, 1, 2000, 88, 1, 2000));
+        Assert.assertEquals(0, _functions.differenceInDays(99, 1, 2000, 1, 1, 2000));
+
+        Assert.assertEquals(-1, _functions.differenceInDays(2, 1, 2000, 1, 1, 2000));
+        Assert.assertEquals(-31, _functions.differenceInDays(1, 2, 2000, 1, 1, 2000));
+        Assert.assertEquals(-366, _functions.differenceInDays(1, 1, 2001, 1, 1, 2000));
+
+    }
 }