small refactor, revert change to build.sbt

Author: benkonz

build.sbt

@@ -165,7 +165,7 @@ lazy val ratatoolCommon = project
       "org.apache.avro" % "avro" % avroVersion,
       "org.apache.avro" % "avro-mapred" % avroVersion classifier "hadoop2",
       "com.google.guava" % "guava" % guavaVersion,
-      "com.google.apis" % "google-api-services-bigquery" % bigqueryVersion,
+      "com.google.apis" % "google-api-services-bigquery" % bigqueryVersion % Test,
       "org.apache.avro" % "avro" % avroVersion % Test classifier "tests",
       "org.slf4j" % "slf4j-simple" % slf4jVersion % Test,
     ),

ratatool-common/src/main/scala/com/spotify/ratatool/BigQueryUtil.scala

@@ -1,15 +1,12 @@
 package com.spotify.ratatool
 
-import com.google.api.services.bigquery.model.TableFieldSchema
-
 object BigQueryUtil {
   // a null TableFieldSchema mode can be treated as "NULLABLE", which is the
-  // default value according to the docs
-  def getFieldModeWithDefault(f: TableFieldSchema): String = {
-    if (f.getMode == null) {
-      "NULLABLE"
-    } else {
-      f.getMode
+  // default value according to the docs, so return "NULLABLE" if fieldMode is null
+  // otherwise return fieldMode
+  def getFieldModeWithDefault(fieldMode: String): String =
+    fieldMode match {
+      case null => "NULLABLE"
+      case _    => fieldMode
     }
-  }
 }

ratatool-diffy/src/main/scala/com/spotify/ratatool/diffy/BigDiffy.scala

@@ -553,11 +553,11 @@ object BigDiffy extends Command with Serializable {
         case (Some(f), None) => f
         case (None, Some(f)) => f
         case (Some(fx), Some(fy)) =>
+          val fxMode = getFieldModeWithDefault(fx.getMode)
+          val fyMode = getFieldModeWithDefault(fy.getMode)
           assert(
-            fx.getType == fy.getType && getFieldModeWithDefault(fx) == getFieldModeWithDefault(fy),
-            f"field ${fx.getName} in lhs, type: ${fx.getType} mode: ${getFieldModeWithDefault(
-                fx
-              )}, and rhs, type: ${fy.getType} mode: ${getFieldModeWithDefault(fy)}, do not match"
+            fx.getType == fy.getType && fxMode == fyMode,
+            f"field ${fx.getName} in lhs, type: ${fx.getType} mode: $fxMode, and rhs, type: ${fy.getType} mode: $fyMode, do not match"
           )
           if (fx.getType == "RECORD") {
             fx.setFields(

ratatool-scalacheck/src/main/scala/com/spotify/ratatool/scalacheck/TableRowGenerator.scala

@@ -144,7 +144,7 @@ trait TableRowGeneratorOps {
       case t => throw new RuntimeException(s"Unknown type: $t")
     }
 
-    getFieldModeWithDefault(fieldSchema) match {
+    getFieldModeWithDefault(fieldSchema.getMode) match {
       case "REQUIRED" => genV()
       case "NULLABLE" =>
         Arbitrary.arbBool.arbitrary.flatMap { e =>