diff --git a/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsApiClient.java b/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsApiClient.java index 9178354e30..a18ae884d2 100644 --- a/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsApiClient.java +++ b/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsApiClient.java @@ -116,7 +116,9 @@ private AzureDevOpsUser getUser(String url, String authorizationHeader) userDataRequest, response -> { try { - return OBJECT_MAPPER.readValue(response.body(), AzureDevOpsUser.class); + String result = + CharStreams.toString(new InputStreamReader(response.body(), Charsets.UTF_8)); + return OBJECT_MAPPER.readValue(result, AzureDevOpsUser.class); } catch (IOException e) { throw new UncheckedIOException(e); } diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClient.java b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClient.java index 6e1f3521fe..9ee5da4f73 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClient.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClient.java @@ -176,7 +176,9 @@ public BitbucketUser getUser(String slug, @Nullable String token) request, inputStream -> { try { - return OM.readValue(inputStream, BitbucketUser.class); + String result = + CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8)); + return OM.readValue(result, BitbucketUser.class); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -230,7 +232,9 @@ public void deletePersonalAccessTokens(String userSlug, Long tokenId) request, inputStream -> { try { - return OM.readValue(inputStream, String.class); + String result = + CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8)); + return OM.readValue(result, String.class); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -271,7 +275,9 @@ public BitbucketPersonalAccessToken createPersonalAccessTokens( request, inputStream -> { try { - return OM.readValue(inputStream, BitbucketPersonalAccessToken.class); + String result = + CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8)); + return OM.readValue(result, BitbucketPersonalAccessToken.class); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -313,7 +319,9 @@ public BitbucketPersonalAccessToken getPersonalAccessToken(String userSlug, Long request, inputStream -> { try { - return OM.readValue(inputStream, BitbucketPersonalAccessToken.class); + String result = + CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8)); + return OM.readValue(result, BitbucketPersonalAccessToken.class); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -388,7 +396,9 @@ private Page doGetPage(Class tClass, String api, int start, int limit, request, inputStream -> { try { - return OM.readValue(inputStream, typeReference); + String result = + CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8)); + return OM.readValue(result, typeReference); } catch (IOException e) { throw new UncheckedIOException(e); } diff --git a/wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClient.java b/wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClient.java index 42778ddc97..b0d025d7c5 100644 --- a/wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClient.java +++ b/wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClient.java @@ -108,7 +108,9 @@ public BitbucketUser getUser(String authenticationToken) request, response -> { try { - return OBJECT_MAPPER.readValue(response.body(), BitbucketUser.class); + String result = + CharStreams.toString(new InputStreamReader(response.body(), Charsets.UTF_8)); + return OBJECT_MAPPER.readValue(result, BitbucketUser.class); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -154,7 +156,9 @@ public BitbucketUserEmail getEmail(String authenticationToken) request, response -> { try { - return OBJECT_MAPPER.readValue(response.body(), BitbucketUserEmail.class); + String result = + CharStreams.toString(new InputStreamReader(response.body(), Charsets.UTF_8)); + return OBJECT_MAPPER.readValue(result, BitbucketUserEmail.class); } catch (IOException e) { throw new UncheckedIOException(e); } diff --git a/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java b/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java index 88b89d7399..67d14525e8 100644 --- a/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java +++ b/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java @@ -111,7 +111,9 @@ public GithubUser getUser(String authenticationToken) request, response -> { try { - return OBJECT_MAPPER.readValue(response.body(), GithubUser.class); + String result = + CharStreams.toString(new InputStreamReader(response.body(), Charsets.UTF_8)); + return OBJECT_MAPPER.readValue(result, GithubUser.class); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -140,7 +142,9 @@ public GithubPullRequest getPullRequest( request, response -> { try { - return OBJECT_MAPPER.readValue(response.body(), GithubPullRequest.class); + String result = + CharStreams.toString(new InputStreamReader(response.body(), Charsets.UTF_8)); + return OBJECT_MAPPER.readValue(result, GithubPullRequest.class); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -181,7 +185,9 @@ public GithubCommit getLatestCommit( request, response -> { try { - return OBJECT_MAPPER.readValue(response.body(), GithubCommit[].class)[0]; + String result = + CharStreams.toString(new InputStreamReader(response.body(), Charsets.UTF_8)); + return OBJECT_MAPPER.readValue(result, GithubCommit[].class)[0]; } catch (IOException e) { throw new UncheckedIOException(e); } diff --git a/wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabApiClient.java b/wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabApiClient.java index 6e3faed9a7..a687198e79 100644 --- a/wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabApiClient.java +++ b/wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabApiClient.java @@ -78,7 +78,9 @@ public GitlabUser getUser(String authenticationToken) request, inputStream -> { try { - return OBJECT_MAPPER.readValue(inputStream, GitlabUser.class); + String result = + CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8)); + return OBJECT_MAPPER.readValue(result, GitlabUser.class); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -100,7 +102,9 @@ public GitlabOauthTokenInfo getTokenInfo(String authenticationToken) request, inputStream -> { try { - return OBJECT_MAPPER.readValue(inputStream, GitlabOauthTokenInfo.class); + String result = + CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8)); + return OBJECT_MAPPER.readValue(result, GitlabOauthTokenInfo.class); } catch (IOException e) { throw new UncheckedIOException(e); }