Skip to content

Commit 6369338

Browse files
committed
Address some IntelliJ code inspection warnings in Scala code
1 parent 1a9dbc4 commit 6369338

File tree

6 files changed

+5
-12
lines changed

6 files changed

+5
-12
lines changed

webauthn-server-core/src/main/scala/com/yubico/scala/util/JavaConverters.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package com.yubico.scala.util
33
import java.util.Optional
44
import java.util.function.Supplier
55

6+
import scala.language.implicitConversions
7+
68

79
case class AsJavaOptional[A](a: Option[A]) {
810
def asJava[B >: A]: Optional[B] = a match {
@@ -15,9 +17,7 @@ case class AsScalaOption[A](a: Optional[A]) {
1517
}
1618

1719
case class AsJavaSupplier[A](a: () => A) {
18-
def asJava[B >: A]: Supplier[B] = new Supplier[B] {
19-
override def get(): B = a()
20-
}
20+
def asJava[B >: A]: Supplier[B] = () => a()
2121
}
2222

2323
object JavaConverters {

webauthn-server-core/src/main/scala/com/yubico/webauthn/FinishRegistrationSteps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ case class FinishRegistrationSteps(
277277
def attestationTrusted: Boolean = {
278278
attestationType match {
279279
case SelfAttestation | NoneAttestation => allowUntrustedAttestation
280-
case Basic => attestationMetadata.asScala map { _.isTrusted } getOrElse false
280+
case Basic => attestationMetadata.asScala exists { _.isTrusted }
281281
case _ => ???
282282
}
283283
}

webauthn-server-core/src/main/scala/com/yubico/webauthn/data/AuthenticatorData.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import scala.util.Failure
1818

1919
case class AuthenticatorData(
2020
@JsonIgnore
21-
val authData: ArrayBuffer
21+
authData: ArrayBuffer
2222
) {
2323
private val RpIdHashLength = 32
2424
private val FlagsLength = 1

webauthn-server-core/src/main/scala/com/yubico/webauthn/data/CollectedClientData.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ case class CollectedClientData(
1616
private val clientData: JsonNode
1717
) {
1818

19-
private val logger: Logger = LoggerFactory.getLogger(classOf[CollectedClientData])
20-
2119
/**
2220
* Input or output values for or from authenticator extensions, if any.
2321
*/

webauthn-server-core/src/main/scala/com/yubico/webauthn/impl/PackedAttestationStatementVerifier.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ object PackedAttestationStatementVerifier extends AttestationStatementVerifier w
4242
"attStmt.sig must be set to a binary value."
4343
)
4444

45-
val signedData: ArrayBuffer = attestationObject.authenticatorData.authData ++ clientDataJsonHash
46-
47-
val signature: ArrayBuffer = signatureNode.binaryValue.toVector
48-
4945
if (attestationObject.attestationStatement.has("x5c"))
5046
verifyX5cSignature(attestationObject, clientDataJsonHash)
5147
else if (attestationObject.attestationStatement.has("ecdaaKeyId"))

webauthn-server-core/src/main/scala/com/yubico/webauthn/util/BinaryUtil.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ object BinaryUtil {
8989
* Read 4 bytes as a big endian unsigned 32-bit integer.
9090
*
9191
* Result is of type Long because Scala/Java don't have unsigned types.
92-
* @param bytes
9392
* @return A value between 0 and 2^32 - 1, inclusive.
9493
*/
9594
def getUint32(bytes: ArrayBuffer): Try[Long] = Try(

0 commit comments

Comments
 (0)