From 8bb6fa51aa6a7dd62cb12f1f64271d042ccf32f1 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 27 Feb 2021 10:20:53 -0500 Subject: [PATCH 1/2] bump-deps: bumped deps and fixed gradle warnings --- build.gradle | 17 ++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../tokensmith/jwt/config/JwtAppFactory.java | 4 ++-- .../compact/EncryptedCompactBuilderTest.java | 3 ++- .../compact/SecureCompactBuilderTest.java | 2 +- .../compact/UnsecureCompactBuilderTest.java | 3 ++- .../jwt/entity/jwk/RSAKeyPairTest.java | 5 ++++- .../jwt/entity/jwk/RSAPublicKeyTest.java | 4 +++- .../jwt/entity/jwk/SymmetricKeyTest.java | 6 ++++-- .../jwt/factory/SecureJwtFactoryTest.java | 3 +-- .../jwt/factory/UnSecureJwtFactoryTest.java | 3 ++- .../jwt/jwe/factory/CipherRSAFactoryTest.java | 2 +- .../jwe/factory/CipherSymmetricFactoryTest.java | 3 ++- .../jwt/jwe/factory/SecretKeyGeneratorTest.java | 2 +- .../direct/JweDirectDesializerTest.java | 2 +- .../direct/JweDirectSerializerTest.java | 2 +- .../rsa/JweRsaDeserializerTest.java | 3 ++- .../serialization/rsa/JweRsaSerializerTest.java | 2 +- .../jwt/jwk/PrivateKeyTranslatorTest.java | 2 +- .../jwt/jwk/PublicKeyTranslatorTest.java | 2 +- .../jwt/jwk/generator/KeyGeneratorTest.java | 5 ++++- .../serialization/SecureJwtSerializerTest.java | 3 ++- .../jwt/jws/signer/MacSignerTest.java | 6 +++--- .../jwt/jws/signer/RSASignerTest.java | 2 +- .../jwt/jws/signer/factory/MacFactoryTest.java | 13 +++++++------ .../factory/PrivateKeySignatureFactoryTest.java | 3 ++- .../factory/PublicKeySignatureFactoryTest.java | 3 ++- .../signer/factory/SignerFactoryImplTest.java | 3 ++- .../jws/verifier/VerifyRsaSignatureTest.java | 3 ++- .../factory/VerifySignatureFactoryTest.java | 5 ++--- .../serialization/HeaderDeserializerTest.java | 3 ++- .../jwt/serialization/JwtSerdeTest.java | 2 +- .../jwt/serialization/SerdesTest.java | 3 +-- .../UnSecureJwtSerializerTest.java | 3 ++- 34 files changed, 74 insertions(+), 55 deletions(-) diff --git a/build.gradle b/build.gradle index d75ae2b..164aa83 100644 --- a/build.gradle +++ b/build.gradle @@ -19,9 +19,9 @@ sourceCompatibility = 12 targetCompatibility = 12 ext { - jacksonVersion = '2.11.0' - log4jVersion = '2.13.3' - slf4jVersion = '1.7.25' + jacksonVersion = '2.12.0' + log4jVersion = '2.14.0' + slf4jVersion = '1.7.30' mockitoVersion = '2.28.2' } @@ -30,15 +30,14 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jacksonVersion}" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}" - - compile group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}" + implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}" testImplementation group: 'junit', name: 'junit', version:'4.12' testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version:'1.3' - testCompile "org.mockito:mockito-core:${mockitoVersion}" - testCompile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}" - testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}" - testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}" + testImplementation "org.mockito:mockito-core:${mockitoVersion}" + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}" + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}" + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae8df0d..7ad443c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip diff --git a/src/main/java/net/tokensmith/jwt/config/JwtAppFactory.java b/src/main/java/net/tokensmith/jwt/config/JwtAppFactory.java index d2bce8d..21c36d8 100644 --- a/src/main/java/net/tokensmith/jwt/config/JwtAppFactory.java +++ b/src/main/java/net/tokensmith/jwt/config/JwtAppFactory.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import net.tokensmith.jwt.entity.jwk.Key; import net.tokensmith.jwt.entity.jwk.RSAPublicKey; @@ -62,7 +62,7 @@ public ObjectMapper objectMapper() { if (objectMapper == null) { this.objectMapper = new ObjectMapper() .setPropertyNamingStrategy( - PropertyNamingStrategy.SNAKE_CASE + PropertyNamingStrategies.SNAKE_CASE ) .configure(JsonParser.Feature.STRICT_DUPLICATE_DETECTION, true) .registerModule(new Jdk8Module()) diff --git a/src/test/java/net/tokensmith/jwt/builder/compact/EncryptedCompactBuilderTest.java b/src/test/java/net/tokensmith/jwt/builder/compact/EncryptedCompactBuilderTest.java index 00560f3..162a3e0 100644 --- a/src/test/java/net/tokensmith/jwt/builder/compact/EncryptedCompactBuilderTest.java +++ b/src/test/java/net/tokensmith/jwt/builder/compact/EncryptedCompactBuilderTest.java @@ -20,9 +20,10 @@ import java.util.Optional; import java.util.UUID; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.*; + public class EncryptedCompactBuilderTest { private static JwtAppFactory jwtAppFactory = new JwtAppFactory(); diff --git a/src/test/java/net/tokensmith/jwt/builder/compact/SecureCompactBuilderTest.java b/src/test/java/net/tokensmith/jwt/builder/compact/SecureCompactBuilderTest.java index 5b677a7..6731ab3 100644 --- a/src/test/java/net/tokensmith/jwt/builder/compact/SecureCompactBuilderTest.java +++ b/src/test/java/net/tokensmith/jwt/builder/compact/SecureCompactBuilderTest.java @@ -13,7 +13,7 @@ import java.util.Optional; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class SecureCompactBuilderTest { private SecureCompactBuilder subject; diff --git a/src/test/java/net/tokensmith/jwt/builder/compact/UnsecureCompactBuilderTest.java b/src/test/java/net/tokensmith/jwt/builder/compact/UnsecureCompactBuilderTest.java index eeefea5..18c1469 100644 --- a/src/test/java/net/tokensmith/jwt/builder/compact/UnsecureCompactBuilderTest.java +++ b/src/test/java/net/tokensmith/jwt/builder/compact/UnsecureCompactBuilderTest.java @@ -7,8 +7,9 @@ import java.io.ByteArrayOutputStream; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; + public class UnsecureCompactBuilderTest { private UnsecureCompactBuilder subject; diff --git a/src/test/java/net/tokensmith/jwt/entity/jwk/RSAKeyPairTest.java b/src/test/java/net/tokensmith/jwt/entity/jwk/RSAKeyPairTest.java index 3d575d5..c8bcd59 100644 --- a/src/test/java/net/tokensmith/jwt/entity/jwk/RSAKeyPairTest.java +++ b/src/test/java/net/tokensmith/jwt/entity/jwk/RSAKeyPairTest.java @@ -5,8 +5,11 @@ import java.math.BigInteger; import java.util.Optional; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class RSAKeyPairTest { diff --git a/src/test/java/net/tokensmith/jwt/entity/jwk/RSAPublicKeyTest.java b/src/test/java/net/tokensmith/jwt/entity/jwk/RSAPublicKeyTest.java index efa8553..0a99b5a 100644 --- a/src/test/java/net/tokensmith/jwt/entity/jwk/RSAPublicKeyTest.java +++ b/src/test/java/net/tokensmith/jwt/entity/jwk/RSAPublicKeyTest.java @@ -5,8 +5,10 @@ import java.math.BigInteger; import java.util.Optional; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class RSAPublicKeyTest { diff --git a/src/test/java/net/tokensmith/jwt/entity/jwk/SymmetricKeyTest.java b/src/test/java/net/tokensmith/jwt/entity/jwk/SymmetricKeyTest.java index 5c80344..36f10f8 100644 --- a/src/test/java/net/tokensmith/jwt/entity/jwk/SymmetricKeyTest.java +++ b/src/test/java/net/tokensmith/jwt/entity/jwk/SymmetricKeyTest.java @@ -2,11 +2,13 @@ import org.junit.Test; -import java.math.BigInteger; import java.util.Optional; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class SymmetricKeyTest { diff --git a/src/test/java/net/tokensmith/jwt/factory/SecureJwtFactoryTest.java b/src/test/java/net/tokensmith/jwt/factory/SecureJwtFactoryTest.java index 41d862c..4b50b5c 100644 --- a/src/test/java/net/tokensmith/jwt/factory/SecureJwtFactoryTest.java +++ b/src/test/java/net/tokensmith/jwt/factory/SecureJwtFactoryTest.java @@ -19,10 +19,9 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; - public class SecureJwtFactoryTest { diff --git a/src/test/java/net/tokensmith/jwt/factory/UnSecureJwtFactoryTest.java b/src/test/java/net/tokensmith/jwt/factory/UnSecureJwtFactoryTest.java index aa37bc7..242d45a 100644 --- a/src/test/java/net/tokensmith/jwt/factory/UnSecureJwtFactoryTest.java +++ b/src/test/java/net/tokensmith/jwt/factory/UnSecureJwtFactoryTest.java @@ -13,8 +13,9 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; + /** * Created by tommackenzie on 8/11/15. diff --git a/src/test/java/net/tokensmith/jwt/jwe/factory/CipherRSAFactoryTest.java b/src/test/java/net/tokensmith/jwt/jwe/factory/CipherRSAFactoryTest.java index b1fdc4e..37e7e3b 100644 --- a/src/test/java/net/tokensmith/jwt/jwe/factory/CipherRSAFactoryTest.java +++ b/src/test/java/net/tokensmith/jwt/jwe/factory/CipherRSAFactoryTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class CipherRSAFactoryTest { private PublicKeyTranslator publicKeyTranslator; diff --git a/src/test/java/net/tokensmith/jwt/jwe/factory/CipherSymmetricFactoryTest.java b/src/test/java/net/tokensmith/jwt/jwe/factory/CipherSymmetricFactoryTest.java index 0fe2b48..fc7acb1 100644 --- a/src/test/java/net/tokensmith/jwt/jwe/factory/CipherSymmetricFactoryTest.java +++ b/src/test/java/net/tokensmith/jwt/jwe/factory/CipherSymmetricFactoryTest.java @@ -13,7 +13,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; + public class CipherSymmetricFactoryTest { diff --git a/src/test/java/net/tokensmith/jwt/jwe/factory/SecretKeyGeneratorTest.java b/src/test/java/net/tokensmith/jwt/jwe/factory/SecretKeyGeneratorTest.java index aa6a652..89be345 100644 --- a/src/test/java/net/tokensmith/jwt/jwe/factory/SecretKeyGeneratorTest.java +++ b/src/test/java/net/tokensmith/jwt/jwe/factory/SecretKeyGeneratorTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class SecretKeyGeneratorTest { private SecretKeyGenerator subject; diff --git a/src/test/java/net/tokensmith/jwt/jwe/serialization/direct/JweDirectDesializerTest.java b/src/test/java/net/tokensmith/jwt/jwe/serialization/direct/JweDirectDesializerTest.java index c6a8902..8ca979a 100644 --- a/src/test/java/net/tokensmith/jwt/jwe/serialization/direct/JweDirectDesializerTest.java +++ b/src/test/java/net/tokensmith/jwt/jwe/serialization/direct/JweDirectDesializerTest.java @@ -16,7 +16,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class JweDirectDesializerTest { private static JwtAppFactory jwtAppFactory = new JwtAppFactory(); diff --git a/src/test/java/net/tokensmith/jwt/jwe/serialization/direct/JweDirectSerializerTest.java b/src/test/java/net/tokensmith/jwt/jwe/serialization/direct/JweDirectSerializerTest.java index 6720cc2..51aaaa2 100644 --- a/src/test/java/net/tokensmith/jwt/jwe/serialization/direct/JweDirectSerializerTest.java +++ b/src/test/java/net/tokensmith/jwt/jwe/serialization/direct/JweDirectSerializerTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class JweDirectSerializerTest { diff --git a/src/test/java/net/tokensmith/jwt/jwe/serialization/rsa/JweRsaDeserializerTest.java b/src/test/java/net/tokensmith/jwt/jwe/serialization/rsa/JweRsaDeserializerTest.java index 2611c22..f5baa6e 100644 --- a/src/test/java/net/tokensmith/jwt/jwe/serialization/rsa/JweRsaDeserializerTest.java +++ b/src/test/java/net/tokensmith/jwt/jwe/serialization/rsa/JweRsaDeserializerTest.java @@ -15,7 +15,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; + public class JweRsaDeserializerTest { diff --git a/src/test/java/net/tokensmith/jwt/jwe/serialization/rsa/JweRsaSerializerTest.java b/src/test/java/net/tokensmith/jwt/jwe/serialization/rsa/JweRsaSerializerTest.java index f2476fa..c585a8f 100644 --- a/src/test/java/net/tokensmith/jwt/jwe/serialization/rsa/JweRsaSerializerTest.java +++ b/src/test/java/net/tokensmith/jwt/jwe/serialization/rsa/JweRsaSerializerTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class JweRsaSerializerTest { diff --git a/src/test/java/net/tokensmith/jwt/jwk/PrivateKeyTranslatorTest.java b/src/test/java/net/tokensmith/jwt/jwk/PrivateKeyTranslatorTest.java index 3fd5852..7f9ed66 100644 --- a/src/test/java/net/tokensmith/jwt/jwk/PrivateKeyTranslatorTest.java +++ b/src/test/java/net/tokensmith/jwt/jwk/PrivateKeyTranslatorTest.java @@ -12,7 +12,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class PrivateKeyTranslatorTest { private PrivateKeyTranslator subject; diff --git a/src/test/java/net/tokensmith/jwt/jwk/PublicKeyTranslatorTest.java b/src/test/java/net/tokensmith/jwt/jwk/PublicKeyTranslatorTest.java index bc5a1aa..7157589 100644 --- a/src/test/java/net/tokensmith/jwt/jwk/PublicKeyTranslatorTest.java +++ b/src/test/java/net/tokensmith/jwt/jwk/PublicKeyTranslatorTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class PublicKeyTranslatorTest { private JwtAppFactory appFactory; diff --git a/src/test/java/net/tokensmith/jwt/jwk/generator/KeyGeneratorTest.java b/src/test/java/net/tokensmith/jwt/jwk/generator/KeyGeneratorTest.java index 2d827ff..8395ffe 100644 --- a/src/test/java/net/tokensmith/jwt/jwk/generator/KeyGeneratorTest.java +++ b/src/test/java/net/tokensmith/jwt/jwk/generator/KeyGeneratorTest.java @@ -10,7 +10,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class KeyGeneratorTest { private static final JwtAppFactory jwtAppFactory = new JwtAppFactory(); diff --git a/src/test/java/net/tokensmith/jwt/jws/serialization/SecureJwtSerializerTest.java b/src/test/java/net/tokensmith/jwt/jws/serialization/SecureJwtSerializerTest.java index f281657..99be8e3 100644 --- a/src/test/java/net/tokensmith/jwt/jws/serialization/SecureJwtSerializerTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/serialization/SecureJwtSerializerTest.java @@ -12,8 +12,9 @@ import java.io.ByteArrayOutputStream; import java.util.Optional; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; + public class SecureJwtSerializerTest { diff --git a/src/test/java/net/tokensmith/jwt/jws/signer/MacSignerTest.java b/src/test/java/net/tokensmith/jwt/jws/signer/MacSignerTest.java index 11e6d2d..074e14f 100644 --- a/src/test/java/net/tokensmith/jwt/jws/signer/MacSignerTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/signer/MacSignerTest.java @@ -12,13 +12,13 @@ import org.junit.Before; import org.junit.Test; import net.tokensmith.jwt.config.JwtAppFactory; -import net.tokensmith.jwt.jws.signer.factory.exception.InvalidAlgorithmException; -import net.tokensmith.jwt.jws.signer.factory.exception.InvalidJsonWebKeyException; + import java.util.Optional; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; + /** * Created by tommackenzie on 8/19/15. diff --git a/src/test/java/net/tokensmith/jwt/jws/signer/RSASignerTest.java b/src/test/java/net/tokensmith/jwt/jws/signer/RSASignerTest.java index 2a5a181..9ad17ed 100644 --- a/src/test/java/net/tokensmith/jwt/jws/signer/RSASignerTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/signer/RSASignerTest.java @@ -17,8 +17,8 @@ import java.util.Optional; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; /** * Created by tommackenzie on 11/12/15. diff --git a/src/test/java/net/tokensmith/jwt/jws/signer/factory/MacFactoryTest.java b/src/test/java/net/tokensmith/jwt/jws/signer/factory/MacFactoryTest.java index 40c3ea6..9214d67 100644 --- a/src/test/java/net/tokensmith/jwt/jws/signer/factory/MacFactoryTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/signer/factory/MacFactoryTest.java @@ -7,14 +7,15 @@ import org.junit.Test; import net.tokensmith.jwt.config.JwtAppFactory; import net.tokensmith.jwt.jws.signer.SignAlgorithm; -import net.tokensmith.jwt.jws.signer.factory.exception.InvalidAlgorithmException; import net.tokensmith.jwt.jws.signer.factory.hmac.MacFactory; -import net.tokensmith.jwt.jws.signer.factory.hmac.exception.SecurityKeyException; import javax.crypto.Mac; import java.util.Base64; -import static org.junit.Assert.*; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; /** * Created by tommackenzie on 8/22/15. @@ -34,10 +35,10 @@ public void makeKeyShouldBeHS256WithSecretKey() throws Exception { java.security.Key actual = subject.makeKey(SignAlgorithm.HS256, key); assertNotNull(actual); - assertEquals(actual.getAlgorithm(), SignAlgorithm.HS256.getJdkAlgorithm()); + assertThat(actual.getAlgorithm(), is(SignAlgorithm.HS256.getJdkAlgorithm())); Base64.Encoder encoder = Base64.getUrlEncoder().withoutPadding(); - assertEquals(encoder.encodeToString(actual.getEncoded()), key.getKey()); + assertThat(encoder.encodeToString(actual.getEncoded()), is(key.getKey())); } @Test @@ -46,6 +47,6 @@ public void makeMacShouldBeHS256Alg() throws Exception { Mac actual = subject.makeMac(SignAlgorithm.HS256, key); assertNotNull(actual); - assertEquals(actual.getAlgorithm(), SignAlgorithm.HS256.getJdkAlgorithm()); + assertThat(actual.getAlgorithm(), is(SignAlgorithm.HS256.getJdkAlgorithm())); } } \ No newline at end of file diff --git a/src/test/java/net/tokensmith/jwt/jws/signer/factory/PrivateKeySignatureFactoryTest.java b/src/test/java/net/tokensmith/jwt/jws/signer/factory/PrivateKeySignatureFactoryTest.java index cacdaf6..7304639 100644 --- a/src/test/java/net/tokensmith/jwt/jws/signer/factory/PrivateKeySignatureFactoryTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/signer/factory/PrivateKeySignatureFactoryTest.java @@ -15,8 +15,9 @@ import java.security.interfaces.RSAPrivateCrtKey; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; + /** * Created by tommackenzie on 11/6/15. diff --git a/src/test/java/net/tokensmith/jwt/jws/signer/factory/PublicKeySignatureFactoryTest.java b/src/test/java/net/tokensmith/jwt/jws/signer/factory/PublicKeySignatureFactoryTest.java index 589a4a3..ff9277a 100644 --- a/src/test/java/net/tokensmith/jwt/jws/signer/factory/PublicKeySignatureFactoryTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/signer/factory/PublicKeySignatureFactoryTest.java @@ -13,8 +13,9 @@ import java.security.Signature; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; + /** * Created by tommackenzie on 11/14/15. diff --git a/src/test/java/net/tokensmith/jwt/jws/signer/factory/SignerFactoryImplTest.java b/src/test/java/net/tokensmith/jwt/jws/signer/factory/SignerFactoryImplTest.java index 5746134..347a7f6 100644 --- a/src/test/java/net/tokensmith/jwt/jws/signer/factory/SignerFactoryImplTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/signer/factory/SignerFactoryImplTest.java @@ -13,8 +13,9 @@ import net.tokensmith.jwt.jws.signer.factory.exception.InvalidAlgorithmException; import net.tokensmith.jwt.jws.signer.factory.exception.InvalidJsonWebKeyException; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.*; + /** * Created by tommackenzie on 8/31/15. diff --git a/src/test/java/net/tokensmith/jwt/jws/verifier/VerifyRsaSignatureTest.java b/src/test/java/net/tokensmith/jwt/jws/verifier/VerifyRsaSignatureTest.java index 5961351..8d1d5f7 100644 --- a/src/test/java/net/tokensmith/jwt/jws/verifier/VerifyRsaSignatureTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/verifier/VerifyRsaSignatureTest.java @@ -10,8 +10,9 @@ import org.junit.Test; import net.tokensmith.jwt.config.JwtAppFactory; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; + /** * Created by tommackenzie on 11/14/15. diff --git a/src/test/java/net/tokensmith/jwt/jws/verifier/factory/VerifySignatureFactoryTest.java b/src/test/java/net/tokensmith/jwt/jws/verifier/factory/VerifySignatureFactoryTest.java index aa82a57..c2f747e 100644 --- a/src/test/java/net/tokensmith/jwt/jws/verifier/factory/VerifySignatureFactoryTest.java +++ b/src/test/java/net/tokensmith/jwt/jws/verifier/factory/VerifySignatureFactoryTest.java @@ -1,14 +1,12 @@ package net.tokensmith.jwt.jws.verifier.factory; import helper.entity.Factory; -import net.tokensmith.jwt.entity.jwk.KeyType; import net.tokensmith.jwt.entity.jwk.RSAPublicKey; import net.tokensmith.jwt.entity.jwk.SymmetricKey; import net.tokensmith.jwt.entity.jwt.header.Algorithm; import net.tokensmith.jwt.exception.SignatureException; import net.tokensmith.jwt.jws.signer.factory.exception.InvalidAlgorithmException; import net.tokensmith.jwt.jws.signer.factory.exception.InvalidJsonWebKeyException; -import net.tokensmith.jwt.jws.signer.factory.rsa.exception.PublicKeyException; import org.junit.Before; import org.junit.Test; import net.tokensmith.jwt.config.JwtAppFactory; @@ -20,8 +18,9 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; + /** * Created by tommackenzie on 11/15/15. diff --git a/src/test/java/net/tokensmith/jwt/serialization/HeaderDeserializerTest.java b/src/test/java/net/tokensmith/jwt/serialization/HeaderDeserializerTest.java index 6d5c502..60045f8 100644 --- a/src/test/java/net/tokensmith/jwt/serialization/HeaderDeserializerTest.java +++ b/src/test/java/net/tokensmith/jwt/serialization/HeaderDeserializerTest.java @@ -13,7 +13,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; + public class HeaderDeserializerTest { private HeaderDeserializer subject; diff --git a/src/test/java/net/tokensmith/jwt/serialization/JwtSerdeTest.java b/src/test/java/net/tokensmith/jwt/serialization/JwtSerdeTest.java index a3ab977..ae7b2c1 100644 --- a/src/test/java/net/tokensmith/jwt/serialization/JwtSerdeTest.java +++ b/src/test/java/net/tokensmith/jwt/serialization/JwtSerdeTest.java @@ -18,8 +18,8 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; diff --git a/src/test/java/net/tokensmith/jwt/serialization/SerdesTest.java b/src/test/java/net/tokensmith/jwt/serialization/SerdesTest.java index 6a0af20..8bcaec9 100644 --- a/src/test/java/net/tokensmith/jwt/serialization/SerdesTest.java +++ b/src/test/java/net/tokensmith/jwt/serialization/SerdesTest.java @@ -14,9 +14,8 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; public class SerdesTest { diff --git a/src/test/java/net/tokensmith/jwt/serialization/UnSecureJwtSerializerTest.java b/src/test/java/net/tokensmith/jwt/serialization/UnSecureJwtSerializerTest.java index 6b0015f..b4801dc 100644 --- a/src/test/java/net/tokensmith/jwt/serialization/UnSecureJwtSerializerTest.java +++ b/src/test/java/net/tokensmith/jwt/serialization/UnSecureJwtSerializerTest.java @@ -8,8 +8,9 @@ import java.io.ByteArrayOutputStream; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; + public class UnSecureJwtSerializerTest { From 57e337358c6fe562136cf08b150a7d5887c33d7d Mon Sep 17 00:00:00 2001 From: = Date: Sat, 27 Feb 2021 10:26:17 -0500 Subject: [PATCH 2/2] bump-deps: archive to archiveClassifer --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 164aa83..7f5ee0a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ repositories { } group = 'net.tokensmith' -version = '1.3.4' +version = '1.3.5-SNAPSHOT' description = 'Java implementation of JWT' sourceCompatibility = 12 @@ -43,12 +43,12 @@ dependencies { task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier = 'sources' from(sourceSets.main.allJava) } task javadocJar(type: Jar) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from(javadoc.destinationDir) }