-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: empty array instead of object handling (#185)
- Loading branch information
Showing
5 changed files
with
172 additions
and
23 deletions.
There are no files selected for viewing
53 changes: 53 additions & 0 deletions
53
src/main/java/com/crowdin/client/core/http/impl/json/EmptyArrayToNullDeserializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package com.crowdin.client.core.http.impl.json; | ||
|
|
||
| import com.fasterxml.jackson.core.JacksonException; | ||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.core.JsonToken; | ||
| import com.fasterxml.jackson.databind.*; | ||
| import com.fasterxml.jackson.databind.deser.ContextualDeserializer; | ||
| import com.fasterxml.jackson.databind.deser.std.StdDeserializer; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collection; | ||
|
|
||
| public class EmptyArrayToNullDeserializer extends StdDeserializer<Object> implements ContextualDeserializer { | ||
| private JavaType type; | ||
|
|
||
| public EmptyArrayToNullDeserializer() { | ||
| super(Object.class); | ||
| } | ||
|
|
||
| public EmptyArrayToNullDeserializer(JavaType type) { | ||
| super(type.getRawClass()); | ||
| this.type = type; | ||
| } | ||
|
|
||
| @Override | ||
| public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException { | ||
| if (p.getCurrentToken() == JsonToken.VALUE_NULL) { | ||
| return null; | ||
| } | ||
|
|
||
| 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); | ||
| } | ||
| } | ||
|
|
||
| return ctxt.readValue(p, clazz); | ||
| } | ||
|
|
||
| private static boolean isCollectionType(Class<?> type) { | ||
| return type.isArray() && Collection.class.isAssignableFrom(type); | ||
| } | ||
|
|
||
| @Override | ||
| public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property) throws JsonMappingException { | ||
| return new EmptyArrayToNullDeserializer(property.getType()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
src/test/resources/api/projectsgroups/projectSettings_tmPenaltiesArray.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| { | ||
| "data": { | ||
| "id": 9, | ||
| "groupId": 4, | ||
| "userId": 6, | ||
| "sourceLanguageId": "es", | ||
| "targetLanguageIds": [ | ||
| "uk" | ||
| ], | ||
| "name": "Knowledge Base", | ||
| "identifier": "1f198a4e907688bc65834a6d5a6000c3", | ||
| "description": "Vault of all terms and their explanation", | ||
| "logo": "data:image/png;", | ||
| "background": "data:image/png;", | ||
| "isExternal": false, | ||
| "externalType": "proofread", | ||
| "workflowId": 3, | ||
| "hasCrowdsourcing": false, | ||
| "createdAt": "2019-09-20T11:34:40+00:00", | ||
| "updatedAt": "2019-09-20T11:34:40+00:00", | ||
| "translateDuplicates": 1, | ||
| "glossaryAccess": false, | ||
| "isMtAllowed": true, | ||
| "hiddenStringsProofreadersAccess": true, | ||
| "autoSubstitution": true, | ||
| "exportTranslatedOnly": false, | ||
| "skipUntranslatedFiles": false, | ||
| "exportApprovedOnly": false, | ||
| "autoTranslateDialects": true, | ||
| "publicDownloads": true, | ||
| "useGlobalTm": false, | ||
| "inContext": true, | ||
| "inContextPseudoLanguageId": "uk", | ||
| "isSuspended": false, | ||
| "qaCheckIsActive": true, | ||
| "qaCheckCategories": { | ||
| "empty": true, | ||
| "size": true, | ||
| "tags": true, | ||
| "spaces": true, | ||
| "variables": true, | ||
| "punctuation": true, | ||
| "symbolRegister": true, | ||
| "specialSymbols": true, | ||
| "wrongTranslation": true, | ||
| "spellcheck": true, | ||
| "icu": true | ||
| }, | ||
| "qaChecksIgnorableCategories": { | ||
| "empty": false, | ||
| "size": true, | ||
| "tags": true, | ||
| "spaces": true, | ||
| "variables": true, | ||
| "punctuation": true, | ||
| "symbolRegister": true, | ||
| "specialSymbols": true, | ||
| "wrongTranslation": true, | ||
| "spellcheck": true, | ||
| "icu": false, | ||
| "terms": true, | ||
| "duplicate": false, | ||
| "ftl": false, | ||
| "android": true | ||
| }, | ||
| "customQaCheckIds": [ | ||
| 1 | ||
| ], | ||
| "languageMapping": { | ||
| "uk": { | ||
| "name": "Ukranian", | ||
| "two_letters_code": "ua", | ||
| "three_letters_code": "ukr", | ||
| "locale": "uk-UA", | ||
| "locale_with_underscore": "uk_UA", | ||
| "android_code": "uk-rUA", | ||
| "osx_code": "ua.lproj", | ||
| "osx_locale": "ua" | ||
| } | ||
| }, | ||
| "notificationSettings": { | ||
| "translatorNewStrings": true, | ||
| "managerNewStrings": false, | ||
| "managerLanguageCompleted": false | ||
| }, | ||
| "tmPenalties": [] | ||
| } | ||
| } |