diff --git a/src/main/java/org/springframework/hateoas/core/ObjectUtils.java b/src/main/java/org/springframework/hateoas/core/ObjectUtils.java index 0ed3e5d5..0f53664e 100644 --- a/src/main/java/org/springframework/hateoas/core/ObjectUtils.java +++ b/src/main/java/org/springframework/hateoas/core/ObjectUtils.java @@ -15,6 +15,7 @@ */ package org.springframework.hateoas.core; +import org.springframework.aop.framework.Advised; import org.springframework.hateoas.Resource; /** @@ -41,6 +42,15 @@ public class ObjectUtils { } private static Class nullSafeType(Object object) { - return object == null ? null : object.getClass(); + + if (object == null) { + return null; + } + + if (object instanceof Advised) { + return ((Advised) object).getTargetClass(); + } + + return object.getClass(); } }