Skip to content

Commit 4a04251

Browse files
mp911deodrotbohm
authored andcommitted
DATACMNS-1101 - Reinstantiate assertions using Supplier.
1 parent 5015b34 commit 4a04251

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -447,10 +447,8 @@ public void setPersistentPropertyAccessorFactory(PersistentPropertyAccessorFacto
447447
public PersistentPropertyAccessor getPropertyAccessor(Object bean) {
448448

449449
Assert.notNull(bean, "Target bean must not be null!");
450-
451-
if (!getType().isInstance(bean)) { // prevent capturing lambda
452-
throw new IllegalArgumentException(String.format(TYPE_MISMATCH, bean.getClass().getName(), getType().getName()));
453-
}
450+
Assert.isTrue(getType().isInstance(bean),
451+
() -> String.format(TYPE_MISMATCH, bean.getClass().getName(), getType().getName()));
454452

455453
return propertyAccessorFactory.getPropertyAccessor(this, bean);
456454
}
@@ -463,10 +461,8 @@ public PersistentPropertyAccessor getPropertyAccessor(Object bean) {
463461
public IdentifierAccessor getIdentifierAccessor(Object bean) {
464462

465463
Assert.notNull(bean, "Target bean must not be null!");
466-
467-
if (!getType().isInstance(bean)) { // prevent capturing lambda
468-
throw new IllegalArgumentException(String.format(TYPE_MISMATCH, bean.getClass().getName(), getType().getName()));
469-
}
464+
Assert.isTrue(getType().isInstance(bean),
465+
() -> String.format(TYPE_MISMATCH, bean.getClass().getName(), getType().getName()));
470466

471467
return hasIdProperty() ? new IdPropertyIdentifierAccessor(this, bean) : new AbsentIdentifierAccessor(bean);
472468
}

0 commit comments

Comments
 (0)