Fix profile activation for Spark 3.2, spotless apply

apache · Aug 22, 2024 · 90ac25d · 90ac25d
1 parent 34b5f24
commit 90ac25d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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-3.0/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala b/...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-3.1/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala b/...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-3.2/src/main/scala/org/apache/sedona/sql/datasources/shapefile/ShapefileUtils.scala b/...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
           }