Test with Java 20

lukas-krecan · May 22, 2023 · 473e8ad · 473e8ad
1 parent 4a1322f
commit 473e8ad
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '19']
+        java: [ '17', '20']
         # Kotlin needs access to java.util
         include:
           - java: '17'
             maven-opts: --add-opens java.base/java.util=ALL-UNNAMED
             maven-params: ''
-          - java: '19'
+          - java: '20'
             maven-opts: --add-opens java.base/java.util=ALL-UNNAMED
             maven-params: ''
     steps:

diff --git a/pom.xml b/pom.xml
@@ -124,7 +124,7 @@
                 <version>3.5.0</version>
                 <configuration>
                     <!-- https://bugs.openjdk.java.net/browse/JDK-8212233 -->
-                    <source>8</source>
+                    <source>17</source>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/...ider-ignite/src/main/java/net/javacrumbs/shedlock/provider/ignite/IgniteLockProvider.java b/...ider-ignite/src/main/java/net/javacrumbs/shedlock/provider/ignite/IgniteLockProvider.java
@@ -108,7 +108,7 @@ public Optional<SimpleLock> lock(LockConfiguration lockCfg) {
             return Optional.empty();
         }
 
-        if (!now.isBefore(oldVal.lockUntil()) && cache.replace(key, oldVal, newVal))
+        if (!now.isBefore(oldVal.getLockUntil()) && cache.replace(key, oldVal, newVal))
             return Optional.of(new IgniteLock(lockCfg, this));
 
         return Optional.empty();
@@ -127,7 +127,7 @@ private Optional<SimpleLock> extend(LockConfiguration lockCfg) {
         String key = lockCfg.getName();
         LockValue oldVal = cache.get(key);
 
-        if (oldVal == null || !oldVal.lockedBy().equals(getHostname()) || !oldVal.lockUntil().isAfter(now))
+        if (oldVal == null || !oldVal.getLockedBy().equals(getHostname()) || !oldVal.getLockUntil().isAfter(now))
             return Optional.empty();
 
         LockValue newVal = oldVal.withLockUntil(lockCfg.getLockAtMostUntil());
@@ -148,7 +148,7 @@ private void unlock(LockConfiguration lockCfg) {
         String key = lockCfg.getName();
         LockValue oldVal = cache.get(key);
 
-        if (oldVal != null && oldVal.lockedBy().equals(getHostname())) {
+        if (oldVal != null && oldVal.getLockedBy().equals(getHostname())) {
             LockValue newVal = oldVal.withLockUntil(lockCfg.getUnlockTime());
 
             cache.replace(key, oldVal, newVal);

diff --git a/...lock-provider-ignite/src/main/java/net/javacrumbs/shedlock/provider/ignite/LockValue.java b/...lock-provider-ignite/src/main/java/net/javacrumbs/shedlock/provider/ignite/LockValue.java
@@ -19,18 +19,26 @@
 
 /**
  * Value object for ShedLock cache.
- *
- * @param lockedAt  Locked at time.
- * @param lockUntil Locked until time.
- * @param lockedBy  Locked by hostname.
  */
-record LockValue(Instant lockedAt, Instant lockUntil, String lockedBy) {
+class LockValue {
+    /** Locked at time. */
+    private final Instant lockedAt;
+
+    /** Locked until time. */
+    private final Instant lockUntil;
+
+    /** Locked by hostname. */
+    private final String lockedBy;
+
     /**
-     * @param lockedAt  Locked at time.
+     * @param lockedAt Locked at time.
      * @param lockUntil Locked until time.
-     * @param lockedBy  Locked by hostname.
+     * @param lockedBy Locked by hostname.
      */
-    LockValue {
+    public LockValue(Instant lockedAt, Instant lockUntil, String lockedBy) {
+        this.lockedAt = lockedAt;
+        this.lockUntil = lockUntil;
+        this.lockedBy = lockedBy;
     }
 
     LockValue withLockUntil(Instant lockUntil) {
@@ -40,24 +48,21 @@ LockValue withLockUntil(Instant lockUntil) {
     /**
      * @return Locked at time.
      */
-    @Override
-    public Instant lockedAt() {
+    public Instant getLockedAt() {
         return lockedAt;
     }
 
     /**
      * @return Locked until time.
      */
-    @Override
-    public Instant lockUntil() {
+    public Instant getLockUntil() {
         return lockUntil;
     }
 
     /**
      * @return Locked by hostname.
      */
-    @Override
-    public String lockedBy() {
+    public String getLockedBy() {
         return lockedBy;
     }
 }
diff --git a/...-ignite/src/test/java/net/javacrumbs/shedlock/provider/ignite/IgniteLockProviderTest.java b/...-ignite/src/test/java/net/javacrumbs/shedlock/provider/ignite/IgniteLockProviderTest.java
@@ -64,9 +64,9 @@ protected void assertUnlocked(String lockName) {
         Instant now = Instant.now();
 
         assertThat(val).isNotNull();
-        assertThat(val.lockUntil()).isBeforeOrEqualTo(now);
-        assertThat(val.lockedAt()).isBeforeOrEqualTo(now);
-        assertThat(val.lockedBy()).isNotEmpty();
+        assertThat(val.getLockUntil()).isBeforeOrEqualTo(now);
+        assertThat(val.getLockedAt()).isBeforeOrEqualTo(now);
+        assertThat(val.getLockedBy()).isNotEmpty();
     }
 
     @Override
@@ -76,8 +76,8 @@ protected void assertLocked(String lockName) {
         Instant now = Instant.now();
 
         assertThat(val).isNotNull();
-        assertThat(val.lockUntil()).isAfter(now);
-        assertThat(val.lockedAt()).isBeforeOrEqualTo(now);
-        assertThat(val.lockedBy()).isNotEmpty();
+        assertThat(val.getLockUntil()).isAfter(now);
+        assertThat(val.getLockedAt()).isBeforeOrEqualTo(now);
+        assertThat(val.getLockedBy()).isNotEmpty();
     }
 }