community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/grafana/translation' into 'master'

Browse Source 
Fix grafana translation not working properly

See merge request entgra/carbon-device-mgt!854
This commit is contained in:
Pahansith Gunathilake 2022-03-05 04:31:18 +00:00
commit ac5e8547c0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/impl/util/GrafanaRequestHandlerUtil.java
View File

@ -46,6 +46,7 @@ import javax.ws.rs.core.UriInfo;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URI; import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -138,7 +139,7 @@ public class GrafanaRequestHandlerUtil {
} }
public static void setRequestEntity(HttpPost postRequest, JsonObject body) throws UnsupportedEncodingException { public static void setRequestEntity(HttpPost postRequest, JsonObject body) throws UnsupportedEncodingException {
StringEntity bodyEntity = new StringEntity(body.toString()); StringEntity bodyEntity = new StringEntity(body.toString(), StandardCharsets.UTF_8);
bodyEntity.setContentType(MediaType.APPLICATION_JSON); bodyEntity.setContentType(MediaType.APPLICATION_JSON);
postRequest.setEntity(bodyEntity); postRequest.setEntity(bodyEntity);
} }

2
components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/GrafanaHandler.java
View File

@ -48,6 +48,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URI; import java.net.URI;
import java.nio.charset.StandardCharsets;
@MultipartConfig @MultipartConfig
@WebServlet( @WebServlet(
@ -150,6 +151,7 @@ public class GrafanaHandler extends HttpServlet {
resp.setContentType(contentType); resp.setContentType(contentType);
resp.setStatus(grafanaAPIResponse.getCode()); resp.setStatus(grafanaAPIResponse.getCode());
addXFrameOptionsHeaders(resp); addXFrameOptionsHeaders(resp);
resp.setCharacterEncoding(StandardCharsets.UTF_8.name());
resp.getWriter().print(grafanaAPIResponse.getData()); resp.getWriter().print(grafanaAPIResponse.getData());
} }