Changeset 6624

Timestamp:

09/30/15 12:04:22 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

 

File:

• vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/transformers/VariantsMapMarshaller.java (modified) (3 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/transformers/VariantsMapMarshaller.java

@@ -2 +2 @@
 
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
 import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
 
 import javax.xml.bind.JAXBContext;
@@ -24 +19 @@
         private final static Logger LOG = LoggerFactory.getLogger(VariantsMapMarshaller.class);
         
-    public static VariantsMap unmarshal(InputStream input)throws JAXBException{
-        Reader in = new InputStreamReader(input, StandardCharsets.UTF_8);
-        
+    public static VariantsMap unmarshal(InputStream input)throws JAXBException{         
         JAXBContext jc = JAXBContext.newInstance(VariantsMap.class);
         Unmarshaller unmarshaller = jc.createUnmarshaller();
-        return (VariantsMap) unmarshaller.unmarshal(in);        
+        return (VariantsMap) unmarshaller.unmarshal(input);        
         
     }
@@ -35 +28 @@
     
     public static void marshal(VariantsMap map, OutputStream output) throws JAXBException, UnsupportedEncodingException{
-        Writer out = new OutputStreamWriter(output, StandardCharsets.UTF_8);
+        //Writer out = new OutputStreamWriter(output, StandardCharsets.UTF_8);
 
         JAXBContext jc = JAXBContext.newInstance(VariantsMap.class);
         Marshaller marshaller = jc.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        marshaller.marshal(map, out);
+        marshaller.marshal(map, output);
     }