[ALFREDOPS-860] code compiles + removed old integration tests

alfred-telemetry-platform/build.gradle

@@ -12,17 +12,13 @@ tasks.withType(JavaCompile) {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
     withJavadocJar()
     withSourcesJar()
 }
 
 ext {
-    // Compiling against AEE 6.1 because:
-    // * Some MeterBinder implementations monitor Enterprise only components (e.g. Hazelcast caches)
-    // * Alfresco's Micrometer integration, (MetricsController, MetricsReporter) classes only available as of 6.1.
-    // Compatibility with 5.x should be covered with integration tests
-    alfrescoVersion = '6.1.1.11'
+    alfrescoVersion = '23.1.0'
 }
 
 dependencies {
@@ -39,7 +35,7 @@ dependencies {
     alfrescoProvided("io.github.mweirauch:micrometer-jvm-extras:${jvmExtrasVersion}") {
         exclude group: "org.slf4j", module: "*"
     }
-    alfrescoProvided 'javax.servlet:javax.servlet-api'
+    alfrescoProvided 'jakarta.servlet:jakarta.servlet-api'
     compileOnly 'org.apache.tomcat:tomcat-catalina:7.0.92'
     alfrescoProvided "io.micrometer:micrometer-registry-graphite:${micrometerVersion}"
     alfrescoProvided "io.micrometer:micrometer-registry-jmx:${micrometerVersion}"
@@ -91,4 +87,4 @@ publishing {
     }
 }
 
-targetCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_17

alfred-telemetry-platform/src/main/java/eu/xenit/alfred/telemetry/binder/AlfrescoTomcatMetrics.java

@@ -2,14 +2,14 @@
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.tomcat.TomcatMetrics;
+import jakarta.servlet.ServletContext;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.apache.catalina.Manager;
 import org.apache.catalina.core.ApplicationContext;
 import org.apache.catalina.core.StandardContext;
 import org.springframework.web.context.ServletContextAware;
 
 import javax.annotation.Nonnull;
-import javax.servlet.ServletContext;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 

alfred-telemetry-platform/src/main/java/eu/xenit/alfred/telemetry/binder/cache/EnterpriseCacheMetrics.java

@@ -1,6 +1,6 @@
 package eu.xenit.alfred.telemetry.binder.cache;
 
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import eu.xenit.alfred.telemetry.binder.EventTriggeredMeterBinder;
 import eu.xenit.alfred.telemetry.binder.NamedMeterBinder;
 import eu.xenit.alfred.telemetry.util.ReflectionUtil;

alfred-telemetry-platform/src/test/java/eu/xenit/alfred/telemetry/alfrescointegration/DataSourceBeanPostProcessorTest.java

@@ -1,6 +1,6 @@
 package eu.xenit.alfred.telemetry.alfrescointegration;
 
-import org.apache.camel.spring.GenericBeansException;
+import org.apache.camel.NoSuchBeanException;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -131,7 +131,7 @@ private void setupAlfresco7Beans() {
     private void setupNullBeans() {
         beanDefinitionRegistry_null = new SimpleBeanDefinitionRegistry();
         context_null = mock(ApplicationContext.class);
-        when(context_null.getBean(DATASOURCE_BEAN_ID)).thenThrow(new GenericBeansException(DATASOURCE_BEAN_ID));
+        when(context_null.getBean(DATASOURCE_BEAN_ID)).thenThrow(new NoSuchBeanException(DATASOURCE_BEAN_ID));
     }
 
     private DataSourceBeanPostProcessor createProcessor(ApplicationContext applicationContext) {

alfred-telemetry-platform/src/test/java/eu/xenit/alfred/telemetry/binder/LicenseMetricsTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

alfred-telemetry-platform/src/test/java/eu/xenit/alfred/telemetry/binder/cache/EnterpriseCacheMetricsTest.java

@@ -1,6 +1,6 @@
 package eu.xenit.alfred.telemetry.binder.cache;
 
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import eu.xenit.alfred.telemetry.util.ReflectionUtil;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;

alfred-telemetry-platform/src/test/java/eu/xenit/alfred/telemetry/binder/solr/sharding/SolrShardingMetricsContainerTest.java

@@ -35,7 +35,7 @@ void setup() {
     @Test
     void refresh() {
         Floc floc = new Floc();
-        HashMap<Floc, HashMap<Shard, HashSet<ShardState>>> flocs = new HashMap<>();
+        Map<Floc, Map<Shard, Set<ShardState>>> flocs = new HashMap<>();
         flocs.put(floc, new HashMap<>());
         when(shardRegistry.getFlocs()).thenReturn(flocs);
 

alfred-telemetry-platform/src/test/java/eu/xenit/alfred/telemetry/binder/solr/sharding/SolrShardingMetricsTest.java

@@ -40,9 +40,9 @@ void testUpdateMetrics() {
         shardState.setShardInstance(shardInstance);
         HashSet<ShardState> shardStates = new HashSet<>();
         shardStates.add(shardState);
-        HashMap<Shard, HashSet<ShardState>> shardHashSetHashMap = new HashMap<>();
+        Map<Shard, Set<ShardState>> shardHashSetHashMap = new HashMap<>();
         shardHashSetHashMap.put(shard, shardStates);
-        HashMap<Floc, HashMap<Shard, HashSet<ShardState>>> metricsInformation = new HashMap<>();
+        Map<Floc, Map<Shard, Set<ShardState>>> metricsInformation = new HashMap<>();
         metricsInformation.put(floc, shardHashSetHashMap);
 
         ShardRegistry shardRegistry = Mockito.mock(ShardRegistry.class);
@@ -70,9 +70,9 @@ void testShardingStateNull() {
         shardInstance.setHostName("myInstanceHost");
         HashSet<ShardState> shardStates = new HashSet<>();
         shardStates.add(null);
-        HashMap<Shard, HashSet<ShardState>> shardHashSetHashMap = new HashMap<>();
+        Map<Shard, Set<ShardState>> shardHashSetHashMap = new HashMap<>();
         shardHashSetHashMap.put(shard, shardStates);
-        HashMap<Floc, HashMap<Shard, HashSet<ShardState>>> metricsInformation = new HashMap<>();
+        Map<Floc, Map<Shard, Set<ShardState>>> metricsInformation = new HashMap<>();
         metricsInformation.put(floc, shardHashSetHashMap);
         ShardRegistry shardRegistry = Mockito.mock(ShardRegistry.class);
         MeterRegistry meterRegistry = new SimpleMeterRegistry();

alfred-telemetry-platform/src/test/java/eu/xenit/alfred/telemetry/webscripts/console/AdminConsoleWebScriptTest.java

@@ -12,10 +12,10 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.isEmptyString;
-import static org.junit.Assert.assertThat;
 
 import eu.xenit.alfred.telemetry.webscripts.console.AdminConsoleWebscriptResponseModel.TelemetryRegistryModel;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;

alfred-telemetry-platform/src/test/java/eu/xenit/alfred/telemetry/webscripts/stubs/WebScriptTestInfrastructure.java

@@ -2,7 +2,7 @@
 
 import static eu.xenit.alfred.telemetry.webscripts.stubs.ServerModelStub.enterprise_52;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.springframework.extensions.webscripts.DeclarativeRegistry.WEBSCRIPT_DESC_XML;

alfred-telemetry-solr/alfred-telemetry-solr-common/build.gradle

@@ -6,7 +6,7 @@ plugins {
 description = "Alfred Telemetry Common module which enables exposure of Metrics using Micrometer"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
     withJavadocJar()
     withSourcesJar()
 }

alfred-telemetry-solr/alfred-telemetry-solr4/build.gradle

@@ -8,7 +8,7 @@ plugins {
 description = "Alfred Telemetry Solr4 module which enables exposure of Metrics using Micrometer"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 

alfred-telemetry-solr/alfred-telemetry-solr6/build.gradle

@@ -8,7 +8,7 @@ plugins {
 description = "Alfred Telemetry Solr6 module which enables exposure of Metrics using Micrometer"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 apply from: './overload.gradle'

build.gradle

@@ -21,10 +21,10 @@ allprojects {
     apply plugin: 'jacoco'
 
     compileJava {
-        options.release = 11
+        options.release = 17
     }
     compileTestJava {
-        options.release = 11
+        options.release = 17
     }
 
     jacocoTestReport {

settings.gradle

@@ -14,7 +14,7 @@ include ':alfred-telemetry-solr'
 
 include ':integration-tests'
 
-def integrationTestVersions = ["61", "62", "70","71","72","73","74"];
+def integrationTestVersions = [];
 
 if (!hasProperty("community")) {
     integrationTestVersions.each { version ->