Merge pull request #503 from laserson/ADAM-473

[ADAM-473] Make RecordCondition and FieldCondition public
bigdatagenomics · Nov 22, 2014 · 6d9f45e · 6d9f45e
2 parents 995f72c + 1686906
commit 6d9f45e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -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