From 90ac25d259b797a3a49cf22b8fa5ef7b6464c9be Mon Sep 17 00:00:00 2001
From: Kristin Cowalcijk <bo@wherobots.com>
Date: Thu, 22 Aug 2024 18:54:16 +0800
Subject: [PATCH] Fix profile activation for Spark 3.2, spotless apply

---
 pom.xml                                                        | 2 +-
 python/tests/sql/test_shapefile.py                             | 2 +-
 .../sedona/sql/datasources/shapefile/ShapefileUtils.scala      | 3 ++-
 .../sedona/sql/datasources/shapefile/ShapefileUtils.scala      | 3 ++-
 .../sedona/sql/datasources/shapefile/ShapefileUtils.scala      | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index f71e7b680e..333c7c7c5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,7 +709,7 @@
             <activation>
                 <property>
                     <name>spark</name>
-                    <value>3.2.3</value>
+                    <value>3.2</value>
                 </property>
             </activation>
             <properties>
diff --git a/python/tests/sql/test_shapefile.py b/python/tests/sql/test_shapefile.py
index eccc0b2f3c..1565ee6ea8 100644
--- a/python/tests/sql/test_shapefile.py
+++ b/python/tests/sql/test_shapefile.py
@@ -82,4 +82,4 @@ def test_read_multiple_shapefiles(self):
                 assert row['aUnicode'] == ''
                 assert row['aDecimal'] is None
                 assert row['aDecimal2'] is None
-                assert row['aDate'] is None        
+                assert row['aDate'] is None
diff --git a/spark/spark-3.0/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala b/spark/spark-3.0/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
index 931bbacd54..7f95aca4cb 100644
--- a/spark/spark-3.0/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
+++ b/spark/spark-3.0/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
@@ -171,7 +171,8 @@ object ShapefileUtils {
           }
         } else { (bytes: Array[Byte]) =>
           try {
-            Decimal.fromDecimal(new java.math.BigDecimal(new String(bytes, StandardCharsets.ISO_8859_1).trim))
+            Decimal.fromDecimal(
+              new java.math.BigDecimal(new String(bytes, StandardCharsets.ISO_8859_1).trim))
           } catch {
             case _: Exception => null
           }
diff --git a/spark/spark-3.1/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala b/spark/spark-3.1/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
index 931bbacd54..7f95aca4cb 100644
--- a/spark/spark-3.1/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
+++ b/spark/spark-3.1/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
@@ -171,7 +171,8 @@ object ShapefileUtils {
           }
         } else { (bytes: Array[Byte]) =>
           try {
-            Decimal.fromDecimal(new java.math.BigDecimal(new String(bytes, StandardCharsets.ISO_8859_1).trim))
+            Decimal.fromDecimal(
+              new java.math.BigDecimal(new String(bytes, StandardCharsets.ISO_8859_1).trim))
           } catch {
             case _: Exception => null
           }
diff --git a/spark/spark-3.2/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala b/spark/spark-3.2/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
index 931bbacd54..7f95aca4cb 100644
--- a/spark/spark-3.2/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
+++ b/spark/spark-3.2/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala
@@ -171,7 +171,8 @@ object ShapefileUtils {
           }
         } else { (bytes: Array[Byte]) =>
           try {
-            Decimal.fromDecimal(new java.math.BigDecimal(new String(bytes, StandardCharsets.ISO_8859_1).trim))
+            Decimal.fromDecimal(
+              new java.math.BigDecimal(new String(bytes, StandardCharsets.ISO_8859_1).trim))
           } catch {
             case _: Exception => null
           }