You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sedona.apache.org by ji...@apache.org on 2023/03/07 22:40:41 UTC

[sedona] branch master updated: [SEDONA-229] Fix Linter Messages in Python Adapter (#789)

This is an automated email from the ASF dual-hosted git repository.

jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sedona.git


The following commit(s) were added to refs/heads/master by this push:
     new e292a9eb [SEDONA-229] Fix Linter Messages in Python Adapter (#789)
e292a9eb is described below

commit e292a9eb6df54710abdeb2d920b08b5c7bfb7b03
Author: Douglas Dennis <do...@gmail.com>
AuthorDate: Tue Mar 7 14:40:35 2023 -0800

    [SEDONA-229] Fix Linter Messages in Python Adapter (#789)
---
 .../org.apache.sedona.python.wrapper/SerializationException.scala | 2 +-
 .../adapters/JoinParamsAdapter.scala                              | 2 +-
 .../adapters/PythonConverter.scala                                | 8 +++++++-
 .../translation/PythonGeometrySerializer.scala                    | 2 +-
 .../test/scala/org/apache/sedona/python/wrapper/SparkUtil.scala   | 2 +-
 scalastyle_config.xml                                             | 6 +++++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/SerializationException.scala b/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/SerializationException.scala
index 345733cd..f436c4c3 100644
--- a/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/SerializationException.scala
+++ b/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/SerializationException.scala
@@ -21,4 +21,4 @@ package org.apache.sedona.python.wrapper
 
 final case class SerializationException(private val message: String = "",
                                         private val cause: Throwable = None.orNull)
-  extends Exception(message, cause)
\ No newline at end of file
+  extends Exception(message, cause)
diff --git a/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/adapters/JoinParamsAdapter.scala b/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/adapters/JoinParamsAdapter.scala
index 5ec1cb03..0ba89303 100644
--- a/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/adapters/JoinParamsAdapter.scala
+++ b/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/adapters/JoinParamsAdapter.scala
@@ -28,4 +28,4 @@ object JoinParamsAdapter {
     val currIndexType = IndexType.getIndexType(indexType)
     new JoinParams(useIndex, considerBoundaryIntersection, currIndexType, buildSide)
   }
-}
\ No newline at end of file
+}
diff --git a/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/adapters/PythonConverter.scala b/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/adapters/PythonConverter.scala
index 11df6d45..63073bc0 100644
--- a/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/adapters/PythonConverter.scala
+++ b/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/adapters/PythonConverter.scala
@@ -19,7 +19,13 @@
 
 package org.apache.sedona.python.wrapper.adapters
 
-import org.apache.sedona.python.wrapper.translation.{FlatPairRddConverter, GeometryRddConverter, GeometrySeqToPythonConverter, ListPairRddConverter, PythonRDDToJavaConverter}
+import org.apache.sedona.python.wrapper.translation.{
+  FlatPairRddConverter,
+  GeometryRddConverter,
+  GeometrySeqToPythonConverter,
+  ListPairRddConverter,
+  PythonRDDToJavaConverter
+}
 import org.apache.spark.api.java.{JavaPairRDD, JavaRDD}
 import org.locationtech.jts.geom.Geometry
 
diff --git a/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/translation/PythonGeometrySerializer.scala b/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/translation/PythonGeometrySerializer.scala
index 3fa41dcb..6af6bcb9 100644
--- a/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/translation/PythonGeometrySerializer.scala
+++ b/python-adapter/src/main/scala/org.apache.sedona.python.wrapper/translation/PythonGeometrySerializer.scala
@@ -58,4 +58,4 @@ private[python] class PythonGeometrySerializer extends Serializable {
     else throw SerializationException("Can not deserialize object")
 
   }
-}
\ No newline at end of file
+}
diff --git a/python-adapter/src/test/scala/org/apache/sedona/python/wrapper/SparkUtil.scala b/python-adapter/src/test/scala/org/apache/sedona/python/wrapper/SparkUtil.scala
index 89e80d05..537325fa 100644
--- a/python-adapter/src/test/scala/org/apache/sedona/python/wrapper/SparkUtil.scala
+++ b/python-adapter/src/test/scala/org/apache/sedona/python/wrapper/SparkUtil.scala
@@ -42,4 +42,4 @@ object SparkUtil {
     Logger.getLogger("akka").setLevel(Level.WARN)
     sc
   }
-}
\ No newline at end of file
+}
diff --git a/scalastyle_config.xml b/scalastyle_config.xml
index 1426d948..efe32da4 100644
--- a/scalastyle_config.xml
+++ b/scalastyle_config.xml
@@ -146,7 +146,11 @@
    <parameter name="regex"><![CDATA[^[A-Z_]$]]></parameter>
   </parameters>
  </check>
- <check class="org.scalastyle.scalariform.UnderscoreImportChecker" level="warning" enabled="true"></check>
+ <check class="org.scalastyle.scalariform.UnderscoreImportChecker" level="warning" enabled="true">
+  <parameters>
+   <parameter name="ignoreRegex"><parameter name="ignoreRegex">jdk\.CollectionConverters\._|implicits\._</parameter></parameter>
+  </parameters>
+ </check>
  <check class="org.scalastyle.scalariform.LowercasePatternMatchChecker" level="warning" enabled="true"></check>
  <check class="org.scalastyle.scalariform.EmptyInterpolatedStringChecker" level="warning" enabled="true"></check>
  <check class="org.scalastyle.scalariform.MultipleStringLiteralsChecker" level="warning" enabled="false">