spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-24 02:09:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46855 from scordio

Browse Source 
* pr/46855:
  Replace AssertJ internal APIs with alternative implementations

Closes gh-46855
This commit is contained in:
Stéphane Nicoll
2025-08-18 13:57:43 +02:00
parent 9f0716d501 c7b659cb7e
commit 39dced55a4
2 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/ObjectContentAssert.java
+4 -9
View File
@@ -16,20 +16,18 @@
package org.springframework.boot.test.json;
import java.util.Map;
import org.assertj.core.api.AbstractMapAssert;
import org.assertj.core.api.AbstractObjectArrayAssert;
import org.assertj.core.api.AbstractObjectAssert;
import org.assertj.core.api.Assert;
import org.assertj.core.api.Assertions;
import org.assertj.core.internal.Objects;
import org.assertj.core.api.InstanceOfAssertFactories;
/**
* AssertJ {@link Assert} for {@link ObjectContent}.
*
* @param <A> the actual type
* @author Phillip Webb
* @author Stefano Cordio
* @since 1.4.0
*/
public class ObjectContentAssert<A> extends AbstractObjectAssert<ObjectContentAssert<A>, A> {
@@ -44,8 +42,7 @@ public class ObjectContentAssert<A> extends AbstractObjectAssert<ObjectContentAs
* @return an array assertion object
*/
public AbstractObjectArrayAssert<?, Object> asArray() {
Objects.instance().assertIsInstanceOf(this.info, this.actual, Object[].class);
return Assertions.assertThat((Object[]) this.actual);
return asInstanceOf(InstanceOfAssertFactories.ARRAY);
}
/**
@@ -53,10 +50,8 @@ public class ObjectContentAssert<A> extends AbstractObjectAssert<ObjectContentAs
* chaining of map-specific assertions from this call.
* @return a map assertion object
*/
@SuppressWarnings("unchecked")
public AbstractMapAssert<?, ?, Object, Object> asMap() {
Objects.instance().assertIsInstanceOf(this.info, this.actual, Map.class);
return Assertions.assertThat((Map<Object, Object>) this.actual);
return asInstanceOf(InstanceOfAssertFactories.MAP);
}
}
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/ItemMetadataAssert.java
+25 -22
View File
@@ -16,9 +16,12 @@
package org.springframework.boot.configurationprocessor.test;
import java.util.function.Function;
import org.assertj.core.api.AbstractAssert;
import org.assertj.core.api.AssertProvider;
import org.assertj.core.internal.Objects;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.ObjectAssert;
import org.springframework.boot.configurationprocessor.metadata.ItemDeprecation;
import org.springframework.boot.configurationprocessor.metadata.ItemMetadata;
@@ -28,34 +31,33 @@ import org.springframework.boot.configurationprocessor.metadata.ItemMetadata.Ite
* AssertJ assert for {@link ItemMetadata}.
*
* @author Stephane Nicoll
* @author Stefano Cordio
*/
public class ItemMetadataAssert extends AbstractAssert<ItemMetadataAssert, ItemMetadata>
implements AssertProvider<ItemMetadataAssert> {
private static final Objects objects = Objects.instance();
public ItemMetadataAssert(ItemMetadata itemMetadata) {
super(itemMetadata, ItemMetadataAssert.class);
objects.assertNotNull(this.info, itemMetadata);
isNotNull();
}
public ItemMetadataAssert isProperty() {
objects.assertEqual(this.info, this.actual.isOfItemType(ItemType.PROPERTY), true);
extracting((actual) -> actual.isOfItemType(ItemType.PROPERTY)).isEqualTo(true);
return this;
}
public ItemMetadataAssert isGroup() {
objects.assertEqual(this.info, this.actual.isOfItemType(ItemType.GROUP), true);
extracting((actual) -> actual.isOfItemType(ItemType.GROUP)).isEqualTo(true);
return this;
}
public ItemMetadataAssert hasName(String name) {
objects.assertEqual(this.info, this.actual.getName(), name);
extracting(ItemMetadata::getName).isEqualTo(name);
return this;
}
public ItemMetadataAssert hasType(String type) {
objects.assertEqual(this.info, this.actual.getType(), type);
extracting(ItemMetadata::getType).isEqualTo(type);
return this;
}
@@ -64,7 +66,7 @@ public class ItemMetadataAssert extends AbstractAssert<ItemMetadataAssert, ItemM
}
public ItemMetadataAssert hasDescription(String description) {
objects.assertEqual(this.info, this.actual.getDescription(), description);
extracting(ItemMetadata::getDescription).isEqualTo(description);
return this;
}
@@ -73,7 +75,7 @@ public class ItemMetadataAssert extends AbstractAssert<ItemMetadataAssert, ItemM
}
public ItemMetadataAssert hasSourceType(String type) {
objects.assertEqual(this.info, this.actual.getSourceType(), type);
extracting(ItemMetadata::getSourceType).isEqualTo(type);
return this;
}
@@ -82,12 +84,12 @@ public class ItemMetadataAssert extends AbstractAssert<ItemMetadataAssert, ItemM
}
public ItemMetadataAssert hasSourceMethod(String type) {
objects.assertEqual(this.info, this.actual.getSourceMethod(), type);
extracting(ItemMetadata::getSourceMethod).isEqualTo(type);
return this;
}
public ItemMetadataAssert hasDefaultValue(Object defaultValue) {
objects.assertEqual(this.info, this.actual.getDefaultValue(), defaultValue);
extracting(ItemMetadata::getDefaultValue).isEqualTo(defaultValue);
return this;
}
@@ -97,27 +99,28 @@ public class ItemMetadataAssert extends AbstractAssert<ItemMetadataAssert, ItemM
}
public ItemMetadataAssert isDeprecatedWithReason(String reason) {
ItemDeprecation deprecation = assertItemDeprecation();
objects.assertEqual(this.info, deprecation.getReason(), reason);
assertItemDeprecation().extracting(ItemDeprecation::getReason).isEqualTo(reason);
return this;
}
public ItemMetadataAssert isDeprecatedWithReplacement(String replacement) {
ItemDeprecation deprecation = assertItemDeprecation();
objects.assertEqual(this.info, deprecation.getReplacement(), replacement);
assertItemDeprecation().extracting(ItemDeprecation::getReplacement).isEqualTo(replacement);
return this;
}
public ItemMetadataAssert isNotDeprecated() {
objects.assertNull(this.info, this.actual.getDeprecation());
extracting(ItemMetadata::getDeprecation).isNull();
return this;
}
private ItemDeprecation assertItemDeprecation() {
ItemDeprecation deprecation = this.actual.getDeprecation();
objects.assertNotNull(this.info, deprecation);
objects.assertNull(this.info, deprecation.getLevel());
return deprecation;
private ObjectAssert<ItemDeprecation> assertItemDeprecation() {
ObjectAssert<ItemDeprecation> itemDeprecationAssert = extracting(ItemMetadata::getDeprecation);
itemDeprecationAssert.extracting(ItemDeprecation::getLevel).isNull();
return itemDeprecationAssert;
}
private <T> ObjectAssert<T> extracting(Function<ItemMetadata, T> extractor) {
return super.extracting(extractor, Assertions::assertThat);
}
@Override