Merge pull request wildfly#19460 from pferraro/WFLY-21163

WFLY-21163 Upgrade Infinispan to 16.0.3 + WFLY-21164 Upgrade JGroups to 5.5 + WFLY-21266 Upgrade wildfly-clustering to 9.0

Author: darranl

boms/common-ee/pom.xml

@@ -1103,12 +1103,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>com.squareup</groupId>
-                <artifactId>protoparser</artifactId>
-                <version>${version.com.squareup.protoparser}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.sun.istack</groupId>
                 <artifactId>istack-commons-runtime</artifactId>

clustering/common/pom.xml

@@ -6,7 +6,7 @@
 
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         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>
 
     <parent>

clustering/ejb/cache/pom.xml

@@ -6,7 +6,7 @@
 
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         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>
 
     <parent>
@@ -100,12 +100,5 @@
             <scope>test</scope>
             <classifier>tests</classifier>
         </dependency>
-
-        <!-- External test dependencies -->
-        <dependency>
-            <groupId>com.squareup</groupId>
-            <artifactId>protoparser</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

clustering/ejb/cache/src/main/java/org/wildfly/clustering/ejb/cache/bean/BeanMetaDataEntry.java

@@ -16,5 +16,5 @@
  */
 public interface BeanMetaDataEntry<K> extends ImmutableBeanMetaDataEntry<K> {
     @Override
-    Value<Instant> getLastAccess();
+    Value<Instant> getLastAccessTime();
 }

clustering/ejb/cache/src/main/java/org/wildfly/clustering/ejb/cache/bean/BeanMetaDataFactoryConfiguration.java

@@ -5,13 +5,12 @@
 
 package org.wildfly.clustering.ejb.cache.bean;
 
-import org.wildfly.clustering.ejb.bean.BeanExpiration;
+import org.wildfly.clustering.server.expiration.Expiration;
 
 /**
  * Encapsulates the configuration of a {@link BeanMetaDataFactory}.
  * @author Paul Ferraro
  */
