From 4a04251a81045adb51d5ec5caf7d2989d8bd9ba5 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 29 Jun 2017 13:22:56 +0200 Subject: [PATCH] DATACMNS-1101 - Reinstantiate assertions using Supplier. --- .../data/mapping/model/BasicPersistentEntity.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java index e0c78e339..f8a8f2ef5 100644 --- a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java +++ b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java @@ -447,10 +447,8 @@ public class BasicPersistentEntity> implement public PersistentPropertyAccessor getPropertyAccessor(Object bean) { Assert.notNull(bean, "Target bean must not be null!"); - - if (!getType().isInstance(bean)) { // prevent capturing lambda - throw new IllegalArgumentException(String.format(TYPE_MISMATCH, bean.getClass().getName(), getType().getName())); - } + Assert.isTrue(getType().isInstance(bean), + () -> String.format(TYPE_MISMATCH, bean.getClass().getName(), getType().getName())); return propertyAccessorFactory.getPropertyAccessor(this, bean); } @@ -463,10 +461,8 @@ public class BasicPersistentEntity> implement public IdentifierAccessor getIdentifierAccessor(Object bean) { Assert.notNull(bean, "Target bean must not be null!"); - - if (!getType().isInstance(bean)) { // prevent capturing lambda - throw new IllegalArgumentException(String.format(TYPE_MISMATCH, bean.getClass().getName(), getType().getName())); - } + Assert.isTrue(getType().isInstance(bean), + () -> String.format(TYPE_MISMATCH, bean.getClass().getName(), getType().getName())); return hasIdProperty() ? new IdPropertyIdentifierAccessor(this, bean) : new AbsentIdentifierAccessor(bean); }