#27 - @JSON(naming = Naming.LowerUnderscore) not work

Author: rbygrave

jsonb-generator/src/main/java/io/avaje/jsonb/generator/NamingConventionReader.java

@@ -19,7 +19,7 @@ class NamingConventionReader {
       if (JSON_ANNOTATION.equals(mirror.getAnnotationType().toString())) {
         for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : mirror.getElementValues().entrySet()) {
           if (entry.getKey().toString().equals(NAMING_ATTRIBUTE)) {
-            namingConvention = NamingConvention.of(Json.Naming.valueOf(entry.getValue().toString()));
+            namingConvention = NamingConvention.of(naming(entry.getValue().toString()));
           } else if (entry.getKey().toString().equals(TYPEPROPERTY_ATTRIBUTE)) {
             typeProperty = Util.trimQuotes(entry.getValue().toString());
           }
@@ -28,6 +28,14 @@ class NamingConventionReader {
     }
   }
 
+  static Json.Naming naming(String entry) {
+    int pos = entry.lastIndexOf('.');
+    if (pos > -1) {
+      entry = entry.substring(pos + 1);
+    }
+    return Json.Naming.valueOf(entry);
+  }
+
   NamingConvention get() {
     return namingConvention != null ? namingConvention : NamingConvention.of(Json.Naming.Match);
   }

jsonb-generator/src/test/java/io/avaje/jsonb/generator/NamingConventionReaderTest.java

@@ -0,0 +1,28 @@
+package io.avaje.jsonb.generator;
+
+import io.avaje.jsonb.Json;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class NamingConventionReaderTest {
+
+  @Test
+  void naming_expected() {
+    Json.Naming naming = NamingConventionReader.naming("LowerUnderscore");
+    assertThat(naming).isEqualTo(Json.Naming.LowerUnderscore);
+  }
+
+  @Test
+  void naming_namingWithPrefix() {
+    Json.Naming naming = NamingConventionReader.naming("Naming.LowerUnderscore");
+    assertThat(naming).isEqualTo(Json.Naming.LowerUnderscore);
+
+    naming = NamingConventionReader.naming("io.avaje.jsonb.Json.Naming.LowerUnderscore");
+    assertThat(naming).isEqualTo(Json.Naming.LowerUnderscore);
+
+    naming = NamingConventionReader.naming("io.avaje.jsonb.Json.Naming.io.avaje.jsonb.Json.Naming.LowerUnderscore");
+    assertThat(naming).isEqualTo(Json.Naming.LowerUnderscore);
+  }
+
+}