fix: deserialize empty-array permissions in translator roles

src/main/java/com/crowdin/client/core/http/impl/json/EmptyArrayToNullDeserializer.java

@@ -29,16 +29,13 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
 
         Class<?> clazz = this.type != null ? this.type.getRawClass() : Object.class;
 
-        if (p.getCurrentToken() == JsonToken.START_ARRAY) {
-            if (!isCollectionType(clazz)) {
-                p.nextToken();
-                return null;
-            } else {
-                return ctxt.readValue(p, clazz);
-            }
+        if (p.getCurrentToken() == JsonToken.START_ARRAY && !isCollectionType(clazz)) {
+            p.skipChildren();
+            return null;
         }
 
-        return ctxt.readValue(p, clazz);
+        // read with the full JavaType so generic parameters (e.g. Map<String, Foo>) are preserved
+        return this.type != null ? ctxt.readValue(p, this.type) : ctxt.readValue(p, clazz);
     }
 
     private static boolean isCollectionType(Class<?> type) {

src/main/java/com/crowdin/client/users/model/TranslatorRole.java

@@ -1,9 +1,12 @@
 package com.crowdin.client.users.model;
 
+import com.crowdin.client.core.http.impl.json.EmptyArrayToNullDeserializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 
 @Data
 public class TranslatorRole {
     private TranslatorRoleName name;
+    @JsonDeserialize(using = EmptyArrayToNullDeserializer.class)
     private TranslatorRolePermissions permissions;
 }

src/main/java/com/crowdin/client/users/model/TranslatorRoleName.java

@@ -3,7 +3,7 @@
 import com.crowdin.client.core.model.EnumConverter;
 
 public enum TranslatorRoleName implements EnumConverter<TranslatorRoleName> {
-    TRANSLATOR, PROOFREADER, OWNER;
+    TRANSLATOR, PROOFREADER, LANGUAGE_COORDINATOR, DEVELOPER, MANAGER, OWNER;
 
     public static TranslatorRoleName from(String value){
         return TranslatorRoleName.valueOf(value.toUpperCase());

src/main/java/com/crowdin/client/users/model/TranslatorRolePermissions.java

@@ -1,12 +1,15 @@
 package com.crowdin.client.users.model;
 
+import com.crowdin.client.core.http.impl.json.EmptyArrayToNullDeserializer;
 import com.crowdin.client.core.model.LanguageAccessRule;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 
 import java.util.Map;
 
 @Data
 public class TranslatorRolePermissions {
     private boolean allLanguages;
+    @JsonDeserialize(using = EmptyArrayToNullDeserializer.class)
     private Map<String, LanguageAccessRule> languagesAccess;
 }

src/test/java/com/crowdin/client/core/http/impl/json/EmptyArrayToNullDeserializerTest.java

@@ -6,7 +6,9 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.type.TypeFactory;
+import com.crowdin.client.core.model.LanguageAccessRule;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -16,6 +18,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -151,4 +154,25 @@ public void testDeserializeIfNull() throws IOException {
         assertNull(result);
     }
 
+    public static class MapHolder {
+        @JsonDeserialize(using = EmptyArrayToNullDeserializer.class)
+        public Map<String, LanguageAccessRule> rules;
+    }
+
+    @Test
+    public void testDeserializeEmptyArrayAsMapReturnsNull() throws IOException {
+        MapHolder holder = new ObjectMapper().readValue("{\"rules\": []}", MapHolder.class);
+
+        assertNull(holder.rules);
+    }
+
+    @Test
+    public void testDeserializeObjectAsMapPreservesGenericValueType() throws IOException {
+        MapHolder holder = new ObjectMapper().readValue("{\"rules\": {\"uk\": {\"allContent\": true}}}", MapHolder.class);
+
+        assertNotNull(holder.rules);
+        LanguageAccessRule rule = holder.rules.get("uk");
+        assertTrue(rule.isAllContent());
+    }
+
 }

src/test/java/com/crowdin/client/users/UsersApiTest.java

@@ -25,6 +25,7 @@ public class UsersApiTest extends TestClient {
     private final Long projectId4 = 15L;
     private final Long projectId5 = 16L;
     private final Long projectId6 = 17L;
+    private final Long projectId7 = 18L;
 
     private final Long userId = 1L;
     private final Long user2Id = 2L;
@@ -56,6 +57,7 @@ public List<RequestMock> getMocks() {
                 RequestMock.build(this.url + "/groups/" + groupId + "/managers", HttpPatch.METHOD_NAME, "api/users/editGroupManagers.json", "api/users/listGroupManagers.json"),
                 RequestMock.build(this.url + "/groups/" + groupId + "/managers/" + userId, HttpGet.METHOD_NAME, "api/users/groupManager.json"),
                 RequestMock.build(String.format("%s/projects/%d/members", this.url, projectId2), HttpGet.METHOD_NAME, "api/users/listProjectMembersEnterprise.json"),
+                RequestMock.build(String.format("%s/projects/%d/members", this.url, projectId7), HttpGet.METHOD_NAME, "api/users/listProjectMembersEnterpriseEmptyPermissions.json"),
                 RequestMock.build(String.format("%s/projects/%d/members", this.url, projectId3), HttpGet.METHOD_NAME, "api/users/listProjectMembersEnterpriseOrderByIdAsc.json", new HashMap<String, String>() {{
                     put("orderBy", "id%20asc");
                 }}),
@@ -205,6 +207,24 @@ public void listProjectTeamMembersEnterpriseTest_orderByNull() {
         assertTrue(role.getPermissions().isAllLanguages());
     }
 
+    @Test
+    public void listProjectTeamMembersEnterpriseTest_emptyPermissions() {
+        ResponseList<ProjectMember> responseList = this.getUsersApi().listProjectMembersEnterprise(this.projectId7, null, null, null, null, null);
+        assertNotNull(responseList);
+        assertEquals(3, responseList.getData().size());
+
+        TranslatorRole emptyLanguagesAccess = responseList.getData().get(0).getData().getRoles().get(0);
+        assertEquals(TranslatorRoleName.DEVELOPER, emptyLanguagesAccess.getName());
+        assertFalse(emptyLanguagesAccess.getPermissions().isAllLanguages());
+        assertNull(emptyLanguagesAccess.getPermissions().getLanguagesAccess());
+
+        TranslatorRole emptyPermissions = responseList.getData().get(1).getData().getRoles().get(0);
+        assertEquals(TranslatorRoleName.LANGUAGE_COORDINATOR, emptyPermissions.getName());
+        assertNull(emptyPermissions.getPermissions());
+
+        assertTrue(responseList.getData().get(2).getData().getRoles().isEmpty());
+    }
+
     @Test
     public void listProjectTeamMembersEnterpriseTest_orderByIdNull() {
         OrderByField orderById = new OrderByField();

src/test/resources/api/users/listProjectMembersEnterpriseEmptyPermissions.json

@@ -0,0 +1,57 @@
+{
+  "data": [
+    {
+      "data": {
+        "id": 1,
+        "username": "john_smith",
+        "firstName": "John",
+        "lastName": "Smith",
+        "isManager": false,
+        "isDeveloper": true,
+        "roles": [
+          {
+            "name": "developer",
+            "permissions": {
+              "allLanguages": false,
+              "languagesAccess": []
+            }
+          }
+        ],
+        "givenAccessAt": "2019-10-23T11:44:02+00:00"
+      }
+    },
+    {
+      "data": {
+        "id": 2,
+        "username": "jane_doe",
+        "firstName": "Jane",
+        "lastName": "Doe",
+        "isManager": false,
+        "isDeveloper": false,
+        "roles": [
+          {
+            "name": "language_coordinator",
+            "permissions": []
+          }
+        ],
+        "givenAccessAt": "2019-10-23T11:44:02+00:00"
+      }
+    },
+    {
+      "data": {
+        "id": 3,
+        "username": "admin",
+        "firstName": "Ad",
+        "lastName": "Min",
+        "isManager": true,
+        "isDeveloper": false,
+        "roles": [],
+        "givenAccessAt": "2019-10-23T11:44:02+00:00"
+      }
+    }
+  ],
+  "pagination": {
+    "offset": 0,
+    "limit": 25
+  }
+}