Add factory method to unwrap a PdxInstanceWrapper returning the underlying, delegate PdxInstance.

apache-geode-extensions/src/main/java/org/springframework/geode/pdx/PdxInstanceWrapper.java

@@ -94,6 +94,25 @@ public class PdxInstanceWrapper implements PdxInstance, Sendable {
 		return new PdxInstanceWrapper(pdxInstance);
 	}
 
+	/**
+	 * Null-safe factory method used to unwrap the given {@link PdxInstance}.
+	 *
+	 * If the given {@link PdxInstance} is an instance of {@link PdxInstanceWrapper} then this factory method will
+	 * unwrap the {@link PdxInstanceWrapper} returning the underlying, {@link PdxInstanceWrapper#getDelegate() delegate}
+	 * {@link PdxInstance}.  Otherwise, the given {@link PdxInstance} is returned.
+	 *
+	 * @param pdxInstance {@link PdxInstance} to unwrap; may be {@literal null}.
+	 * @return the unwrapped {@link PdxInstance}.
+	 * @see org.apache.geode.pdx.PdxInstance
+	 * @see #getDelegate()
+	 */
+	public static PdxInstance unwrap(PdxInstance pdxInstance) {
+
+		return pdxInstance instanceof PdxInstanceWrapper
+			? ((PdxInstanceWrapper) pdxInstance).getDelegate()
+			: pdxInstance;
+	}
+
 	private final PdxInstance delegate;
 
 	/**

apache-geode-extensions/src/test/java/org/springframework/geode/pdx/PdxInstanceWrapperUnitTests.java

@@ -117,6 +117,35 @@ public class PdxInstanceWrapperUnitTests {
 		verifyNoInteractions(mockPdxInstance);
 	}
 
+	@Test
+	public void unwrapPdxInstanceWrapperReturnsPdxInstanceDelegate() {
+
+		PdxInstance mockPdxInstance = mock(PdxInstance.class);
+
+		PdxInstanceWrapper wrapper = PdxInstanceWrapper.from(mockPdxInstance);
+
+		assertThat(wrapper).isNotNull();
+		assertThat(wrapper.getDelegate()).isEqualTo(mockPdxInstance);
+		assertThat(PdxInstanceWrapper.unwrap(wrapper)).isEqualTo(mockPdxInstance);
+
+		verifyNoInteractions(mockPdxInstance);
+	}
+
+	@Test
+	public void unwrapPdxInstanceReturnsPdxInstance() {
+
+		PdxInstance mockPdxInstance = mock(PdxInstance.class);
+
+		assertThat(PdxInstanceWrapper.unwrap(mockPdxInstance)).isEqualTo(mockPdxInstance);
+
+		verifyNoInteractions(mockPdxInstance);
+	}
+
+	@Test
+	public void unwrapNullIsNullSafeAndReturnsNull() {
+		assertThat(PdxInstanceWrapper.unwrap(null)).isNull();
+	}
+
 	@Test
 	public void objectMapperConfigurationIsCorrect() {