Skip to content
Snippets Groups Projects
Commit 7eb625a0 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

toString function takes default charset as second argument

parent 1146be0c
No related branches found
No related tags found
1 merge request!782Resolve "Replace deprecated APIs"
......@@ -7,6 +7,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
......@@ -15,9 +16,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import lcsb.mapviewer.common.XmlParser;
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.w3c.dom.Document;
......@@ -31,6 +32,7 @@ import lcsb.mapviewer.annotation.services.ExternalServiceStatus;
import lcsb.mapviewer.annotation.services.ExternalServiceStatusType;
import lcsb.mapviewer.common.HttpConnectionMethodType;
import lcsb.mapviewer.common.MimeType;
import lcsb.mapviewer.common.XmlParser;
import lcsb.mapviewer.common.exception.InvalidArgumentException;
import lcsb.mapviewer.common.exception.InvalidXmlSchemaException;
import lcsb.mapviewer.model.map.MiriamData;
......@@ -636,7 +638,7 @@ public class ReactomeConnector extends CachableInterface implements DataSourceUp
int responseCode = con.getResponseCode();
logger.debug("Response Code : " + responseCode);
String result = IOUtils.toString(con.getInputStream());
String result = IOUtils.toString(con.getInputStream(),StandardCharsets.UTF_8);
logger.debug(result);
return result;
}
......
......@@ -6,6 +6,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
......@@ -14,7 +15,8 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException;
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.sbml.jsbml.SBMLException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -22,9 +24,9 @@ import org.springframework.transaction.annotation.Transactional;
import lcsb.mapviewer.api.BaseRestImpl;
import lcsb.mapviewer.api.QueryException;
import lcsb.mapviewer.common.Pair;
import lcsb.mapviewer.converter.Converter;
import lcsb.mapviewer.converter.ConverterException;
import lcsb.mapviewer.converter.ConverterParams;
import lcsb.mapviewer.converter.Converter;
import lcsb.mapviewer.converter.InvalidInputDataExecption;
import lcsb.mapviewer.converter.graphics.AbstractImageGenerator;
import lcsb.mapviewer.converter.graphics.DrawingException;
......@@ -37,7 +39,6 @@ import lcsb.mapviewer.services.SecurityException;
@Service
public class ConvertRestImpl extends BaseRestImpl {
@SuppressWarnings("unused")
private Logger logger = LogManager.getLogger(ConvertRestImpl.class);
......@@ -50,7 +51,7 @@ public class ConvertRestImpl extends BaseRestImpl {
Model model = getModelParserByNameOrClass(fromFormat).createModel(params);
Converter exporter = getModelParserByNameOrClass(toFormat);
return IOUtils.toString(exporter.model2InputStream(model));
return IOUtils.toString(exporter.model2InputStream(model), StandardCharsets.UTF_8);
}
public ByteArrayOutputStream converToImage(String token, String fromFormat, String toFormat, String input,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment