Add changes suggested by IntelliJ code cleanup

Author: emlun

build.gradle

@@ -18,7 +18,7 @@ plugins {
 
 import io.franzbecker.gradle.lombok.LombokPlugin
 import io.franzbecker.gradle.lombok.task.DelombokTask
-import com.yubico.gradle.GitUtils;
+import com.yubico.gradle.GitUtils
 
 rootProject.description = "Metadata root for the com.yubico:webauthn-server-* module family"
 
@@ -201,7 +201,7 @@ subprojects { project ->
   if (project.hasProperty('publishMe') && project.publishMe) {
 
     if (GitUtils.getGitCommit(projectDir) == null) {
-      throw new RuntimeException("Failed to get git commit ID");
+      throw new RuntimeException("Failed to get git commit ID")
     }
 
     publishing {

buildSrc/src/main/groovy/com/yubico/gradle/GitUtils.groovy

@@ -1,4 +1,4 @@
-package com.yubico.gradle;
+package com.yubico.gradle
 
 public class GitUtils {
 

buildSrc/src/main/groovy/com/yubico/gradle/pitest/tasks/PitestMergeTask.groovy

@@ -14,7 +14,7 @@ import org.gradle.api.tasks.TaskAction
 class PitestMergeTask extends DefaultTask {
 
   @OutputFile
-  def File destinationFile = project.file("${project.buildDir}/reports/pitest/mutations.xml")
+  File destinationFile = project.file("${project.buildDir}/reports/pitest/mutations.xml")
 
   PitestMergeTask() {
     project.subprojects.each { subproject ->
@@ -24,7 +24,7 @@ class PitestMergeTask extends DefaultTask {
     }
   }
 
-  def Set<File> findMutationsXmlFiles(File f, Set<File> found) {
+  Set<File> findMutationsXmlFiles(File f, Set<File> found) {
     if (f.isDirectory()) {
       Set<File> result = found
       for (File child : f.listFiles()) {

webauthn-server-attestation/build.gradle.kts

@@ -1,4 +1,5 @@
-import com.yubico.gradle.GitUtils;
+import com.yubico.gradle.GitUtils
+
 plugins {
   `java-library`
   scala

webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/AuthenticatorGetInfo.java

@@ -1,7 +1,6 @@
 package com.yubico.fido.metadata;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
@@ -360,7 +359,7 @@ private static class SetFromIntJsonDeserializer
       extends JsonDeserializer<Set<UserVerificationMethod>> {
     @Override
     public Set<UserVerificationMethod> deserialize(JsonParser p, DeserializationContext ctxt)
-        throws IOException, JacksonException {
+        throws IOException {
       final int bitset = p.getNumberValue().intValue();
       return Arrays.stream(UserVerificationMethod.values())
           .filter(uvm -> (uvm.getValue() & bitset) != 0)

webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/CtapCertificationId.java

@@ -57,7 +57,7 @@ public enum CtapCertificationId {
    */
   FIDO("FIDO");
 
-  @JsonValue private String id;
+  @JsonValue private final String id;
 
   CtapCertificationId(String id) {
     this.id = id;

webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/CtapPinUvAuthProtocolVersion.java

@@ -29,7 +29,7 @@ public enum CtapPinUvAuthProtocolVersion {
    */
   TWO(2);
 
-  @JsonValue private int value;
+  @JsonValue private final int value;
 
   CtapPinUvAuthProtocolVersion(int value) {
     this.value = value;

webauthn-server-core/build.gradle.kts

@@ -1,4 +1,5 @@
-import com.yubico.gradle.GitUtils;
+import com.yubico.gradle.GitUtils
+
 plugins {
   `java-library`
   scala
@@ -67,7 +68,7 @@ tasks.jar {
       "Implementation-Version" to project.version,
       "Implementation-Vendor" to "Yubico",
       "Implementation-Source-Url" to "https://github.com/Yubico/java-webauthn-server",
-      "Git-Commit" to com.yubico.gradle.GitUtils.getGitCommitOrUnknown(projectDir),
+      "Git-Commit" to GitUtils.getGitCommitOrUnknown(projectDir),
     ))
   }
 }

webauthn-server-core/src/main/java/com/yubico/webauthn/RegisteredCredential.java

@@ -113,7 +113,7 @@ public static RegisteredCredentialBuilder.MandatoryStages builder() {
 
   public static class RegisteredCredentialBuilder {
     public static class MandatoryStages {
-      private RegisteredCredentialBuilder builder = new RegisteredCredentialBuilder();
+      private final RegisteredCredentialBuilder builder = new RegisteredCredentialBuilder();
 
       /**
        * {@link RegisteredCredentialBuilder#credentialId(ByteArray) credentialId} is a required

webauthn-server-core/src/main/java/com/yubico/webauthn/RegistrationResult.java

@@ -285,7 +285,7 @@ static RegistrationResultBuilder.MandatoryStages builder() {
 
   static class RegistrationResultBuilder {
     static class MandatoryStages {
-      private RegistrationResultBuilder builder = new RegistrationResultBuilder();
+      private final RegistrationResultBuilder builder = new RegistrationResultBuilder();
 
       Step2 keyId(PublicKeyCredentialDescriptor keyId) {
         builder.keyId(keyId);