Upgrade to the latest version of core and move the repository to Java17

azure-pipelines.yml

@@ -27,42 +27,23 @@ resources:
 jobs:
 - template: build-templates/gradle-common.yml@templates
   parameters:
-    jdkVersion: '1.8'
-    jobName: 'LinuxJava8'
-    gradleTasks: 'check -x dependencyCheckAggregate'
-
-- template: build-templates/gradle-common.yml@templates
-  parameters:
-    jdkVersion: '1.8'
-    options: '-PtestVM=java11Home'
-    jobName: 'LinuxJava11'
-    gradleTasks: 'check -x dependencyCheckAggregate'
-
-- template: build-templates/gradle-common.yml@templates
-  parameters:
-    jdkVersion: '1.8'
+    jdkVersion: '17'
     options: '-PtestVM=java17Home'
     jobName: 'LinuxJava17'
     gradleTasks: 'check -x dependencyCheckAggregate'
 
 - template: build-templates/gradle-common.yml@templates
   parameters:
-    jdkVersion: '1.8'
+    jdkVersion: '17'
     options: '-PtestVM=java21Home'
     jobName: 'LinuxJava21'
     gradleTasks: 'check -x dependencyCheckAggregate'
 
-- template: build-templates/gradle-common.yml@templates
-  parameters:
-    vmImage: 'windows-latest'
-    jdkVersion: '1.8'
-    jobName: 'WindowsJava8'
-    gradleTasks: 'check -x dependencyCheckAggregate'
 
 - template: build-templates/gradle-common.yml@templates
   parameters:
     vmImage: 'windows-latest'
-    jdkVersion: '1.8'
+    jdkVersion: '17'
     options: '-PtestVM=java21Home'
     jobName: 'WindowsJava21'
     gradleTasks: 'check -x dependencyCheckAggregate'

build-logic/src/main/java/org/ehcache/build/conventions/JacocoConvention.java

@@ -27,6 +27,7 @@ public void apply(Project project) {
     project.getTasks().withType(Test.class).configureEach(test -> {
       test.getExtensions().configure(JacocoTaskExtension.class, jacoco -> {
         jacoco.getExcludes().add("org.terracotta.tripwire.*");
+        jacoco.getExcludes().add("org.terracotta.management.*");
       });
     });
   }

build-logic/src/main/java/org/ehcache/build/conventions/JavaBaseConvention.java