-public interface BeanMetaDataFactoryConfiguration {
+public interface BeanMetaDataFactoryConfiguration extends Expiration {
     String getBeanName();
-    BeanExpiration getExpiration();
 }

clustering/ejb/cache/src/main/java/org/wildfly/clustering/ejb/cache/bean/DefaultBeanMetaData.java

@@ -8,8 +8,8 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.Optional;
 
-import org.wildfly.clustering.ejb.bean.BeanExpiration;
 import org.wildfly.clustering.ejb.bean.BeanMetaData;
 
 /**
@@ -20,20 +20,15 @@ public class DefaultBeanMetaData<K> extends DefaultImmutableBeanMetaData<K> impl
     private final BeanMetaDataEntry<K> entry;
     private final Runnable mutator;
 
-    public DefaultBeanMetaData(BeanMetaDataEntry<K> entry, BeanExpiration expiration, Runnable mutator) {
-        super(entry, expiration);
+    public DefaultBeanMetaData(BeanMetaDataEntry<K> entry, Optional<Duration> maxIdle, Runnable mutator) {
+        super(entry, maxIdle);
         this.entry = entry;
         this.mutator = mutator;
     }
 
-    @Override
-    public Instant getLastAccessTime() {
-        return this.entry.getLastAccess().get();
-    }
-
     @Override
     public void setLastAccessTime(Instant lastAccessTime) {
-        Instant previousAccessTime = this.entry.getLastAccess().get();
+        Instant previousAccessTime = this.entry.getLastAccessTime().get();
         if (previousAccessTime.isBefore(lastAccessTime)) {
             // Retain second precision
             Duration duration = Duration.between(previousAccessTime, lastAccessTime);
@@ -42,7 +37,7 @@ public void setLastAccessTime(Instant lastAccessTime) {
                 seconds += 1;
             }
             Duration normalizedDuration = (seconds > 1) ? Duration.ofSeconds(seconds) : ChronoUnit.SECONDS.getDuration();
-            this.entry.getLastAccess().set(previousAccessTime.plus(normalizedDuration));
+            this.entry.getLastAccessTime().set(previousAccessTime.plus(normalizedDuration));
         }
     }
 

clustering/ejb/cache/src/main/java/org/wildfly/clustering/ejb/cache/bean/DefaultBeanMetaDataEntry.java

@@ -19,7 +19,7 @@ public class DefaultBeanMetaDataEntry<K> implements RemappableBeanMetaDataEntry<
 
     private final String name;
     private final K groupId;
-    private final OffsetValue<Instant> lastAccess;
+    private final OffsetValue<Instant> lastAccessTime;
 
     public DefaultBeanMetaDataEntry(String name, K groupId) {
         this(name, groupId, Instant.now().truncatedTo(ChronoUnit.MILLIS));
@@ -28,7 +28,7 @@ public DefaultBeanMetaDataEntry(String name, K groupId) {
     DefaultBeanMetaDataEntry(String name, K groupId, Instant creationTime) {
         this.name = name;
         this.groupId = groupId;
-        this.lastAccess = OffsetValue.from(creationTime);
+        this.lastAccessTime = OffsetValue.from(creationTime);
     }
 
     @Override
@@ -42,14 +42,14 @@ public K getGroupId() {
     }
 
     @Override
-    public OffsetValue<Instant> getLastAccess() {
-        return this.lastAccess;
+    public OffsetValue<Instant> getLastAccessTime() {
+        return this.lastAccessTime;
     }
 
     @Override
     public RemappableBeanMetaDataEntry<K> remap(Supplier<Offset<Instant>> lastAccessOffset) {
-        RemappableBeanMetaDataEntry<K> result = new DefaultBeanMetaDataEntry<>(this.name, this.groupId, this.lastAccess.getBasis());
-        result.getLastAccess().set(lastAccessOffset.get().apply(this.lastAccess.get()));
+        RemappableBeanMetaDataEntry<K> result = new DefaultBeanMetaDataEntry<>(this.name, this.groupId, this.lastAccessTime.getBasis());
+        result.getLastAccessTime().set(lastAccessOffset.get().apply(this.lastAccessTime.get()));
         return result;
     }
 
@@ -58,8 +58,8 @@ public String toString() {
         StringBuilder builder = new StringBuilder(this.getClass().getSimpleName()).append(" { ");
         builder.append("name = ").append(this.name);
         builder.append(", group = ").append(this.groupId);
-        builder.append(", created = ").append(this.lastAccess.getBasis());
-        builder.append(", last-access = ").append(this.lastAccess.get());
+        builder.append(", created = ").append(this.lastAccessTime.getBasis());
+        builder.append(", last-access = ").append(this.lastAccessTime.get());
         return builder.append(" }").toString();
     }
 }

clustering/ejb/cache/src/main/java/org/wildfly/clustering/ejb/cache/bean/DefaultBeanMetaDataEntryMarshaller.java

@@ -54,14 +54,14 @@ public DefaultBeanMetaDataEntry<SessionID> readFrom(ProtoStreamReader reader) th
                     creationTime = reader.readObject(Instant.class);
                     break;
                 case LAST_ACCESS_OFFSET_INDEX:
-                    lastAccessOffset = reader.readObject(lastAccessOffset.getClass());
+                    lastAccessOffset = reader.readObject(lastAccessOffset.getClass().asSubclass(Offset.class));
                     break;
                 default:
                     reader.skipField(tag);
             }
         }
         DefaultBeanMetaDataEntry<SessionID> entry = new DefaultBeanMetaDataEntry<>(name, groupId, creationTime);
-        entry.getLastAccess().setOffset(lastAccessOffset);
+        entry.getLastAccessTime().setOffset(lastAccessOffset);
         return entry;
     }
 
@@ -75,7 +75,7 @@ public void writeTo(ProtoStreamWriter writer, DefaultBeanMetaDataEntry<SessionID
         if (groupId != null) {
             writer.writeObject(GROUP_IDENTIFIER_INDEX, groupId);
         }
-        OffsetValue<Instant> lastAccess = metaData.getLastAccess();
+        OffsetValue<Instant> lastAccess = metaData.getLastAccessTime();
         Instant creationTime = lastAccess.getBasis();
         if (!DEFAULT_CREATION_TIME.equals(creationTime)) {
             writer.writeObject(CREATION_TIME_INDEX, creationTime);

clustering/ejb/cache/src/main/java/org/wildfly/clustering/ejb/cache/bean/DefaultImmutableBeanMetaData.java

@@ -7,8 +7,8 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.Optional;
 
-import org.wildfly.clustering.ejb.bean.BeanExpiration;
 import org.wildfly.clustering.ejb.bean.ImmutableBeanMetaData;
 
 /**
@@ -17,21 +17,21 @@
 public class DefaultImmutableBeanMetaData<K> implements ImmutableBeanMetaData<K> {
 
     private final ImmutableBeanMetaDataEntry<K> entry;
-    private final BeanExpiration expiration;
+    private final Optional<Duration> maxIdle;
 
-    public DefaultImmutableBeanMetaData(ImmutableBeanMetaDataEntry<K> entry, BeanExpiration expiration) {
+    public DefaultImmutableBeanMetaData(ImmutableBeanMetaDataEntry<K> entry, Optional<Duration> maxIdle) {
         this.entry = entry;
-        this.expiration = expiration;
+        this.maxIdle = maxIdle;
     }
 
     @Override
-    public Duration getTimeout() {
-        return (this.expiration != null) ? this.expiration.getTimeout() : null;
+    public Optional<Duration> getMaxIdle() {
+        return this.maxIdle;
     }
 
     @Override
-    public Instant getLastAccessTime() {
-        return this.entry.getLastAccess().get();
+    public Optional<Instant> getLastAccessTime() {
+        return Optional.of(this.entry.getLastAccessTime().get());
     }
 
     @Override