fix: use Files.newOutputStream() to write and logger for errors

broadinstitute · Aug 13, 2024 · 829b8f3 · 829b8f3
1 parent 8a6dcf6
commit 829b8f3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/main/java/org/broadinstitute/hellbender/tools/walkers/conversion/GtfInfo.java b/src/main/java/org/broadinstitute/hellbender/tools/walkers/conversion/GtfInfo.java
@@ -2,9 +2,9 @@
 
 import htsjdk.samtools.util.Interval;
 
-public class GtfInfo{
+public class GtfInfo {
 
-    public enum Type{
+    public enum Type {
         GENE,
         TRANSCRIPT
     }

diff --git a/src/main/java/org/broadinstitute/hellbender/tools/walkers/conversion/GtfToBed.java b/src/main/java/org/broadinstitute/hellbender/tools/walkers/conversion/GtfToBed.java
@@ -5,19 +5,23 @@
 import htsjdk.samtools.SamReaderFactory;
 import htsjdk.samtools.util.*;
 import htsjdk.tribble.Feature;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.broadinstitute.barclay.argparser.Argument;
 import org.broadinstitute.barclay.argparser.CommandLineProgramProperties;
+import org.broadinstitute.barclay.argparser.WorkflowProperties;
+import org.broadinstitute.barclay.help.DocumentedFeature;
 import org.broadinstitute.hellbender.cmdline.StandardArgumentDefinitions;
 import org.broadinstitute.hellbender.cmdline.programgroups.ShortVariantDiscoveryProgramGroup;
 import org.broadinstitute.hellbender.engine.*;
 import org.broadinstitute.hellbender.exceptions.GATKException;
 import org.broadinstitute.hellbender.utils.Utils;
 import org.broadinstitute.hellbender.utils.codecs.gtf.GencodeGtfFeature;
 
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.*;
 
 /**
@@ -74,13 +78,14 @@
         programGroup = ShortVariantDiscoveryProgramGroup.class
 )
 
+@DocumentedFeature
+@WorkflowProperties
 public class GtfToBed extends FeatureWalker<GencodeGtfFeature> {
     public static final String SORT_BY_TRANSCRIPT_LONG_NAME = "sort-transcript";
     public static final String SEQUENCE_DICTIONARY_LONG_NAME = "gtf-dictionary";
     public static final String SORT_BY_BASIC_LONG_NAME = "sort-basic";
     public static final String INPUT_LONG_NAME = "gtf-path";
-
-
+    protected final Logger logger = LogManager.getLogger(this.getClass());
 
     @Argument(fullName = INPUT_LONG_NAME, doc = "Path to Gencode GTF file")
     public GATKPath inputFile;
@@ -146,7 +151,7 @@ private List<GencodeGtfFeature.OptionalField<?>> getOptionalFields(GencodeGtfFea
         try {
             optionalFields = gtfFeature.getOptionalField("tag");
         } catch (Exception e) {
-            System.err.println("Could not retrieve optional fields: " + e.getMessage());
+            logger.error("Could not retrieve optional fields: ", e);
         }
         return optionalFields;
     }
@@ -281,11 +286,11 @@ private LinkedHashMap<String, GtfInfo> getSortedMap(SAMSequenceDictionary sequen
 
     // writes to bed file
     private void writeToBed(GtfInfo.Type type, Map<String, GtfInfo> sortedMap) {
-        try (BufferedWriter writer = new BufferedWriter(new FileWriter(String.valueOf(outputFile)))) {
+        try (final OutputStream writer = Files.newOutputStream(outputFile.toPath())) {
             for (Map.Entry<String, GtfInfo> entry : sortedMap.entrySet()) {
                 if (entry.getValue().getType() == type) {
                     String line = formatBedLine(entry, type);
-                    writer.write(line + System.lineSeparator());
+                    writer.write((line + System.lineSeparator()).getBytes());
                 }
             }
         } catch (IOException e) {