diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
index cc9b46fb3e41a..4c5e5200f5112 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
@@ -101,7 +101,8 @@ package object dsl {
     def isNotNull: Predicate = IsNotNull(expr)
 
     def getItem(ordinal: Expression): UnresolvedGetField = UnresolvedGetField(expr, ordinal)
-    def getField(fieldName: String): UnresolvedGetField = UnresolvedGetField(expr, Literal(fieldName))
+    def getField(fieldName: String): UnresolvedGetField =
+      UnresolvedGetField(expr, Literal(fieldName))
 
     def cast(to: DataType): Expression = Cast(expr, to)
 
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/GetField.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/GetField.scala
index 8c9eff68f3fa5..a39e269c8afa8 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/GetField.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/GetField.scala
@@ -46,7 +46,8 @@ object GetField {
         MapOrdinalGetField(child, fieldExpr)
       case (otherType, _) =>
         throw new AnalysisException(
-          s"GetField is not valid on child of type $otherType with fieldExpr of type ${fieldExpr.dataType}")
+          "GetField is not valid on child of type " +
+            s"$otherType with fieldExpr of type ${fieldExpr.dataType}")
     }
   }
 
@@ -138,8 +139,11 @@ case class SimpleStructGetField(child: Expression, field: StructField, ordinal:
 /**
  * Returns the array of value of fields in the Array of Struct `child`.
  */
-case class ArrayStructGetField(child: Expression, field: StructField, ordinal: Int, containsNull: Boolean)
-  extends StructGetField {
+case class ArrayStructGetField(
+    child: Expression,
+    field: StructField,
+    ordinal: Int,
+    containsNull: Boolean) extends StructGetField {
 
   override def dataType: DataType = ArrayType(field.dataType, containsNull)
   override def nullable: Boolean = child.nullable
@@ -160,7 +164,7 @@ case class ArrayStructGetField(child: Expression, field: StructField, ordinal: I
 case class ArrayOrdinalGetField(child: Expression, ordinal: Expression)
   extends OrdinalGetField {
 
-  override def dataType = child.dataType.asInstanceOf[ArrayType].elementType
+  override def dataType: DataType = child.dataType.asInstanceOf[ArrayType].elementType
 
   override lazy val resolved = childrenResolved &&
     child.dataType.isInstanceOf[ArrayType] && ordinal.dataType.isInstanceOf[IntegralType]
@@ -184,7 +188,7 @@ case class ArrayOrdinalGetField(child: Expression, ordinal: Expression)
 case class MapOrdinalGetField(child: Expression, ordinal: Expression)
   extends OrdinalGetField {
 
-  override def dataType = child.dataType.asInstanceOf[MapType].valueType
+  override def dataType: DataType = child.dataType.asInstanceOf[MapType].valueType
 
   override lazy val resolved = childrenResolved && child.dataType.isInstanceOf[MapType]
 
@@ -192,4 +196,4 @@ case class MapOrdinalGetField(child: Expression, ordinal: Expression)
     val baseValue = value.asInstanceOf[Map[Any, _]]
     baseValue.get(ordinal).orNull
   }
-}
\ No newline at end of file
+}
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala
index 9ee527ae701c7..c241098f4fdb3 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala
@@ -895,7 +895,8 @@ class ExpressionEvaluationSuite extends ExpressionEvaluationBaseSuite {
       Literal("aa")), "bb", row)
     checkEvaluation(MapOrdinalGetField(Literal.create(null, typeMap), Literal("aa")), null, row)
     checkEvaluation(
-      MapOrdinalGetField(Literal.create(null, typeMap), Literal.create(null, StringType)), null, row)
+      MapOrdinalGetField(Literal.create(null, typeMap),
+        Literal.create(null, StringType)), null, row)
     checkEvaluation(MapOrdinalGetField(BoundReference(3, typeMap, true),
       Literal.create(null, StringType)), null, row)
 
@@ -903,7 +904,8 @@ class ExpressionEvaluationSuite extends ExpressionEvaluationBaseSuite {
       Literal(1)), "bb", row)
     checkEvaluation(ArrayOrdinalGetField(Literal.create(null, typeArray), Literal(1)), null, row)
     checkEvaluation(
-      ArrayOrdinalGetField(Literal.create(null, typeArray), Literal.create(null, IntegerType)), null, row)
+      ArrayOrdinalGetField(Literal.create(null, typeArray),
+        Literal.create(null, IntegerType)), null, row)
     checkEvaluation(ArrayOrdinalGetField(BoundReference(4, typeArray, true),
       Literal.create(null, IntegerType)), null, row)