From 16869063f56b3faf08fa8b81cbc9fcef03ead58a Mon Sep 17 00:00:00 2001 From: Uri Laserson Date: Sat, 22 Nov 2014 03:42:27 +0100 Subject: [PATCH] [ADAM-473] Make RecordCondition and FieldCondition public Fixes #473 --- .../org/bdgenomics/adam/predicates/FieldCondition.scala | 5 ++--- .../org/bdgenomics/adam/predicates/RecordCondition.scala | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/adam-core/src/main/scala/org/bdgenomics/adam/predicates/FieldCondition.scala b/adam-core/src/main/scala/org/bdgenomics/adam/predicates/FieldCondition.scala index 7325bcd33d..6c217f2b1b 100644 --- a/adam-core/src/main/scala/org/bdgenomics/adam/predicates/FieldCondition.scala +++ b/adam-core/src/main/scala/org/bdgenomics/adam/predicates/FieldCondition.scala @@ -62,8 +62,7 @@ object ColumnReaderInput extends Serializable { } } -private[predicates] case class FieldCondition[T](fieldName: String, - filter: T => Boolean)(implicit converter: ColumnReaderInput[T]) +case class FieldCondition[T](fieldName: String, filter: T => Boolean)(implicit converter: ColumnReaderInput[T]) extends Predicate { def apply(input: Any): Boolean = { @@ -78,7 +77,7 @@ private[predicates] case class FieldCondition[T](fieldName: String, } -private[predicates] object FieldCondition { +object FieldCondition { def apply(field: AlignmentRecordField.Value, filterValue: Boolean)(implicit converter: ColumnReaderInput[Boolean]): FieldCondition[Boolean] = { diff --git a/adam-core/src/main/scala/org/bdgenomics/adam/predicates/RecordCondition.scala b/adam-core/src/main/scala/org/bdgenomics/adam/predicates/RecordCondition.scala index 3c42ad193e..180e0c78d4 100644 --- a/adam-core/src/main/scala/org/bdgenomics/adam/predicates/RecordCondition.scala +++ b/adam-core/src/main/scala/org/bdgenomics/adam/predicates/RecordCondition.scala @@ -41,7 +41,7 @@ import parquet.filter.{ AndRecordFilter, OrRecordFilter, UnboundRecordFilter } import org.bdgenomics.adam.util.ImplicitJavaConversions._ import scala.annotation.tailrec -private[predicates] object RecordCondition { +object RecordCondition { // Convert predicate on single field to predicate on record def getRecordPredicate[T <: SpecificRecord: Manifest, U](condition: FieldCondition[U]): T => Boolean = { @@ -81,8 +81,7 @@ private[predicates] object RecordCondition { * with Parquet stored files * */ -private[predicates] class RecordCondition[T <% SpecificRecord: Manifest] private (val filter: T => Boolean, - val recordFilter: UnboundRecordFilter) +class RecordCondition[T <% SpecificRecord: Manifest](val filter: T => Boolean, val recordFilter: UnboundRecordFilter) extends Serializable { // Combine two predicates through an AND