abstract the logic to convert from snake_case to camelCase to a strin…

…g helper method
mrpowers-io · Nov 29, 2018 · ac0b222 · ac0b222
1 parent d6363ac
commit ac0b222
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/src/main/scala/com/github/mrpowers/spark/daria/sql/transformations.scala b/src/main/scala/com/github/mrpowers/spark/daria/sql/transformations.scala
@@ -2,11 +2,9 @@ package com.github.mrpowers.spark.daria.sql
 
 import com.github.mrpowers.spark.daria.sql.DataFrameExt._
 import com.github.mrpowers.spark.daria.sql.functions.truncate
-import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.types._
 import org.apache.spark.sql.functions._
 import org.apache.spark.sql.types.{StructField, StructType}
-import org.apache.spark.sql.{Column, DataFrame, Row, SparkSession}
+import org.apache.spark.sql.{Column, DataFrame}
 
 case class InvalidColumnSortOrderException(smth: String) extends Exception(smth)
 
@@ -88,7 +86,7 @@ object transformations {
     df.columns.foldLeft(df) { (memoDF, colName) =>
       memoDF.withColumnRenamed(
         colName,
-        toSnakeCase(colName)
+        com.github.mrpowers.spark.daria.utils.StringHelpers.toSnakeCase(colName)
       )
     }
   }
@@ -99,21 +97,9 @@ object transformations {
    */
   def camelCaseToSnakeCaseColumns()(df: DataFrame): DataFrame =
     df.renameColumns(
-      _.replaceAll(
-        "([A-Z]+)",
-        "_$1"
-      ).toLowerCase.stripPrefix("_")
+      com.github.mrpowers.spark.daria.utils.StringHelpers.camelCaseToSnakeCase
     )
 
-  private def toSnakeCase(str: String): String = {
-    str
-      .replaceAll(
-        "\\s+",
-        "_"
-      )
-      .toLowerCase
-  }
-
   /**
    * Title Cases all the columns of a DataFrame
    */

diff --git a/src/main/scala/com/github/mrpowers/spark/daria/utils/StringHelpers.scala b/src/main/scala/com/github/mrpowers/spark/daria/utils/StringHelpers.scala
@@ -26,4 +26,23 @@ object StringHelpers {
     })
   }
 
+  def toSnakeCase(str: String): String = {
+    str
+      .replaceAll(
+        "\\s+",
+        "_"
+      )
+      .toLowerCase
+  }
+
+  def camelCaseToSnakeCase(str: String): String = {
+    str
+      .replaceAll(
+        "([A-Z]+)",
+        "_$1"
+      )
+      .toLowerCase
+      .stripPrefix("_")
+  }
+
 }