Add changes suggested by IntelliJ code cleanup

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);

webauthn-server-core/src/main/java/com/yubico/webauthn/data/PublicKeyCredentialCreationOptions.java

@@ -238,7 +238,7 @@ public static class PublicKeyCredentialCreationOptionsBuilder {
     private AuthenticatorSelectionCriteria authenticatorSelection = null;
 
     public static class MandatoryStages {
-      private PublicKeyCredentialCreationOptionsBuilder builder =
+      private final PublicKeyCredentialCreationOptionsBuilder builder =
           new PublicKeyCredentialCreationOptionsBuilder();
 
       /**

webauthn-server-core/src/main/java/com/yubico/webauthn/data/PublicKeyCredentialDescriptor.java

@@ -112,7 +112,7 @@ public static class PublicKeyCredentialDescriptorBuilder {
     private Set<AuthenticatorTransport> transports = null;
 
     public static class MandatoryStages {
-      private PublicKeyCredentialDescriptorBuilder builder =
+      private final PublicKeyCredentialDescriptorBuilder builder =
           new PublicKeyCredentialDescriptorBuilder();
 
       /**

webauthn-server-core/src/main/java/com/yubico/webauthn/data/PublicKeyCredentialParameters.java

@@ -106,7 +106,7 @@ public static PublicKeyCredentialParametersBuilder.MandatoryStages builder() {
 
   public static class PublicKeyCredentialParametersBuilder {
     public static class MandatoryStages {
-      private PublicKeyCredentialParametersBuilder builder =
+      private final PublicKeyCredentialParametersBuilder builder =
           new PublicKeyCredentialParametersBuilder();
 
       /**

webauthn-server-core/src/main/java/com/yubico/webauthn/data/PublicKeyCredentialRequestOptions.java

@@ -170,7 +170,7 @@ public static class PublicKeyCredentialRequestOptionsBuilder {
     private List<PublicKeyCredentialDescriptor> allowCredentials = null;
 
     public static class MandatoryStages {
-      private PublicKeyCredentialRequestOptionsBuilder builder =
+      private final PublicKeyCredentialRequestOptionsBuilder builder =
           new PublicKeyCredentialRequestOptionsBuilder();
 
       /**

webauthn-server-core/src/main/java/com/yubico/webauthn/data/RelyingPartyIdentity.java

@@ -79,7 +79,7 @@ public static RelyingPartyIdentityBuilder.MandatoryStages builder() {
   public static class RelyingPartyIdentityBuilder {
 
     public static class MandatoryStages {
-      private RelyingPartyIdentityBuilder builder = new RelyingPartyIdentityBuilder();
+      private final RelyingPartyIdentityBuilder builder = new RelyingPartyIdentityBuilder();
 
       /**
        * A unique identifier for the Relying Party, which sets the <a

webauthn-server-core/src/main/java/com/yubico/webauthn/data/UserIdentity.java

@@ -118,7 +118,7 @@ public static UserIdentityBuilder.MandatoryStages builder() {
   public static class UserIdentityBuilder {
 
     public static class MandatoryStages {
-      private UserIdentityBuilder builder = new UserIdentityBuilder();
+      private final UserIdentityBuilder builder = new UserIdentityBuilder();
 
       /**
        * {@link UserIdentityBuilder#name(String) name} is a required parameter.

webauthn-server-demo/src/main/java/com/yubico/webauthn/attestation/matcher/ExtensionMatcher.java

@@ -30,14 +30,15 @@
 import com.yubico.webauthn.data.exception.HexException;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.DEROctetString;
 
 @Slf4j
 public final class ExtensionMatcher implements DeviceMatcher {
-  private static final Charset CHARSET = Charset.forName("UTF-8");
+  private static final Charset CHARSET = StandardCharsets.UTF_8;
 
   public static final String SELECTOR_TYPE = "x509Extension";
 

webauthn-server-demo/src/main/java/demo/webauthn/WebAuthnRestResource.java

@@ -378,7 +378,7 @@ private Response messagesJson(ResponseBuilder response, List<String> messages) {
   }
 
   private String writeJson(Object o) throws JsonProcessingException {
-    if (uriInfo.getQueryParameters().keySet().contains("pretty")) {
+    if (uriInfo.getQueryParameters().containsKey("pretty")) {
       return jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(o);
     } else {
       return jsonMapper.writeValueAsString(o);