From 1c1a0afbed37ee00db593f5f1d786b8394bc2764 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 8 Oct 2022 01:43:56 +0900 Subject: [PATCH] Use AssertJ static imports consistently in 5.3.x Closes gh-29282 --- .../core/CollectionFactoryTests.java | 5 +- .../core/KotlinBridgeMethodResolverTests.kt | 20 +++---- .../core/KotlinDataClassRowMapperTests.kt | 10 ++-- ...nSerializationJsonMessageConverterTests.kt | 55 ++++++++++--------- ...inDynamicPropertySourceIntegrationTests.kt | 8 +-- ...esAnnotationTransactionInterceptorTests.kt | 22 ++++---- ...bstractCoroutinesTransactionAspectTests.kt | 18 +++--- .../CoroutinesTransactionInterceptorTests.kt | 8 +-- .../KotlinSerializationJsonDecoderTests.kt | 32 +++++------ .../KotlinSerializationJsonEncoderTests.kt | 30 +++++----- 10 files changed, 104 insertions(+), 104 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java b/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java index 56dbd932f55..570099d83af 100644 --- a/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java +++ b/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,6 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.util.LinkedMultiValueMap; @@ -156,7 +155,7 @@ class CollectionFactoryTests { @Test void createApproximateCollectionFromEmptyHashSet() { Collection set = createApproximateCollection(new HashSet(), 2); - Assertions.assertThat(set).isEmpty(); + assertThat(set).isEmpty(); } @Test diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt b/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt index 54db15dd45a..5d4303ab786 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package org.springframework.core -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test class KotlinBridgeMethodResolverTests { @@ -25,22 +25,22 @@ class KotlinBridgeMethodResolverTests { fun findBridgedMethod() { val unbridged = GenericRepository::class.java.getDeclaredMethod("delete", Int::class.java) val bridged = GenericRepository::class.java.getDeclaredMethod("delete", Any::class.java) - Assertions.assertThat(unbridged.isBridge).isFalse - Assertions.assertThat(bridged.isBridge).isTrue + assertThat(unbridged.isBridge).isFalse + assertThat(bridged.isBridge).isTrue - Assertions.assertThat(BridgeMethodResolver.findBridgedMethod(unbridged)).`as`("Unbridged method not returned directly").isEqualTo(unbridged) - Assertions.assertThat(BridgeMethodResolver.findBridgedMethod(bridged)).`as`("Incorrect bridged method returned").isEqualTo(unbridged) + assertThat(BridgeMethodResolver.findBridgedMethod(unbridged)).`as`("Unbridged method not returned directly").isEqualTo(unbridged) + assertThat(BridgeMethodResolver.findBridgedMethod(bridged)).`as`("Incorrect bridged method returned").isEqualTo(unbridged) } @Test fun findBridgedMethodWithArrays() { val unbridged = GenericRepository::class.java.getDeclaredMethod("delete", Array::class.java) val bridged = GenericRepository::class.java.getDeclaredMethod("delete", Array::class.java) - Assertions.assertThat(unbridged.isBridge).isFalse - Assertions.assertThat(bridged.isBridge).isTrue + assertThat(unbridged.isBridge).isFalse + assertThat(bridged.isBridge).isTrue - Assertions.assertThat(BridgeMethodResolver.findBridgedMethod(unbridged)).`as`("Unbridged method not returned directly").isEqualTo(unbridged) - Assertions.assertThat(BridgeMethodResolver.findBridgedMethod(bridged)).`as`("Incorrect bridged method returned").isEqualTo(unbridged) + assertThat(BridgeMethodResolver.findBridgedMethod(unbridged)).`as`("Unbridged method not returned directly").isEqualTo(unbridged) + assertThat(BridgeMethodResolver.findBridgedMethod(bridged)).`as`("Incorrect bridged method returned").isEqualTo(unbridged) } } diff --git a/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/KotlinDataClassRowMapperTests.kt b/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/KotlinDataClassRowMapperTests.kt index 53738d0a21b..81b7ae3a500 100644 --- a/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/KotlinDataClassRowMapperTests.kt +++ b/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/KotlinDataClassRowMapperTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors + * Copyright 2002-2022 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package org.springframework.jdbc.core -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.springframework.jdbc.core.test.ConstructorPerson import java.math.BigDecimal @@ -31,7 +31,7 @@ class KotlinDataClassRowMapperTests : AbstractRowMapperTests() { "select name, age, birth_date, balance from people", DataClassRowMapper(ConstructorPerson::class.java) ) - Assertions.assertThat(result.size).isEqualTo(1) + assertThat(result.size).isEqualTo(1) verifyPerson(result[0]) mock.verifyClosed() } @@ -43,8 +43,8 @@ class KotlinDataClassRowMapperTests : AbstractRowMapperTests() { "select name, age, birth_date, balance from people", DataClassRowMapper(KotlinPerson::class.java) ) - Assertions.assertThat(result.size).isEqualTo(1) - Assertions.assertThat(result[0].name).isEqualTo("Bubba appended by init") + assertThat(result.size).isEqualTo(1) + assertThat(result[0].name).isEqualTo("Bubba appended by init") } diff --git a/spring-messaging/src/test/kotlin/org/springframework/messaging/converter/KotlinSerializationJsonMessageConverterTests.kt b/spring-messaging/src/test/kotlin/org/springframework/messaging/converter/KotlinSerializationJsonMessageConverterTests.kt index dec7bf9cc10..875a50529c5 100644 --- a/spring-messaging/src/test/kotlin/org/springframework/messaging/converter/KotlinSerializationJsonMessageConverterTests.kt +++ b/spring-messaging/src/test/kotlin/org/springframework/messaging/converter/KotlinSerializationJsonMessageConverterTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,8 @@ package org.springframework.messaging.converter import kotlinx.serialization.Serializable -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.assertThatExceptionOfType import org.junit.jupiter.api.Test import org.springframework.core.MethodParameter import org.springframework.messaging.support.MessageBuilder @@ -50,12 +51,12 @@ class KotlinSerializationJsonMessageConverterTests { val message = MessageBuilder.withPayload(payload.toByteArray(StandardCharsets.UTF_8)).build() val result = converter.fromMessage(message, SerializableBean::class.java) as SerializableBean - Assertions.assertThat(result.bytes).containsExactly(0x1, 0x2) - Assertions.assertThat(result.array).containsExactly("Foo", "Bar") - Assertions.assertThat(result.number).isEqualTo(42) - Assertions.assertThat(result.string).isEqualTo("Foo") - Assertions.assertThat(result.bool).isTrue() - Assertions.assertThat(result.fraction).isEqualTo(42.0f) + assertThat(result.bytes).containsExactly(0x1, 0x2) + assertThat(result.array).containsExactly("Foo", "Bar") + assertThat(result.number).isEqualTo(42) + assertThat(result.string).isEqualTo("Foo") + assertThat(result.bool).isTrue() + assertThat(result.fraction).isEqualTo(42.0f) } @Test @@ -82,13 +83,13 @@ class KotlinSerializationJsonMessageConverterTests { val message = MessageBuilder.withPayload(payload.toByteArray(StandardCharsets.UTF_8)).build() val result = converter.fromMessage(message, Array::class.java) as Array - Assertions.assertThat(result).hasSize(1) - Assertions.assertThat(result[0].bytes).containsExactly(0x1, 0x2) - Assertions.assertThat(result[0].array).containsExactly("Foo", "Bar") - Assertions.assertThat(result[0].number).isEqualTo(42) - Assertions.assertThat(result[0].string).isEqualTo("Foo") - Assertions.assertThat(result[0].bool).isTrue() - Assertions.assertThat(result[0].fraction).isEqualTo(42.0f) + assertThat(result).hasSize(1) + assertThat(result[0].bytes).containsExactly(0x1, 0x2) + assertThat(result[0].array).containsExactly("Foo", "Bar") + assertThat(result[0].number).isEqualTo(42) + assertThat(result[0].string).isEqualTo("Foo") + assertThat(result[0].bool).isTrue() + assertThat(result[0].fraction).isEqualTo(42.0f) } @Test @@ -118,13 +119,13 @@ class KotlinSerializationJsonMessageConverterTests { val message = MessageBuilder.withPayload(payload.toByteArray(StandardCharsets.UTF_8)).build() val result = converter.fromMessage(message, typeOf>()::class.java, param) as List - Assertions.assertThat(result).hasSize(1) - Assertions.assertThat(result[0].bytes).containsExactly(0x1, 0x2) - Assertions.assertThat(result[0].array).containsExactly("Foo", "Bar") - Assertions.assertThat(result[0].number).isEqualTo(42) - Assertions.assertThat(result[0].string).isEqualTo("Foo") - Assertions.assertThat(result[0].bool).isTrue() - Assertions.assertThat(result[0].fraction).isEqualTo(42.0f) + assertThat(result).hasSize(1) + assertThat(result[0].bytes).containsExactly(0x1, 0x2) + assertThat(result[0].array).containsExactly("Foo", "Bar") + assertThat(result[0].number).isEqualTo(42) + assertThat(result[0].string).isEqualTo("Foo") + assertThat(result[0].bool).isTrue() + assertThat(result[0].fraction).isEqualTo(42.0f) } @Test @@ -134,7 +135,7 @@ class KotlinSerializationJsonMessageConverterTests { """.trimIndent() val message = MessageBuilder.withPayload(payload.toByteArray(StandardCharsets.UTF_8)).build() - Assertions.assertThatExceptionOfType(MessageConversionException::class.java).isThrownBy { + assertThatExceptionOfType(MessageConversionException::class.java).isThrownBy { converter.fromMessage(message, SerializableBean::class.java) } } @@ -145,7 +146,7 @@ class KotlinSerializationJsonMessageConverterTests { val message = converter.toMessage(serializableBean, null) val result = String((message!!.payload as ByteArray), StandardCharsets.UTF_8) - Assertions.assertThat(result) + assertThat(result) .contains("\"bytes\":[1,2]") .contains("\"array\":[\"Foo\",\"Bar\"]") .contains("\"number\":42") @@ -160,7 +161,7 @@ class KotlinSerializationJsonMessageConverterTests { val message = converter.toMessage(serializableBean, null) val result = String((message!!.payload as ByteArray), StandardCharsets.UTF_8) - Assertions.assertThat(result) + assertThat(result) .contains("\"bytes\":[1,2]") .contains("\"array\":[\"Foo\",\"Bar\"]") .contains("\"number\":42") @@ -179,7 +180,7 @@ class KotlinSerializationJsonMessageConverterTests { val message = converter.toMessage(arrayOf(serializableBean), null) val result = String((message!!.payload as ByteArray), StandardCharsets.UTF_8) - Assertions.assertThat(result).isEqualTo(expectedJson) + assertThat(result).isEqualTo(expectedJson) } @Test @@ -195,7 +196,7 @@ class KotlinSerializationJsonMessageConverterTests { val message = converter.toMessage(arrayListOf(serializableBean), null, param) val result = String((message!!.payload as ByteArray), StandardCharsets.UTF_8) - Assertions.assertThat(result).isEqualTo(expectedJson) + assertThat(result).isEqualTo(expectedJson) } @Suppress("UNUSED_PARAMETER") diff --git a/spring-test/src/test/kotlin/org/springframework/test/context/KotlinDynamicPropertySourceIntegrationTests.kt b/spring-test/src/test/kotlin/org/springframework/test/context/KotlinDynamicPropertySourceIntegrationTests.kt index f83837a051b..0e972da175f 100644 --- a/spring-test/src/test/kotlin/org/springframework/test/context/KotlinDynamicPropertySourceIntegrationTests.kt +++ b/spring-test/src/test/kotlin/org/springframework/test/context/KotlinDynamicPropertySourceIntegrationTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.springframework.test.context -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value @@ -36,8 +36,8 @@ class KotlinDynamicPropertySourceIntegrationTests { @Test fun hasInjectedValues(@Autowired service: Service) { - Assertions.assertThat(service.ip).isEqualTo("127.0.0.1") - Assertions.assertThat(service.port).isEqualTo(4242) + assertThat(service.ip).isEqualTo("127.0.0.1") + assertThat(service.port).isEqualTo(4242) } @Configuration diff --git a/spring-tx/src/test/kotlin/org/springframework/transaction/annotation/CoroutinesAnnotationTransactionInterceptorTests.kt b/spring-tx/src/test/kotlin/org/springframework/transaction/annotation/CoroutinesAnnotationTransactionInterceptorTests.kt index fa823eb79f0..8af92330a3e 100644 --- a/spring-tx/src/test/kotlin/org/springframework/transaction/annotation/CoroutinesAnnotationTransactionInterceptorTests.kt +++ b/spring-tx/src/test/kotlin/org/springframework/transaction/annotation/CoroutinesAnnotationTransactionInterceptorTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,8 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.fail import org.junit.jupiter.api.Test import org.springframework.aop.framework.ProxyFactory import org.springframework.transaction.interceptor.TransactionInterceptor @@ -60,7 +61,6 @@ class CoroutinesAnnotationTransactionInterceptorTests { } catch (ex: IllegalStateException) { } - } assertReactiveGetTransactionAndRollbackCount(1) } @@ -72,7 +72,7 @@ class CoroutinesAnnotationTransactionInterceptorTests { proxyFactory.addAdvice(TransactionInterceptor(rtm, source)) val proxy = proxyFactory.proxy as TestWithCoroutines runBlocking { - Assertions.assertThat(proxy.suspendingValueSuccess()).isEqualTo("foo") + assertThat(proxy.suspendingValueSuccess()).isEqualTo("foo") } assertReactiveGetTransactionAndCommitCount(1) } @@ -86,7 +86,7 @@ class CoroutinesAnnotationTransactionInterceptorTests { runBlocking { try { proxy.suspendingValueFailure() - Assertions.fail("No exception thrown as expected") + fail("No exception thrown as expected") } catch (ex: IllegalStateException) { } @@ -101,7 +101,7 @@ class CoroutinesAnnotationTransactionInterceptorTests { proxyFactory.addAdvice(TransactionInterceptor(rtm, source)) val proxy = proxyFactory.proxy as TestWithCoroutines runBlocking { - Assertions.assertThat(proxy.suspendingFlowSuccess().toList()).containsExactly("foo", "foo") + assertThat(proxy.suspendingFlowSuccess().toList()).containsExactly("foo", "foo") } assertReactiveGetTransactionAndCommitCount(1) } @@ -113,19 +113,19 @@ class CoroutinesAnnotationTransactionInterceptorTests { proxyFactory.addAdvice(TransactionInterceptor(rtm, source)) val proxy = proxyFactory.proxy as TestWithCoroutines runBlocking { - Assertions.assertThat(proxy.flowSuccess().toList()).containsExactly("foo", "foo") + assertThat(proxy.flowSuccess().toList()).containsExactly("foo", "foo") } assertReactiveGetTransactionAndCommitCount(1) } private fun assertReactiveGetTransactionAndCommitCount(expectedCount: Int) { - Assertions.assertThat(rtm.begun).isEqualTo(expectedCount) - Assertions.assertThat(rtm.commits).isEqualTo(expectedCount) + assertThat(rtm.begun).isEqualTo(expectedCount) + assertThat(rtm.commits).isEqualTo(expectedCount) } private fun assertReactiveGetTransactionAndRollbackCount(expectedCount: Int) { - Assertions.assertThat(rtm.begun).isEqualTo(expectedCount) - Assertions.assertThat(rtm.rollbacks).isEqualTo(expectedCount) + assertThat(rtm.begun).isEqualTo(expectedCount) + assertThat(rtm.rollbacks).isEqualTo(expectedCount) } @Transactional diff --git a/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt b/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt index e620ccf4de7..1f5c936a8cb 100644 --- a/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt +++ b/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package org.springframework.transaction.interceptor import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Fail import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test @@ -188,7 +188,7 @@ abstract class AbstractCoroutinesTransactionAspectTests { ex: Exception, shouldRollback: Boolean, rollbackException: Boolean) { val txatt: TransactionAttribute = object : DefaultTransactionAttribute() { override fun rollbackOn(t: Throwable): Boolean { - Assertions.assertThat(t).isSameAs(ex) + assertThat(t).isSameAs(ex) return shouldRollback } } @@ -218,9 +218,9 @@ abstract class AbstractCoroutinesTransactionAspectTests { } catch (actual: Exception) { if (rollbackException) { - Assertions.assertThat(actual).hasMessage(tex.message).isInstanceOf(tex::class.java) + assertThat(actual).hasMessage(tex.message).isInstanceOf(tex::class.java) } else { - Assertions.assertThat(actual).hasMessage(ex.message).isInstanceOf(ex::class.java) + assertThat(actual).hasMessage(ex.message).isInstanceOf(ex::class.java) } } } @@ -259,7 +259,7 @@ abstract class AbstractCoroutinesTransactionAspectTests { itb.getName() } catch (actual: Exception) { - Assertions.assertThat(actual).isInstanceOf(CannotCreateTransactionException::class.java) + assertThat(actual).isInstanceOf(CannotCreateTransactionException::class.java) } } } @@ -291,11 +291,11 @@ abstract class AbstractCoroutinesTransactionAspectTests { itb.setName(name) } catch (ex: Exception) { - Assertions.assertThat(ex).isInstanceOf(RuntimeException::class.java) - Assertions.assertThat(ex.cause).hasMessage(ex.message).isInstanceOf(ex::class.java) + assertThat(ex).isInstanceOf(RuntimeException::class.java) + assertThat(ex.cause).hasMessage(ex.message).isInstanceOf(ex::class.java) } // Should have invoked target and changed name - Assertions.assertThat(itb.getName()).isEqualTo(name) + assertThat(itb.getName()).isEqualTo(name) } } diff --git a/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/CoroutinesTransactionInterceptorTests.kt b/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/CoroutinesTransactionInterceptorTests.kt index f0d1895af95..d7e1c697037 100644 --- a/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/CoroutinesTransactionInterceptorTests.kt +++ b/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/CoroutinesTransactionInterceptorTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package org.springframework.transaction.interceptor -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.springframework.aop.framework.ProxyFactory import org.springframework.transaction.ReactiveTransactionManager @@ -44,9 +44,9 @@ class CoroutinesTransactionInterceptorTests : AbstractCoroutinesTransactionAspec override fun advised(target: Any, rtm: ReactiveTransactionManager, tas: TransactionAttributeSource): Any { val ti = TransactionInterceptor() ti.transactionManager = rtm - Assertions.assertThat(ti.transactionManager).isEqualTo(rtm) + assertThat(ti.transactionManager).isEqualTo(rtm) ti.transactionAttributeSource = tas - Assertions.assertThat(ti.transactionAttributeSource).isEqualTo(tas) + assertThat(ti.transactionAttributeSource).isEqualTo(tas) val pf = ProxyFactory(target) pf.addAdvice(0, ti) return pf.proxy diff --git a/spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt b/spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt index bd86de61cfb..45ce8ce29b8 100644 --- a/spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt +++ b/spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package org.springframework.http.codec.json import kotlinx.serialization.Serializable -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.springframework.core.Ordered import org.springframework.core.ResolvableType @@ -43,24 +43,24 @@ class KotlinSerializationJsonDecoderTests : AbstractDecoderTests