Merge pull request #114 from HubSpot/jh/rm-naming-strategy-base

Fix field naming
HubSpot · Dec 30, 2023 · ac64b70 · ac64b70
2 parents ad50263 + 3837820
commit ac64b70
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/com/hubspot/jackson/datatype/protobuf/PropertyNamingStrategyWrapper.java b/src/main/java/com/hubspot/jackson/datatype/protobuf/PropertyNamingStrategyWrapper.java
@@ -14,8 +14,8 @@
 @SuppressWarnings("serial")
 public class PropertyNamingStrategyWrapper {
 
-  private static final PropertyNamingStrategy SNAKE_TO_CAMEL = new SnakeToCamelNamingStrategy();
-  private static final PropertyNamingStrategy NO_OP = new NoOpNamingStrategy();
+  private static final NamingBase SNAKE_TO_CAMEL = new SnakeToCamelNamingStrategy();
+  private static final NamingBase NO_OP = new NoOpNamingStrategy();
 
   private final Class<?> messageType;
   private final MapperConfig<?> mapperConfig;
@@ -43,7 +43,7 @@ public PropertyNamingStrategyWrapper(
   public String translate(String fieldName) {
     AnnotatedField annotatedField = null;
     try {
-      Field field = messageType.getDeclaredField(fieldName + "_");
+      Field field = messageType.getDeclaredField(javaFieldName(fieldName));
       annotatedField =
         new AnnotatedField(
           new TypeResolutionContext.Empty(mapperConfig.getTypeFactory()),
@@ -57,6 +57,12 @@ public String translate(String fieldName) {
     return delegate.nameForField(mapperConfig, annotatedField, fieldName);
   }
 
+  private static String javaFieldName(String fieldName) {
+    return (
+      (fieldName.contains("_") ? SNAKE_TO_CAMEL.translate(fieldName) : fieldName) + "_"
+    );
+  }
+
   private static class SnakeToCamelNamingStrategy extends NamingBase {
 
     @Override