Update SpotBugs to 6.4.0 (#1336)

* Update SpotBugs to 6.4.0.
* Fix SpotBugs issue relating to deprecated method `.ensureIndex` and replace with `createIndex`
* Fix build.gradle issues
* Remove deprecation suppressors as these are no longer required.

Author: MartinWheelerMT

service/build.gradle

@@ -3,7 +3,7 @@ plugins {
 	id 'io.spring.dependency-management' version '1.1.7'
 	id 'java'
 	id "checkstyle"
-	id "com.github.spotbugs" version "6.1.13"
+	id "com.github.spotbugs" version "6.4.0"
 	id "io.freefair.lombok" version "8.14.2"
 	id 'jacoco'
 	id 'org.sonarqube' version '6.2.0.5505'
@@ -13,16 +13,27 @@ plugins {
 	id 'com.arcmutate.github' version '2.2.3'
 }
 
+spotbugs {
+    toolVersion = '4.9.5'
+}
+
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'checkstyle'
 apply plugin: "com.github.spotbugs"
 apply plugin: 'application'
 
-mainClassName = ' uk.nhs.adaptors.gp2gp.Gp2gpApplication'
+application {
+    mainClassName = 'uk.nhs.adaptors.gp2gp.Gp2gpApplication'
+}
 
 group = 'uk.nhs.adaptors'
-sourceCompatibility = '21'
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 checkstyle {
 	toolVersion '10.18.2'
@@ -75,6 +86,8 @@ dependencies {
 	testImplementation 'com.squareup.okhttp3:mockwebserver3:5.1.0'
 	testImplementation 'com.adobe.testing:s3mock-testcontainers:4.7.0'
 
+    spotbugs 'com.github.spotbugs:spotbugs:4.9.5'
+    spotbugs 'com.github.spotbugs:spotbugs-annotations:4.9.5'
 
     pitest 'com.arcmutate:base:1.3.2'
     pitest 'com.arcmutate:pitest-git-plugin:2.1.0'
@@ -105,9 +118,10 @@ sourceSets {
 	}
 }
 
-task(interoperabilityTestingToolJsonToXml, dependsOn: 'classes', type: JavaExec) {
-	mainClass.set('uk.nhs.adaptors.gp2gp.transformjsontoxmltool.TransformJsonToXml')
-	classpath = sourceSets.main.runtimeClasspath
+tasks.register('interoperabilityTestingToolJsonToXml', JavaExec) {
+    dependsOn 'classes'
+    mainClass.set('uk.nhs.adaptors.gp2gp.transformjsontoxmltool.TransformJsonToXml')
+    classpath = sourceSets.main.runtimeClasspath
 }
 
 configurations {
@@ -117,21 +131,21 @@ configurations {
 	integrationTestAnnotationProcessor.extendsFrom testAnnotationProcessor
 }
 
-task integrationTest(type: Test) {
-	useJUnitPlatform() {
-		description = 'Runs integration tests.'
-		group = 'verification'
+tasks.register('integrationTest', Test) {
+    useJUnitPlatform() {
+        description = 'Runs integration tests.'
+        group = 'verification'
 
-		testClassesDirs = sourceSets.integrationTest.output.classesDirs
-		classpath = sourceSets.integrationTest.runtimeClasspath
-		shouldRunAfter test
-	}
+        testClassesDirs = sourceSets.integrationTest.output.classesDirs
+        classpath = sourceSets.integrationTest.runtimeClasspath
+        shouldRunAfter test
+    }
 }
 
-tasks.withType(Test) {
-	testLogging {
-		events "passed", "skipped", "failed"
-	}
+tasks.withType(Test).configureEach {
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
 }
 
 check.dependsOn integrationTest
@@ -141,13 +155,13 @@ spotbugsIntegrationTest.enabled = false
 spotbugsMain {
 	reports {
 		html {
-			enabled = true
+			enabled(true)
 		}
 		xml {
-			enabled = true
+			enabled(true)
 		}
-		excludeFilter.set(file("spotbugs/exclude.xml"))
 	}
+    excludeFilter.set(file("spotbugs/exclude.xml"))
 }
 
 pitest {

service/src/main/java/uk/nhs/adaptors/gp2gp/common/configuration/CustomTrustStore.java

@@ -57,7 +57,6 @@ private X509TrustManager getDefaultTrustManager() {
     }
 
     @SneakyThrows
-    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
     protected X509TrustManager getCustomDbTrustManager(S3Uri s3Uri, String trustStorePassword) {
         TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
         trustManagerFactory.init((KeyStore) null);

service/src/main/java/uk/nhs/adaptors/gp2gp/common/mongo/ttl/CosmosTtlCreator.java

@@ -25,7 +25,7 @@ public void create(Class<? extends TimeToLive> clazz) {
             String indexName = findTtlIndex().map(IndexInfo::getName).orElseThrow();
             getIndexOperations().dropIndex(indexName);
         }
-        getIndexOperations().ensureIndex(new Index()
+        getIndexOperations().createIndex(new Index()
             .expire(getDuration())
             .on(INDEX_FIELD_KEY, Sort.Direction.ASC)
         );

service/src/main/java/uk/nhs/adaptors/gp2gp/common/mongo/ttl/MongoTtlCreator.java

@@ -25,7 +25,7 @@ public void create(Class<? extends TimeToLive> clazz) {
                 clazz.getSimpleName(), getDuration());
             getIndexOperations().dropIndex(TTL_INDEX_NAME);
         }
-        getIndexOperations().ensureIndex(new Index()
+        getIndexOperations().createIndex(new Index()
             .expire(getDuration())
             .named(TTL_INDEX_NAME)
             .on(FIELD_KEY, Sort.Direction.ASC)

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EncounterMapper.java

@@ -23,7 +23,6 @@
 
 import com.github.mustachejava.Mustache;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -171,8 +170,6 @@ private String buildOriginalText(Encounter encounter) {
     }
 
     @SneakyThrows
-    @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE",
-        justification = "https://github.com/spotbugs/spotbugs/issues/1338")
     private static Set<String> getEhrCompositionNameVocabularyCodes() {
         try (InputStream is = EncounterMapper.class.getClassLoader().getResourceAsStream("ehr_composition_name_vocabulary_codes.txt");
              BufferedReader reader = new BufferedReader(new InputStreamReader(is, UTF_8))) {

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/SupportedContentTypes.java

@@ -12,7 +12,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 
@@ -27,8 +26,6 @@ public boolean isContentTypeSupported(String attachmentContentType) {
     }
 
     @SneakyThrows
-    @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE",
-        justification = "https://github.com/spotbugs/spotbugs/issues/1338")
     private static Set<String> loadSupportedContentTypes() {
         try (InputStream is = SupportedContentTypes.class.getClassLoader().getResourceAsStream(SUPPORTED_CONTENT_TYPES_PATH);
              BufferedReader reader = new BufferedReader(new InputStreamReader(is, UTF_8))) {