diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..1274383 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with sbt-java-formatter 0.8.0 +86a432fc79a609f936832a08bf5efb85690174f9 diff --git a/chapter02/src/main/java/AskActorWithJava8.java b/chapter02/src/main/java/AskActorWithJava8.java index a17bce6..9132617 100644 --- a/chapter02/src/main/java/AskActorWithJava8.java +++ b/chapter02/src/main/java/AskActorWithJava8.java @@ -5,15 +5,15 @@ * */ +import static akka.pattern.Patterns.ask; + import akka.actor.AbstractActor; import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Props; import akka.japi.Creator; - import java.time.Duration; import java.util.concurrent.CompletionStage; -import static akka.pattern.Patterns.ask; public class AskActorWithJava8 { public static class Request { diff --git a/chapter02/src/main/java/ParallelExecutionWithJavaFuture.java b/chapter02/src/main/java/ParallelExecutionWithJavaFuture.java index 7c13bd3..a5a1438 100644 --- a/chapter02/src/main/java/ParallelExecutionWithJavaFuture.java +++ b/chapter02/src/main/java/ParallelExecutionWithJavaFuture.java @@ -5,9 +5,8 @@ * */ -import reactivedesignpatterns.NamedPoolThreadFactory; - import java.util.concurrent.*; +import reactivedesignpatterns.NamedPoolThreadFactory; public class ParallelExecutionWithJavaFuture { public static class ReplyA {} diff --git a/chapter03/src/main/java/chapter03/IntSeeding.java b/chapter03/src/main/java/chapter03/IntSeeding.java index 3b0dcfd..efc1e80 100644 --- a/chapter03/src/main/java/chapter03/IntSeeding.java +++ b/chapter03/src/main/java/chapter03/IntSeeding.java @@ -7,9 +7,9 @@ package chapter03; +import java.util.concurrent.ThreadLocalRandom; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.ThreadLocalRandom; // 代码清单3-7 public class IntSeeding { diff --git a/chapter14/src/main/java/chapter14/ComplexCommand.java b/chapter14/src/main/java/chapter14/ComplexCommand.java index 3bd3cef..0dd5e8b 100644 --- a/chapter14/src/main/java/chapter14/ComplexCommand.java +++ b/chapter14/src/main/java/chapter14/ComplexCommand.java @@ -15,15 +15,14 @@ import akka.stream.javadsl.RunnableGraph; import akka.stream.javadsl.Sink; import akka.stream.javadsl.Source; - -import javax.script.Invocable; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; import java.util.Collection; import java.util.Collections; import java.util.Set; import java.util.concurrent.CompletionStage; import java.util.stream.Stream; +import javax.script.Invocable; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; public interface ComplexCommand { diff --git a/chapter14/src/main/java/chapter14/ManagedBlocking.java b/chapter14/src/main/java/chapter14/ManagedBlocking.java index 521f4fe..9b90c7e 100644 --- a/chapter14/src/main/java/chapter14/ManagedBlocking.java +++ b/chapter14/src/main/java/chapter14/ManagedBlocking.java @@ -7,12 +7,11 @@ package chapter14; +import static java.util.concurrent.TimeUnit.SECONDS; + import akka.actor.AbstractActor; import akka.actor.ActorRef; import akka.japi.pf.ReceiveBuilder; -import reactivedesignpatterns.NamedPoolThreadFactory; - -import javax.sql.DataSource; import java.sql.Connection; import java.sql.ResultSet; import java.util.LinkedList; @@ -21,7 +20,8 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; -import static java.util.concurrent.TimeUnit.SECONDS; +import javax.sql.DataSource; +import reactivedesignpatterns.NamedPoolThreadFactory; public interface ManagedBlocking { diff --git a/chapter14/src/main/java/chapter14/ResourceEncapsulation.java b/chapter14/src/main/java/chapter14/ResourceEncapsulation.java index 468951c..14a5bf8 100644 --- a/chapter14/src/main/java/chapter14/ResourceEncapsulation.java +++ b/chapter14/src/main/java/chapter14/ResourceEncapsulation.java @@ -22,16 +22,16 @@ import com.amazonaws.services.ec2.AmazonEC2Client; import com.amazonaws.services.ec2.AmazonEC2ClientBuilder; import com.amazonaws.services.ec2.model.*; -import scala.PartialFunction; -import scala.concurrent.ExecutionContext; -import scala.concurrent.Future; -import scala.concurrent.Promise; import java.net.InetAddress; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import scala.PartialFunction; +import scala.concurrent.ExecutionContext; +import scala.concurrent.Future; +import scala.concurrent.Promise; /** * This is not a completely runnable example but only a fully compiled collection of code snippets diff --git a/chapter14/src/main/java/chapter14/ResourceLoan.java b/chapter14/src/main/java/chapter14/ResourceLoan.java index b78ad70..88ad5da 100644 --- a/chapter14/src/main/java/chapter14/ResourceLoan.java +++ b/chapter14/src/main/java/chapter14/ResourceLoan.java @@ -11,10 +11,10 @@ import akka.actor.Cancellable; import chapter14.ResourceEncapsulation.*; import chapter14.ResourceEncapsulation.Shutdown; -import scala.concurrent.duration.FiniteDuration; import java.net.InetAddress; import java.util.ArrayList; import java.util.List; +import scala.concurrent.duration.FiniteDuration; public class ResourceLoan { diff --git a/chapter15/src/main/java/chapter15/Client.java b/chapter15/src/main/java/chapter15/Client.java index 4c3e800..6131a52 100644 --- a/chapter15/src/main/java/chapter15/Client.java +++ b/chapter15/src/main/java/chapter15/Client.java @@ -7,12 +7,13 @@ package chapter15; +import static chapter15.Server.SERVER_PORT; + import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetSocketAddress; import java.net.SocketAddress; -import static chapter15.Server.SERVER_PORT; // 代码清单 15-2 // Listing 15.2 Client sending a request and then blocking until the server responds diff --git a/project/plugins.sbt b/project/plugins.sbt index 9120676..e593306 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -18,7 +18,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.15") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.2") -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") +addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")