Bug 33168147 - [33158028->21.06.1] PortableType Classes automatically discovered without Id's Do not Serialize Properly

[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v21.06/": change = 87458]

Author: tmiddleton

prj/coherence-core/src/main/java/com/tangosol/io/pof/generator/PortableTypeGenerator.java

@@ -452,11 +452,16 @@ private void implementReadExternal()
 
         boolean fDelegateToSuper = isPofType(m_classNode.superName);
 
-        mn.visitVarInsn(ALOAD, 1);
-        mn.visitMethodInsn(INVOKEINTERFACE, "com/tangosol/io/pof/PofReader",
-                           "getUserTypeId", "()I", true);
-        mn.visitLdcInsn(m_type.getId());
-        mn.visitJumpInsn(IF_ICMPNE, l0);
+        // -1 suggests the type-id is generated at runtime and therefore it is unnecessary to verify 'id'
+        // value in the annotation is used by the PofConfig
+        if (m_type.getId() != -1)
+            {
+            mn.visitVarInsn(ALOAD, 1);
+            mn.visitMethodInsn(INVOKEINTERFACE, "com/tangosol/io/pof/PofReader",
+                               "getUserTypeId", "()I", true);
+            mn.visitLdcInsn(m_type.getId());
+            mn.visitJumpInsn(IF_ICMPNE, l0);
+            }
 
         int cPofFields = 0;
 
@@ -567,11 +572,17 @@ private void implementWriteExternal()
 
         boolean fDelegateToSuper = isPofType(m_classNode.superName);
 
-        mn.visitVarInsn(ALOAD, 1);
-        mn.visitMethodInsn(INVOKEINTERFACE, "com/tangosol/io/pof/PofWriter",
-                           "getUserTypeId", "()I", true);
-        mn.visitLdcInsn(m_type.getId());
-        mn.visitJumpInsn(IF_ICMPNE, l0);
+        // -1 suggests the type-id is generated at runtime and therefore it is unnecessary to verify 'id'
+        // value in the annotation is used by the PofConfig
+        if (m_type.getId() != -1)
+            {
+            mn.visitVarInsn(ALOAD, 1);
+            mn.visitMethodInsn(INVOKEINTERFACE, "com/tangosol/io/pof/PofWriter",
+                               "getUserTypeId", "()I", true);
+            
+            mn.visitLdcInsn(m_type.getId());
+            mn.visitJumpInsn(IF_ICMPNE, l0);
+            }
 
         int cPofFields = 0;
 

prj/coherence-core/src/test/java/com/tangosol/io/pof/generator/PortableTypeGeneratorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
@@ -12,10 +12,16 @@
 import com.tangosol.io.pof.EvolvableObject;
 import com.tangosol.io.pof.PortableObject;
 
+import com.tangosol.io.pof.PortableTypeSerializer;
+import com.tangosol.io.pof.SimplePofContext;
+import com.tangosol.io.pof.generator.data.TestClassWithNoId;
 import com.tangosol.io.pof.schema.annotation.internal.Instrumented;
 
 import com.tangosol.util.Base;
 
+import com.tangosol.util.Binary;
+import com.tangosol.util.ExternalizableHelper;
+
 import org.junit.Test;
 
 import java.io.File;
@@ -84,6 +90,32 @@ public void shouldCreateSchemaForPackagelessClass() throws Exception
         assertThat(schema, is(notNullValue()));
         }
 
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void shouldInstrumentClassWithNoId() throws Exception
+        {
+        String         sClassName   = TestClassWithNoId.class.getName();
+        URL            url          = getClass().getResource("/" + sClassName.replaceAll("\\.", "/") + ".class");
+        File           fileClass    = new File(url.toURI());
+        byte[]         abBytes      = Files.readAllBytes(fileClass.toPath());
+        Properties     properties   = new Properties();
+        Map<String, ?> env          = new HashMap<>();
+        byte[]         instrumented = PortableTypeGenerator.instrumentClass(fileClass, abBytes, 0, abBytes.length, properties, env);
+
+        SimplePofContext ctx = new SimplePofContext();
+        
+        ByteArrayClassLoader loader = new ByteArrayClassLoader(Collections.singletonMap(sClassName, instrumented));
+        Class<?> instrumentedClass = loader.findClass(TestClassWithNoId.class.getName());
+
+        ctx.registerUserType(1, instrumentedClass, new PortableTypeSerializer(1, instrumentedClass));
+
+        Object testClass = instrumentedClass.getDeclaredConstructor(String.class).newInstance("value");
+        
+        Binary            binTestClass  = ExternalizableHelper.toBinary(testClass, ctx);
+        Object            result        = ExternalizableHelper.fromBinary(binTestClass, ctx);
+        assertThat(result.equals(testClass), is(true));
+        }
+
     @Test
     public void shouldInstrumentPackagelessClass() throws Exception
         {

prj/coherence-core/src/test/java/com/tangosol/io/pof/generator/data/TestClassWithNoId.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+package com.tangosol.io.pof.generator.data;
+
+import com.tangosol.io.pof.schema.annotation.PortableType;
+
+/**
+ * A class to test PortableType generation and serialization with no id.
+ *
+ * @author tam 2021.07.28
+ */
+@PortableType
+public class TestClassWithNoId {
+
+    public TestClassWithNoId()
+        {
+        }
+
+    public TestClassWithNoId(String sValue)
+        {
+        m_sValue = sValue;
+        }
+
+    public String getValue()
+        {
+        return m_sValue;
+        }
+
+    public void setValue(String m_sValue)
+        {
+        this.m_sValue = m_sValue;
+        }
+
+    @Override
+    public boolean equals(Object o)
+        {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass())
+            {
+            return false;
+            }
+
+        TestClassWithNoId that = (TestClassWithNoId) o;
+
+        return m_sValue != null ? m_sValue.equals(that.m_sValue) : that.m_sValue == null;
+        }
+
+    @Override
+    public int hashCode()
+        {
+        return m_sValue != null ? m_sValue.hashCode() : 0;
+        }
+
+    private String m_sValue;
+    }