Support java keywords as class names for records during generic deserialization codgen (#577)

Author: pamitm

fastserde/avro-fastserde-tests-common/src/test/java/com/linkedin/avro/fastserde/FastGenericDeserializerGeneratorTest.java

@@ -1754,6 +1754,50 @@ record = new GenericData.Record(recordWithUnionMapSchema);
     Assert.assertEquals(((Map<Utf8,Integer>) recordB.get("someInts")).get(new Utf8("3")), Integer.valueOf(3));
   }
 
+  @Test(groups = {"deserializationTest"}, dataProvider = "Implementation")
+  public void shouldHandleJavaKeywordsAsRecordNames(Implementation implementation) {
+    // Create schemas with Java keywords as names
+    Schema classSchema = createRecord("class",
+            createField("value", Schema.create(Schema.Type.STRING)));
+
+    Schema ifSchema = createRecord("if",
+            createField("value", Schema.create(Schema.Type.STRING)));
+
+    Schema publicSchema = createRecord("public",
+            createField("value", Schema.create(Schema.Type.STRING)));
+
+    // Create a parent record that contains records with Java keyword names
+    Schema parentSchema = createRecord("ParentRecord",
+            createField("class_field", classSchema),
+            createField("if_field", ifSchema),
+            createField("public_field", publicSchema));
+
+    // Create record instances
+    GenericRecord classRecord = new GenericData.Record(classSchema);
+    classRecord.put("value", "class value");
+
+    GenericRecord ifRecord = new GenericData.Record(ifSchema);
+    ifRecord.put("value", "if value");
+
+    GenericRecord publicRecord = new GenericData.Record(publicSchema);
+    publicRecord.put("value", "public value");
+
+    GenericRecord parentRecord = new GenericData.Record(parentSchema);
+    parentRecord.put("class_field", classRecord);
+    parentRecord.put("if_field", ifRecord);
+    parentRecord.put("public_field", publicRecord);
+
+
+    // when
+    GenericRecord deserializedRecord = implementation.decode(parentSchema, parentSchema,
+            genericDataAsDecoder(parentRecord));
+
+    // then
+    Assert.assertEquals(((GenericRecord)deserializedRecord.get("class_field")).get("value"), new Utf8("class value"));
+    Assert.assertEquals(((GenericRecord)deserializedRecord.get("if_field")).get("value"), new Utf8("if value"));
+    Assert.assertEquals(((GenericRecord)deserializedRecord.get("public_field")).get("value"), new Utf8("public value"));
+  }
+
   @Test(groups = {"deserializationTest"}, dataProvider = "Implementation")
   public void shouldBidirectionallyReadMapWithUnionMapOfUnionValues(Implementation implementation) {
     // given

fastserde/avro-fastserde/src/main/java/com/linkedin/avro/fastserde/FastDeserializerGenerator.java

@@ -330,9 +330,10 @@ private void processRecord(JVar recordSchemaVar, String recordName, final Schema
 
     final JVar result;
     JClass recordClass = null;
+    String uniqueRecordName = getUniqueName(recordName);
     if (recordAction.getShouldRead()) {
       recordClass = schemaAssistant.classFromSchema(effectiveRecordReaderSchema);
-      result = methodBody.decl(recordClass, recordName);
+      result = methodBody.decl(recordClass, uniqueRecordName);
 
       JExpression reuseVar = JExpr.direct(VAR_NAME_FOR_REUSE);
       JClass indexedRecordClass = codeModel.ref(IndexedRecord.class);
@@ -378,15 +379,15 @@ private void processRecord(JVar recordSchemaVar, String recordName, final Schema
 
         popMethod._throws(IOException.class);
         if (recordAction.getShouldRead()) {
-          popMethod.param(recordClass, recordName);
+          popMethod.param(recordClass, uniqueRecordName);
         }
         popMethod.param(codeModel.ref(DatumReaderCustomization.class), VAR_NAME_FOR_CUSTOMIZATION);
         popMethod.param(Decoder.class, DECODER);
         popMethodBody = popMethod.body();
 
         JInvocation invocation = methodBody.invoke(popMethod);
         if (recordAction.getShouldRead()) {
-          invocation.arg(JExpr.direct(recordName));
+          invocation.arg(JExpr.direct(uniqueRecordName));
         }
         // even if recordAction.getShouldRead() == false we need to generate 'customization' argument for javac purposes
         invocation.arg(customizationSupplier.get());