Deprecate ObjectAssertFactory

assertj · Apr 28, 2024 · 39e6bda · 39e6bda
1 parent acd282b
commit 39e6bda
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/assertj-core/src/main/java/org/assertj/core/api/CollectionAssert.java b/assertj-core/src/main/java/org/assertj/core/api/CollectionAssert.java
@@ -39,7 +39,7 @@ public CollectionAssert(Collection<? extends ELEMENT> actual) {
 
   @Override
   protected ObjectAssert<ELEMENT> toAssert(ELEMENT value, String description) {
-    return new ObjectAssertFactory<ELEMENT>().createAssert(value).as(description);
+    return new ObjectAssert<>(value).as(description);
   }
 
   @Override

diff --git a/assertj-core/src/main/java/org/assertj/core/api/IterableAssert.java b/assertj-core/src/main/java/org/assertj/core/api/IterableAssert.java
@@ -37,7 +37,7 @@ public class IterableAssert<ELEMENT> extends
     FactoryBasedNavigableIterableAssert<IterableAssert<ELEMENT>, Iterable<? extends ELEMENT>, ELEMENT, ObjectAssert<ELEMENT>> {
 
   public IterableAssert(Iterable<? extends ELEMENT> actual) {
-    super(actual, IterableAssert.class, new ObjectAssertFactory<>());
+    super(actual, IterableAssert.class, ObjectAssert::new);
   }
 
   @Override

diff --git a/assertj-core/src/main/java/org/assertj/core/api/ListAssert.java b/assertj-core/src/main/java/org/assertj/core/api/ListAssert.java
@@ -65,7 +65,7 @@ public static ListAssert<Integer> assertThatIntStream(IntStream actual) {
   }
 
   public ListAssert(List<? extends ELEMENT> actual) {
-    super(actual, ListAssert.class, new ObjectAssertFactory<>());
+    super(actual, ListAssert.class, ObjectAssert::new);
   }
 
   public ListAssert(Stream<? extends ELEMENT> actual) {

diff --git a/assertj-core/src/main/java/org/assertj/core/api/ObjectAssertFactory.java b/assertj-core/src/main/java/org/assertj/core/api/ObjectAssertFactory.java
@@ -13,8 +13,11 @@
 package org.assertj.core.api;
 
 /**
+ * @deprecated Use {@link Assertions#assertThat(Object)} instead.
+ *
  * @since 2.5.0 / 3.5.0
  */
+@Deprecated
 public class ObjectAssertFactory<T> implements AssertFactory<T, ObjectAssert<T>> {
 
   /** {@inheritDoc} */

diff --git a/assertj-core/src/test/java/org/assertj/core/api/ConcreteIterableAssert.java b/assertj-core/src/test/java/org/assertj/core/api/ConcreteIterableAssert.java
@@ -18,7 +18,7 @@ public class ConcreteIterableAssert<ELEMENT> extends
     FactoryBasedNavigableIterableAssert<ConcreteIterableAssert<ELEMENT>, Iterable<ELEMENT>, ELEMENT, ObjectAssert<ELEMENT>> {
 
   public ConcreteIterableAssert(Collection<ELEMENT> actual) {
-    super(actual, ConcreteIterableAssert.class, new ObjectAssertFactory<>());
+    super(actual, ConcreteIterableAssert.class, ObjectAssert::new);
   }
 
   @Override