Added option to preserve underscores in the JacksonJsonEnumHelper to fix TargetType.MERGE_REQUEST value. (#615)

Author: ASobolewski

src/main/java/org/gitlab4j/api/Constants.java

@@ -466,7 +466,7 @@ public enum TargetType {
 
         ISSUE, MILESTONE, MERGE_REQUEST, NOTE, PROJECT, SNIPPET, USER;
 
-        private static JacksonJsonEnumHelper<TargetType> enumHelper = new JacksonJsonEnumHelper<>(TargetType.class, true, true);
+        private static JacksonJsonEnumHelper<TargetType> enumHelper = new JacksonJsonEnumHelper<>(TargetType.class, true, false, true);
 
         @JsonCreator
         public static TargetType forValue(String value) {

src/main/java/org/gitlab4j/api/utils/JacksonJsonEnumHelper.java

@@ -32,6 +32,10 @@ public JacksonJsonEnumHelper(Class<E> enumType, boolean firstLetterCapitalized)
     }
 
     public JacksonJsonEnumHelper(Class<E> enumType, boolean firstLetterCapitalized, boolean camelCased) {
+        this(enumType, firstLetterCapitalized, camelCased, false);
+    }
+
+    public JacksonJsonEnumHelper(Class<E> enumType, boolean firstLetterCapitalized, boolean camelCased, boolean preserveUnderscores) {
 
         valuesMap = new HashMap<>();
         namesMap = new HashMap<>();
@@ -43,10 +47,14 @@ public JacksonJsonEnumHelper(Class<E> enumType, boolean firstLetterCapitalized,
             boolean nextCharIsCapitalized = firstLetterCapitalized;
             for (char ch : chars) {
                 if (ch == '_') {
-                    if (camelCased) {
-                        nextCharIsCapitalized = true;
+                    if (preserveUnderscores) {
+                        nameBuf.append(ch);
                     } else {
-                        nameBuf.append(' ');
+                        if (camelCased) {
+                            nextCharIsCapitalized = true;
+                        } else {
+                            nameBuf.append(' ');
+                        }
                     }
                 } else if (nextCharIsCapitalized) {
                     nextCharIsCapitalized = false;

src/test/resources/org/gitlab4j/api/event.json

@@ -3,7 +3,7 @@
     "project_id": 15,
     "action_name": "pushed",
     "target_id": 830,
-    "target_type": "MergeRequest",
+    "target_type": "Merge_request",
     "author_id": 1,
     "author": {
       "name": "Dmitriy Zaporozhets",