From e749d3ed58c691baab11c166f83744e3c100b869 Mon Sep 17 00:00:00 2001 From: Peter van 't Hof <p.j.van_t_hof@lumc.nl> Date: Wed, 16 Sep 2015 18:06:40 +0200 Subject: [PATCH] Fix tool extensions --- .../nl/lumc/sasc/biopet/core/ToolCommandFuntion.scala | 7 +++++++ .../sasc/biopet/extensions/tools/BastyGenerateFasta.scala | 2 +- .../lumc/sasc/biopet/extensions/tools/BedToInterval.scala | 2 +- .../biopet/extensions/tools/BedtoolsCoverageToCounts.scala | 2 +- .../lumc/sasc/biopet/extensions/tools/BiopetFlagstat.scala | 2 +- .../lumc/sasc/biopet/extensions/tools/FastqSplitter.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/FastqSync.scala | 2 +- .../lumc/sasc/biopet/extensions/tools/MergeAlleles.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/MergeTables.scala | 2 +- .../lumc/sasc/biopet/extensions/tools/MpileupToVcf.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/PrefixFastq.scala | 2 +- .../lumc/sasc/biopet/extensions/tools/SageCountFastq.scala | 2 +- .../sasc/biopet/extensions/tools/SageCreateLibrary.scala | 2 +- .../sasc/biopet/extensions/tools/SageCreateTagCounts.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/SeqStat.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/SquishBed.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/VcfFilter.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/VcfStats.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/VcfWithVcf.scala | 2 +- .../lumc/sasc/biopet/extensions/tools/VepNormalizer.scala | 2 +- .../nl/lumc/sasc/biopet/extensions/tools/WipeReads.scala | 2 +- 21 files changed, 27 insertions(+), 20 deletions(-) diff --git a/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/ToolCommandFuntion.scala b/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/ToolCommandFuntion.scala index 667e3ce67..3d5c86085 100644 --- a/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/ToolCommandFuntion.scala +++ b/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/ToolCommandFuntion.scala @@ -6,5 +6,12 @@ import nl.lumc.sasc.biopet.FullVersion * Created by pjvanthof on 11/09/15. */ trait ToolCommandFuntion extends BiopetJavaCommandLineFunction { + def toolObject: Object + override def getVersion = Some("Biopet " + FullVersion) + + override def freezeFieldValues(): Unit = { + javaMainClass = toolObject.getClass.getName.split("$").head + super.freezeFieldValues() + } } diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BastyGenerateFasta.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BastyGenerateFasta.scala index 846dc2323..9b0020ae2 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BastyGenerateFasta.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BastyGenerateFasta.scala @@ -22,7 +22,7 @@ import nl.lumc.sasc.biopet.core.{ Reference, ToolCommandFuntion } import org.broadinstitute.gatk.utils.commandline.{ Input, Output } class BastyGenerateFasta(val root: Configurable) extends ToolCommandFuntion with Reference { - javaMainClass = nl.lumc.sasc.biopet.tools.BastyGenerateFasta.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.BastyGenerateFasta @Input(doc = "Input vcf file", required = false) var inputVcf: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BedToInterval.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BedToInterval.scala index 7f76526fc..bab2f7c0a 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BedToInterval.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BedToInterval.scala @@ -25,7 +25,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Input, Output } * @deprecated Use picard.util.BedToIntervalList instead */ class BedToInterval(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.BedToInterval.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.BedToInterval @Input(doc = "Input Bed file", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BedtoolsCoverageToCounts.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BedtoolsCoverageToCounts.scala index 104674cdf..817b6d3f2 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BedtoolsCoverageToCounts.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BedtoolsCoverageToCounts.scala @@ -22,7 +22,7 @@ import nl.lumc.sasc.biopet.utils.config.Configurable import org.broadinstitute.gatk.utils.commandline.{ Input, Output } class BedtoolsCoverageToCounts(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.BedtoolsCoverageToCounts.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.BedtoolsCoverageToCounts @Input(doc = "Input fasta", shortName = "input", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BiopetFlagstat.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BiopetFlagstat.scala index 3692244ae..ff06bc963 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BiopetFlagstat.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/BiopetFlagstat.scala @@ -24,7 +24,7 @@ import nl.lumc.sasc.biopet.utils.config.Configurable import org.broadinstitute.gatk.utils.commandline.{ Input, Output } class BiopetFlagstat(val root: Configurable) extends ToolCommandFuntion with Summarizable { - javaMainClass = nl.lumc.sasc.biopet.tools.BiopetFlagstat.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.BiopetFlagstat @Input(doc = "Input bam", shortName = "input", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/FastqSplitter.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/FastqSplitter.scala index 8bbd7e067..df7e32e19 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/FastqSplitter.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/FastqSplitter.scala @@ -26,7 +26,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Input, Output } * @param root Parent object */ class FastqSplitter(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.FastqSplitter.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.FastqSplitter @Input(doc = "Input fastq", shortName = "input", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/FastqSync.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/FastqSync.scala index ff67f5777..90100c8e7 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/FastqSync.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/FastqSync.scala @@ -32,7 +32,7 @@ import scala.util.matching.Regex */ class FastqSync(val root: Configurable) extends ToolCommandFuntion with Summarizable { - javaMainClass = nl.lumc.sasc.biopet.tools.FastqSync.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.FastqSync @Input(doc = "Original FASTQ file (read 1 or 2)", shortName = "r", required = true) var refFastq: File = null diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MergeAlleles.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MergeAlleles.scala index 3933892ff..eedb51fdd 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MergeAlleles.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MergeAlleles.scala @@ -22,7 +22,7 @@ import nl.lumc.sasc.biopet.utils.config.Configurable import org.broadinstitute.gatk.utils.commandline.{ Input, Output } class MergeAlleles(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.MergeAlleles.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.MergeAlleles @Input(doc = "Input vcf files", shortName = "input", required = true) var input: List[File] = Nil diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MergeTables.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MergeTables.scala index 7845639b6..96a421db3 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MergeTables.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MergeTables.scala @@ -30,7 +30,7 @@ import scala.collection.mutable.{ Set => MutSet } */ class MergeTables(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.MergeTables.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.MergeTables override def defaultCoreMemory = 6.0 diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MpileupToVcf.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MpileupToVcf.scala index c40754a2d..5a3e1e3f2 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MpileupToVcf.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/MpileupToVcf.scala @@ -27,7 +27,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Input, Output } import scala.collection.JavaConversions._ class MpileupToVcf(val root: Configurable) extends ToolCommandFuntion with Reference { - javaMainClass = nl.lumc.sasc.biopet.tools.MpileupToVcf.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.MpileupToVcf @Input(doc = "Input mpileup file", shortName = "mpileup", required = false) var inputMpileup: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/PrefixFastq.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/PrefixFastq.scala index 4ab27f058..302aa1158 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/PrefixFastq.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/PrefixFastq.scala @@ -27,7 +27,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Argument, Input, Output } * Created by pjvan_thof on 1/13/15. */ class PrefixFastq(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.PrefixFastq.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.PrefixFastq override def defaultCoreMemory = 1.0 diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCountFastq.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCountFastq.scala index d0d9fa739..2ee9d97e1 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCountFastq.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCountFastq.scala @@ -22,7 +22,7 @@ import nl.lumc.sasc.biopet.utils.config.Configurable import org.broadinstitute.gatk.utils.commandline.{ Input, Output } class SageCountFastq(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.SageCountFastq.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.SageCountFastq @Input(doc = "Input fasta", shortName = "input", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCreateLibrary.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCreateLibrary.scala index 1bf0b0f55..4b287d2ce 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCreateLibrary.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCreateLibrary.scala @@ -22,7 +22,7 @@ import nl.lumc.sasc.biopet.utils.config.Configurable import org.broadinstitute.gatk.utils.commandline.{ Input, Output } class SageCreateLibrary(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.SageCreateLibrary.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.SageCreateLibrary @Input(doc = "Input fasta", shortName = "input", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCreateTagCounts.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCreateTagCounts.scala index d94e9106e..d0779973b 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCreateTagCounts.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SageCreateTagCounts.scala @@ -22,7 +22,7 @@ import nl.lumc.sasc.biopet.utils.config.Configurable import org.broadinstitute.gatk.utils.commandline.{ Input, Output } class SageCreateTagCounts(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.SageCreateTagCounts.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.SageCreateTagCounts @Input(doc = "Raw count file", shortName = "input", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SeqStat.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SeqStat.scala index cbe915cf0..cc7a8e6ed 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SeqStat.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SeqStat.scala @@ -14,7 +14,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Output, Input } * @param root Configuration object for the pipeline */ class SeqStat(val root: Configurable) extends ToolCommandFuntion with Summarizable { - javaMainClass = nl.lumc.sasc.biopet.tools.SeqStat.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.SeqStat @Input(doc = "Input FASTQ", shortName = "input", required = true) var input: File = null diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SquishBed.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SquishBed.scala index e20b2822a..558c93f85 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SquishBed.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/SquishBed.scala @@ -10,7 +10,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Input, Output } * Created by pjvanthof on 22/08/15. */ class SquishBed(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.SquishBed.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.SquishBed @Input(doc = "Input Bed file", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfFilter.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfFilter.scala index 6884f0788..60d550532 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfFilter.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfFilter.scala @@ -22,7 +22,7 @@ import nl.lumc.sasc.biopet.utils.config.Configurable import org.broadinstitute.gatk.utils.commandline.{ Input, Output } class VcfFilter(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.VcfFilter.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.VcfFilter @Input(doc = "Input vcf", shortName = "I", required = true) var inputVcf: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfStats.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfStats.scala index 15fe27c04..3fd09a67f 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfStats.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfStats.scala @@ -30,7 +30,7 @@ import scala.io.Source * Created by pjvan_thof on 1/10/15. */ class VcfStats(val root: Configurable) extends ToolCommandFuntion with Summarizable with Reference { - javaMainClass = nl.lumc.sasc.biopet.tools.VcfStats.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.VcfStats @Input(doc = "Input fastq", shortName = "I", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfWithVcf.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfWithVcf.scala index c3438ff4d..5ab877502 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfWithVcf.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VcfWithVcf.scala @@ -25,7 +25,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Input, Output } * Biopet extension for tool VcfWithVcf */ class VcfWithVcf(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.VcfWithVcf.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.VcfWithVcf @Input(doc = "Input vcf file", shortName = "input", required = true) var input: File = _ diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VepNormalizer.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VepNormalizer.scala index cb71ee26c..4379b990d 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VepNormalizer.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/VepNormalizer.scala @@ -32,7 +32,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Input, Output } */ class VepNormalizer(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.VepNormalizer.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.VepNormalizer @Input(doc = "Input VCF, may be indexed", shortName = "InputFile", required = true) var inputVCF: File = null diff --git a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/WipeReads.scala b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/WipeReads.scala index 9c892245c..1e468bd36 100644 --- a/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/WipeReads.scala +++ b/public/biopet-tools-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/tools/WipeReads.scala @@ -29,7 +29,7 @@ import org.broadinstitute.gatk.utils.commandline.{ Input, Output } */ class WipeReads(val root: Configurable) extends ToolCommandFuntion { - javaMainClass = nl.lumc.sasc.biopet.tools.WipeReads.getClass.getName + def toolObject = nl.lumc.sasc.biopet.tools.WipeReads @Input(doc = "Input BAM file (must be indexed)", shortName = "I", required = true) var inputBam: File = null -- GitLab