@@ -40,8 +40,8 @@ public void apply(Project project) {
     project.getExtensions().getExtraProperties().set("testJava", testJava);
 
     project.getExtensions().configure(JavaPluginExtension.class, java -> {
-      java.setSourceCompatibility(JavaVersion.VERSION_1_8);
-      java.setTargetCompatibility(JavaVersion.VERSION_1_8);
+      java.setSourceCompatibility(JavaVersion.VERSION_17);
+      java.setTargetCompatibility(JavaVersion.VERSION_17);
     });
 
     project.getTasks().withType(Jar.class).configureEach(jar -> {

build-logic/src/main/java/org/ehcache/build/plugins/VoltronPlugin.java

@@ -14,6 +14,8 @@
 import java.io.File;
 import java.util.jar.Attributes;
 import java.util.stream.Collectors;
+import java.util.Map;
+import java.util.HashMap;
 
 import static java.util.Collections.singletonMap;
 
@@ -30,14 +32,11 @@ public void apply(Project project) {
       config.setDescription("Dependencies provided by Voltron from server/lib");
       config.setCanBeConsumed(true);
       config.setCanBeResolved(true);
+      config.exclude(Map.of("group", "ch.qos.logback"));
 
       DependencyHandler dependencyHandler = project.getDependencies();
       String terracottaApisVersion = project.property("terracottaApisVersion").toString();
-      String slf4jVersion = project.property("slf4jVersion").toString();
-      config.getDependencies().add(dependencyHandler.create("org.terracotta:entity-server-api:" + terracottaApisVersion));
-      config.getDependencies().add(dependencyHandler.create("org.terracotta:standard-cluster-services:" + terracottaApisVersion));
-      config.getDependencies().add(dependencyHandler.create("org.terracotta:packaging-support:" + terracottaApisVersion));
-      config.getDependencies().add(dependencyHandler.create("org.slf4j:slf4j-api:" + slf4jVersion));
+      config.getDependencies().add(dependencyHandler.create("org.terracotta:server-api:" + terracottaApisVersion));
     });
 
     NamedDomainObjectProvider<Configuration> service = project.getConfigurations().register(SERVICE_CONFIGURATION_NAME, config -> {
@@ -46,7 +45,12 @@ public void apply(Project project) {
       config.setCanBeConsumed(true);
     });
 
-    project.getConfigurations().named(JavaPlugin.API_CONFIGURATION_NAME, config -> {
+    project.getConfigurations().named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, config -> {
+      config.extendsFrom(voltron.get());
+      config.extendsFrom(service.get());
+    });
+
+    project.getConfigurations().named(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, config -> {
       config.extendsFrom(voltron.get());
       config.extendsFrom(service.get());
     });

clustered/ehcache-client/build.gradle

@@ -31,16 +31,19 @@ dependencies {
 
   compileOnlyApi project(':ehcache-xml:ehcache-xml-spi')
 
-  implementation project(':clustered:ehcache-common')
-  implementation "org.terracotta:entity-client-api:$terracottaApisVersion"
-  implementation "org.terracotta:runnel:$terracottaPlatformVersion"
-  implementation "org.terracotta:lease-api:$terracottaPlatformVersion"
-  implementation "org.terracotta.dynamic-config.entities:dynamic-config-topology-entity-client:$terracottaPlatformVersion"
-  implementation "org.terracotta:connection-api:$terracottaApisVersion"
+  api project(':clustered:ehcache-common')
+  implementation "org.terracotta:client-api:$terracottaApisVersion"
+  implementation "org.terracotta:terracotta-runnel:$terracottaPlatformVersion"
+  implementation "org.terracotta:terracotta-lease-client:$terracottaPlatformVersion"
+  implementation "org.terracotta:terracotta-dynamic-config-entities-topology-client:$terracottaPlatformVersion"
   implementation "org.terracotta:terracotta-utilities-tools:$terracottaUtilitiesVersion"
 
   compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
 
+  testImplementation "org.terracotta:terracotta-resources-offheap:$terracottaPlatformVersion"
+  testImplementation "org.terracotta:terracotta-management-server-api:$terracottaPlatformVersion"
+  testImplementation project(':clustered:server:ehcache-service-api')
+
   testImplementation(project(':ehcache-transactions')) {
     capabilities {
       requireCapability("org.ehcache:ehcache-transactions-modules")
@@ -50,15 +53,18 @@ dependencies {
     exclude group: 'org.terracotta.internal', module: 'tc-config-parser'
   }
   testImplementation project(':clustered:server:ehcache-service')
-  testImplementation "org.terracotta:client-message-tracker:$terracottaPlatformVersion"
+  testImplementation "org.terracotta:terracotta-client-message-tracker:$terracottaPlatformVersion"
   testImplementation project(':clustered:test-utils')
-  testImplementation "org.terracotta:entity-test-lib:$terracottaPassthroughTestingVersion"
-  testImplementation "org.terracotta:passthrough-server:$terracottaPassthroughTestingVersion"
-  testImplementation "org.terracotta.internal:common-spi:$terracottaCoreVersion"
-  testImplementation "org.terracotta:passthrough-leased-connection-api:$terracottaPlatformVersion"
+  testImplementation ("org.terracotta:passthrough-server:$terracottaRuntimeVersion") {
+      exclude group: "ch.qos.logback"
+  }
+  testImplementation "org.terracotta:terracotta-lease-testing-passthrough:$terracottaPlatformVersion"
   testImplementation (group: 'org.codehaus.btm', name: 'btm', version: '2.1.4') {
     exclude group:'org.slf4j', module:'slf4j-api'
   }
   testImplementation testFixtures(project(':ehcache-xml'))
   testImplementation ("org.terracotta:statistics:$parent.statisticVersion")
+  testImplementation ("org.terracotta:terracotta-structures:$terracottaPlatformVersion") {
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
 }

clustered/ehcache-client/src/main/java/org/ehcache/clustered/client/internal/service/DefaultClusteringService.java

@@ -377,6 +377,7 @@ public ConnectionState getConnectionState() {
     return connectionState;
   }
 
+  @SuppressWarnings("removal")
   private static ExecutorService createAsyncWorker() {
     SecurityManager s = System.getSecurityManager();
     ThreadGroup initialGroup = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();

clustered/ehcache-client/src/main/java/org/ehcache/clustered/client/internal/store/CommonServerStoreProxy.java

@@ -117,7 +117,6 @@ <T extends EhcacheEntityResponse> void addResponseListener(Class<T> listenerClas
     entity.addResponseListener(listenerClass, listener);
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public void close() {
     entity.close();
@@ -232,6 +231,8 @@ public Map.Entry<Long, Chain> next() {
         }
 
         @Override
+        @SuppressWarnings("deprecation")
+        // TODO: FIXME: Use the new Cleaner API
         protected void finalize() throws Throwable {
           if (!lastBatch) {
             entity.invokeAndWaitForReceive(new ServerStoreOpMessage.IteratorCloseMessage(iteratorId), false);

clustered/ehcache-client/src/test/java/org/ehcache/clustered/client/internal/UnitTestConnectionService.java

@@ -23,7 +23,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.math.BigInteger;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -36,7 +35,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.stream.Collectors;
+import static java.util.stream.Collectors.toList;
 
 import org.ehcache.clustered.client.internal.lock.VoltronReadWriteLockEntityClientService;
 import org.ehcache.clustered.client.internal.store.ClusterTierClientEntityService;
@@ -45,8 +44,11 @@
 
 import org.ehcache.clustered.server.store.ClusterTierServerEntityService;
 import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
+import static org.mockito.Mockito.mock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.terracotta.common.struct.Measure;
+import org.terracotta.common.struct.MemoryUnit;
 import org.terracotta.connection.Connection;
 import org.terracotta.connection.ConnectionException;
 import org.terracotta.connection.ConnectionPropertyNames;
@@ -63,19 +65,12 @@
 import org.terracotta.exception.EntityNotProvidedException;
 import org.terracotta.exception.PermanentEntityException;
 import org.terracotta.offheapresource.OffHeapResourcesProvider;
-import org.terracotta.offheapresource.config.MemoryUnit;
-import org.terracotta.offheapresource.config.OffheapResourcesType;
-import org.terracotta.offheapresource.config.ResourceType;
 import org.terracotta.passthrough.IAsynchronousServerCrasher;
 import org.terracotta.passthrough.PassthroughConnection;
 import org.terracotta.passthrough.PassthroughServer;
 import org.terracotta.passthrough.PassthroughServerRegistry;
 
 import static java.util.Collections.synchronizedMap;
-import static java.util.stream.Collectors.toCollection;
-import static java.util.stream.Collectors.toList;
-import static org.mockito.Mockito.mock;
-
 
 /**
  * A {@link ConnectionService} implementation used to simulate Voltron server connections for unit testing purposes.
@@ -176,21 +171,6 @@ public static void removeStripe(String stripeName) {
     }
     stripeDescriptor.removeConnections();
   }
-
-  public static OffheapResourcesType getOffheapResourcesType(String resourceName, int size, MemoryUnit unit) {
-    OffheapResourcesType resources = new OffheapResourcesType();
-    resources.getResource().add(getResource(resourceName, size, unit));
-    return resources;
-  }
-
-  private static ResourceType getResource(String resourceName, int size, MemoryUnit unit) {
-    final ResourceType resource = new ResourceType();
-    resource.setName(resourceName);
-    resource.setUnit(unit);
-    resource.setValue(BigInteger.valueOf((long)size));
-    return resource;
-  }
-
   /**
    * Adds a {@link PassthroughServer} if, and only if, a mapping for the URI supplied does not
    * already exist.  The server is started as it is added.
@@ -288,7 +268,7 @@ public static final class PassthroughServerBuilder {
     private final Map<ServiceProvider, ServiceProviderConfiguration> serviceProviders =
       new IdentityHashMap<>();
 
-    private final OffheapResourcesType resources = new OffheapResourcesType();
+    private final Map<String, Measure<MemoryUnit>> resources = new HashMap<>();
 
     public PassthroughServerBuilder resource(String resourceName, int size, org.ehcache.config.units.MemoryUnit unit) {
       return this.resource(resourceName, size, convert(unit));
@@ -301,7 +281,7 @@ private MemoryUnit convert(org.ehcache.config.units.MemoryUnit unit) {
           convertedUnit = MemoryUnit.B;
           break;
         case KB:
-          convertedUnit = MemoryUnit.K_B;
+          convertedUnit = MemoryUnit.KB;
           break;
         case MB:
           convertedUnit = MemoryUnit.MB;
@@ -322,7 +302,7 @@ private MemoryUnit convert(org.ehcache.config.units.MemoryUnit unit) {
     }
 
     private PassthroughServerBuilder resource(String resourceName, int size, MemoryUnit unit) {
-      this.resources.getResource().add(getResource(resourceName, size, unit));
+      this.resources.put(resourceName, Measure.of(size, unit));
       return this;
     }
 

clustered/ehcache-client/src/test/java/org/ehcache/clustered/client/internal/service/ClusterStateRepositoryReplicationTest.java

@@ -39,17 +39,16 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.terracotta.offheapresource.OffHeapResourceIdentifier;
 import org.terracotta.offheapresource.OffHeapResourcesProvider;
-import org.terracotta.offheapresource.config.MemoryUnit;
 import org.terracotta.passthrough.PassthroughClusterControl;
 import org.terracotta.passthrough.PassthroughTestHelpers;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.net.URI;
-
+import java.util.Collections;
 import static org.ehcache.clustered.client.config.builders.ClusteredResourcePoolBuilder.clusteredDedicated;
-import static org.ehcache.clustered.client.internal.UnitTestConnectionService.getOffheapResourcesType;
 import static org.ehcache.config.Eviction.noAdvice;
 import static org.ehcache.config.builders.ExpiryPolicyBuilder.noExpiration;
 import static org.ehcache.config.builders.ResourcePoolsBuilder.newResourcePoolsBuilder;
@@ -74,7 +73,9 @@ public void setUp() throws Exception {
         server.registerClientEntityService(new ClusterTierClientEntityService());
         server.registerServerEntityService(new VoltronReadWriteLockServerEntityService());
         server.registerClientEntityService(new VoltronReadWriteLockEntityClientService());
-        server.registerExtendedConfiguration(new OffHeapResourcesProvider(getOffheapResourcesType("test", 32, MemoryUnit.MB)));
+        OffHeapResourcesProvider offheapResources = new OffHeapResourcesProvider(Collections.emptyMap());
+        offheapResources.addOffHeapResource(OffHeapResourceIdentifier.identifier("test"), 32 * 1024 * 1024);
+        server.registerExtendedConfiguration(offheapResources);
 
         UnitTestConnectionService.addServerToStripe(STRIPENAME, server);
       }

clustered/ehcache-client/src/test/java/org/ehcache/clustered/client/internal/service/ReconnectTest.java

@@ -78,8 +78,10 @@ public void testAfterConnectionReconnectHappensEvenAfterConnectionException() th
       MockConnectionService.mockConnection = Mockito.mock(Connection.class, Mockito.withSettings().defaultAnswer(invocation -> {
         throw new RuntimeException("Stop reconnecting");
       }));
-      while (connectionState.getReconnectCount() == 1) {
-        break;
+      while (true) {
+        if (connectionState.getReconnectCount() > 0) {
+          break;
+        }
       }
     });
 
@@ -91,7 +93,7 @@ public void testAfterConnectionReconnectHappensEvenAfterConnectionException() th
       assertThat(e.getCause().getMessage(), Matchers.is("Stop reconnecting"));
     }
 
-    assertThat(connectionState.getReconnectCount(), Matchers.is(1));
+    assertThat(connectionState.getReconnectCount(), Matchers.greaterThanOrEqualTo(1));
 
   }
 

clustered/ehcache-client/src/test/java/org/ehcache/clustered/client/internal/service/StateRepositoryWhitelistingTest.java

@@ -38,18 +38,17 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.terracotta.offheapresource.OffHeapResourceIdentifier;
 import org.terracotta.offheapresource.OffHeapResourcesProvider;
-import org.terracotta.offheapresource.config.MemoryUnit;
 import org.terracotta.passthrough.PassthroughClusterControl;
 import org.terracotta.passthrough.PassthroughTestHelpers;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.net.URI;
 import java.util.Arrays;
-
+import java.util.Collections;
 import static org.ehcache.clustered.client.config.builders.ClusteredResourcePoolBuilder.clusteredDedicated;
-import static org.ehcache.clustered.client.internal.UnitTestConnectionService.getOffheapResourcesType;
 import static org.ehcache.config.Eviction.noAdvice;
 import static org.ehcache.config.builders.ExpiryPolicyBuilder.noExpiration;
 import static org.ehcache.config.builders.ResourcePoolsBuilder.newResourcePoolsBuilder;
@@ -77,7 +76,9 @@ public void setUp() throws Exception {
         server.registerClientEntityService(new ClusterTierClientEntityService());
         server.registerServerEntityService(new VoltronReadWriteLockServerEntityService());
         server.registerClientEntityService(new VoltronReadWriteLockEntityClientService());
-        server.registerExtendedConfiguration(new OffHeapResourcesProvider(getOffheapResourcesType("test", 32, MemoryUnit.MB)));
+        OffHeapResourcesProvider offheapResources = new OffHeapResourcesProvider(Collections.emptyMap());
+        offheapResources.addOffHeapResource(OffHeapResourceIdentifier.identifier("test"), 32 * 1024 * 1024);
+        server.registerExtendedConfiguration(offheapResources);
 
         UnitTestConnectionService.addServerToStripe(STRIPENAME, server);
       }
@@ -166,9 +167,9 @@ public void testWhitelistingForPrimitiveClass() throws Exception {
     StateHolder<Integer, Integer> testMap = stateRepository.getPersistentStateHolder("testMap", Integer.class, Integer.class,
       Arrays.asList(Child.class)::contains, null);
 
-    testMap.putIfAbsent(new Integer(10), new Integer(20));
+    testMap.putIfAbsent(Integer.valueOf(10), Integer.valueOf(20));
 
-    assertThat(testMap.get(new Integer(10)), is(new Integer(20)));
+    assertThat(testMap.get(Integer.valueOf(10)), is(Integer.valueOf(20)));
     assertThat(testMap.entrySet(), hasSize(1));
   }