[GitHub] [beam] rworley-monster commented on a change in pull request #12367: [BEAM-10564] Support more Avro field name formats when mapping to Jav…

[GitBox <gi...@apache.org>]

rworley-monster commented on a change in pull request #12367:
URL: https://github.com/apache/beam/pull/12367#discussion_r481200851



##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java
##########
@@ -601,12 +601,26 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
     private Map<String, String> getMapping(Schema schema) {
       Map<String, String> mapping = Maps.newHashMap();
       for (Field field : schema.getFields()) {
-        String underscore = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, field.getName());
-        mapping.put(underscore, field.getName());
+        String fieldName = field.getName();
+        String getter;
+        if (fieldName.contains("_")) {
+          if (Character.isLowerCase(fieldName.charAt(0))) {
+            // field_name -> fieldName
+            getter = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, fieldName);
+          } else {
+            // FIELD_NAME -> fIELDNAME
+            getter = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, fieldName.replace("_", ""));

Review comment:
       Sure, I will add tests for all of the cases as soon as I have time.  Hopefully within one or two weeks.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org