more changes

apache · Nov 3, 2024 · d25a439 · d25a439
1 parent 481c7b5
commit d25a439
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
@@ -27,6 +27,7 @@ import protocbridge.{ JvmGenerator, ProtocRunner, Target }
 import scalapb.ScalaPbCodeGenerator
 
 import scala.beans.BeanProperty
+import scala.collection.JavaConverters._
 import scala.util.control.NoStackTrace
 
 object AbstractGenerateMojo {
@@ -87,7 +88,6 @@ object AbstractGenerateMojo {
    * e.g. { "flatPackage": "true", "serverPowerApis": "false" } -> ["flat_package"]
    */
   def parseGeneratorSettings(generatorSettings: java.util.Map[String, String]): Seq[String] = {
-    import scala.collection.JavaConverters._
     generatorSettings.asScala.filter(_._2.toLowerCase() != "false").keys.toSeq.map { params =>
       "[A-Z]".r.replaceAllIn(params, s => s"_${s.group(0).toLowerCase()}")
     }
@@ -120,7 +120,6 @@ abstract class AbstractGenerateMojo @Inject() (buildContext: BuildContext) exten
   @BeanProperty
   var generatePlayServer: Boolean = _
 
-  import pekko.util.ccompat.JavaConverters._
   @BeanProperty
   var generatorSettings: java.util.Map[String, String] = _
 

diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala
@@ -15,7 +15,8 @@ package org.apache.pekko.grpc.internal
 
 import java.util
 
-import org.apache.pekko.grpc.GrpcServiceException
+import org.apache.pekko
+import pekko.grpc.GrpcServiceException
 import io.grpc.{ Attributes, EquivalentAddressGroup, NameResolver, Status }
 
 import scala.concurrent.Promise