Merge branch '2.x' into 3.x

Author: cowtowncoder

src/test/java/module-info.java

@@ -73,6 +73,7 @@
     opens tools.jackson.databind.deser.merge;
     opens tools.jackson.databind.deser.validate;
     opens tools.jackson.databind.ext;
+    opens tools.jackson.databind.ext.cglib;
     opens tools.jackson.databind.ext.desktop;
     opens tools.jackson.databind.ext.jdk8;
     opens tools.jackson.databind.ext.jdk9;

src/test/java/net/sf/cglib/Callback.java

@@ -0,0 +1,9 @@
+package net.sf.cglib;
+
+/**
+ * A mock object to test if a method is returning cglib's
+ * {@code Callback[] getCallbacks()} found on a cglib proxy object.
+ * @author Rob Winch
+ */
+public class Callback {
+}

src/test/java/net/sf/cglib/MockedNetCglibProxy.java

@@ -0,0 +1,22 @@
+package net.sf.cglib;
+
+/**
+ * A mock Proxy object used to test writing a cglib proxy object.
+ * @author Rob Winch
+ */
+public class MockedNetCglibProxy {
+
+    private final String propertyName;
+
+    public MockedNetCglibProxy(String propertyName) {
+        this.propertyName = propertyName;
+    }
+
+    public String getPropertyName() {
+        return this.propertyName;
+    }
+
+    public Callback[] getCallbacks() {
+        return new Callback[] { new Callback(), new Callback() };
+    }
+}

src/test/java/org/hibernate/repackage/cglib/Callback.java

@@ -0,0 +1,10 @@
+package org.hibernate.repackage.cglib;
+
+/**
+ * A mock object to test if a method is returning Hibernate's
+ * {@code Callback[] getCallbacks()} found on a cglib proxy object.
+ * NOTE: Hibernate repackages the Callback interface to this location.
+ * @author Rob Winch
+ */
+public class Callback {
+}

src/test/java/org/hibernate/repackage/cglib/MockedHibernateCglibProxy.java

@@ -0,0 +1,22 @@
+package org.hibernate.repackage.cglib;
+
+/**
+ * A mock Proxy object used to test writing a Hibernate cglib proxy object.
+ * @author Rob Winch
+ */
+public class MockedHibernateCglibProxy {
+
+    private final String propertyName;
+
+    public MockedHibernateCglibProxy(String propertyName) {
+        this.propertyName = propertyName;
+    }
+
+    public String getPropertyName() {
+        return this.propertyName;
+    }
+
+    public Callback[] getCallbacks() {
+        return new Callback[] { new Callback(), new Callback() };
+    }
+}

src/test/java/org/springframework/cglib/proxy/Callback.java

@@ -0,0 +1,10 @@
+package org.springframework.cglib.proxy;
+
+/**
+ * A mock object to test if a method is returning Spring Framework's
+ * {@code Callback[] getCallbacks()} found on a cglib proxy object.
+ * NOTE: Spring repackages the Callback interface to this location.
+ * @author Rob Winch
+ */
+public class Callback {
+}

src/test/java/org/springframework/cglib/proxy/MockedSpringCglibProxy.java

@@ -0,0 +1,22 @@
+package org.springframework.cglib.proxy;
+
+/**
+ * A mock Proxy object used to test writing a Springframework cglib proxy object.
+ * @author Rob Winch
+ */
+public class MockedSpringCglibProxy {
+
+    private final String propertyName;
+
+    public MockedSpringCglibProxy(String propertyName) {
+        this.propertyName = propertyName;
+    }
+
+    public String getPropertyName() {
+        return this.propertyName;
+    }
+
+    public Callback[] getCallbacks() {
+        return new Callback[] { new Callback(), new Callback() };
+    }
+}

src/test/java/tools/jackson/databind/ext/cglib/CglibFiltering5354Test.java

@@ -0,0 +1,55 @@
+package tools.jackson.databind.ext.cglib;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.hibernate.repackage.cglib.MockedHibernateCglibProxy;
+import org.junit.jupiter.api.Test;
+import org.springframework.cglib.proxy.MockedSpringCglibProxy;
+
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.testutil.DatabindTestUtil;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import net.sf.cglib.MockedNetCglibProxy;
+
+// [databind#5354] Test for filtering out CGLIB-generated properties
+public class CglibFiltering5354Test
+    extends DatabindTestUtil
+{
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    // https://github.com/FasterXML/jackson-databind/issues/5354
+    @Test
+    public void testWriteWithSpringCglibProxyDoesNotIncludeCallbacksProperty() throws Exception
+    {
+        // 20-Oct-2025, tatu: Temporarily disable until #5357 merged
+        if (true) { return; }
+
+        MockedSpringCglibProxy mockedProxy = new MockedSpringCglibProxy("hello");
+        String json = MAPPER.writeValueAsString(mockedProxy);
+        Map<?, ?> properties = MAPPER.readValue(json, Map.class);
+        assertEquals(Collections.singleton("propertyName"), properties.keySet());
+    }
+
+    // https://github.com/FasterXML/jackson-databind/issues/5354
+    //@Test
+    public void testWriteWithHibernateCglibProxyDoesNotIncludeCallbacksProperty() throws Exception
+    {
+        MockedHibernateCglibProxy mockedProxy = new MockedHibernateCglibProxy("hello");
+        String json = MAPPER.writeValueAsString(mockedProxy);
+        Map<?, ?> properties = MAPPER.readValue(json, Map.class);
+        assertEquals(Collections.singleton("propertyName"), properties.keySet());
+    }
+
+    // https://github.com/FasterXML/jackson-databind/issues/5354
+    //@Test
+    public void testWriteWithNetCglibProxyDoesNotIncludeCallbacksProperty() throws Exception
+    {
+        MockedNetCglibProxy mockedProxy = new MockedNetCglibProxy("hello");
+        String json = MAPPER.writeValueAsString(mockedProxy);
+        Map<?, ?> properties = MAPPER.readValue(json, Map.class);
+        assertEquals(Collections.singleton("propertyName"), properties.keySet());
+    }
+}