From 481c7b5bef9dd9c9bb024dda15ecf796ebd60c72 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 3 Nov 2024 21:59:46 +0100 Subject: [PATCH] reorder imports --- .../org/apache/pekko/grpc/gen/scaladsl/Service.scala | 2 +- .../myapp/helloworld/grpc/RichErrorNativeImpl.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala index 070f86b2..00fe6f6e 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala @@ -13,8 +13,8 @@ package org.apache.pekko.grpc.gen.scaladsl -import scala.collection.JavaConverters._ import scala.collection.immutable +import scala.collection.JavaConverters._ import com.google.protobuf.Descriptors._ import protocgen.CodeGenRequest import scalapb.compiler.{ DescriptorImplicits, GeneratorParams } diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java index d054e195..987c0bae 100644 --- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java +++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java @@ -13,15 +13,17 @@ package example.myapp.helloworld.grpc; -import com.google.rpc.Code; -import com.google.rpc.error_details.LocalizedMessage; import java.util.ArrayList; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + +import com.google.rpc.Code; +import com.google.rpc.error_details.LocalizedMessage; import org.apache.pekko.NotUsed; import org.apache.pekko.grpc.GrpcServiceException; import org.apache.pekko.stream.javadsl.Source; -import org.apache.pekko.util.ccompat.JavaConverters; + +import scala.collection.JavaConverters; public class RichErrorNativeImpl implements GreeterService {