summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2017-03-07 20:03:00 -0800
committerJakob Odersky <jakob@odersky.com>2017-03-07 20:03:00 -0800
commitaa197e3a54efbb7ab43f35cdfa7d8c8de243663d (patch)
tree4949c7204e94ec95dcab79beb9dbf9d12176eef0
parentdb1c748be84c29bc483195439a21e2b9d44da63b (diff)
downloadcrashbox-ci-aa197e3a54efbb7ab43f35cdfa7d8c8de243663d.tar.gz
crashbox-ci-aa197e3a54efbb7ab43f35cdfa7d8c8de243663d.tar.bz2
crashbox-ci-aa197e3a54efbb7ab43f35cdfa7d8c8de243663d.zip
fomatting
-rw-r--r--crashbox-server/src/main/scala/io/crashbox/ci/Builders.scala18
-rw-r--r--crashbox-server/src/main/scala/io/crashbox/ci/Core.scala5
-rw-r--r--crashbox-server/src/main/scala/io/crashbox/ci/HttpApi.scala34
-rw-r--r--crashbox-server/src/main/scala/io/crashbox/ci/Main.scala5
-rw-r--r--crashbox-server/src/main/scala/io/crashbox/ci/Parsers.scala1
-rw-r--r--crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala19
-rw-r--r--crashbox-server/src/main/scala/io/crashbox/ci/Source.scala4
-rw-r--r--crashbox-server/src/test/scala/io/crashbox/ci/SourceSpec.scala8
8 files changed, 34 insertions, 60 deletions
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Builders.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Builders.scala
index 6bd4816..1532832 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Builders.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Builders.scala
@@ -1,22 +1,20 @@
package io.crashbox.ci
+import java.io.{File, OutputStream}
+
+import scala.collection.JavaConverters._
+import scala.concurrent.Future
+import scala.concurrent.duration._
+
+import com.spotify.docker.client.DefaultDockerClient
import com.spotify.docker.client.DockerClient.{
AttachParameter,
ListContainersParam
}
import com.spotify.docker.client.LogStream
import com.spotify.docker.client.exceptions.ContainerNotFoundException
-import com.spotify.docker.client.messages.{
- ContainerConfig,
- HostConfig,
- LogConfig
-}
+import com.spotify.docker.client.messages.{ContainerConfig, HostConfig}
import com.spotify.docker.client.messages.HostConfig.Bind
-import java.io.{File, OutputStream}
-import scala.concurrent.Future
-import scala.concurrent.duration._
-import scala.collection.JavaConverters._
-import com.spotify.docker.client.DefaultDockerClient
trait Builders { core: Core =>
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Core.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Core.scala
index ed9ff14..78a4252 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Core.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Core.scala
@@ -1,9 +1,10 @@
package io.crashbox.ci
+import scala.concurrent.{Await, ExecutionContext}
+import scala.concurrent.duration.Duration
+
import akka.actor.ActorSystem
import akka.stream.ActorMaterializer
-import scala.concurrent.duration.Duration
-import scala.concurrent.{Await, ExecutionContext}
trait Core {
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/HttpApi.scala b/crashbox-server/src/main/scala/io/crashbox/ci/HttpApi.scala
index 22feba5..7cb76b0 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/HttpApi.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/HttpApi.scala
@@ -1,32 +1,18 @@
package io.crashbox.ci
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.marshalling.Marshaller
-import akka.http.scaladsl.marshalling.ToResponseMarshaller
-import akka.http.scaladsl.model.{
- ContentType,
- ContentTypes,
- HttpEntity,
- MediaTypes
-}
-import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.model.ws.TextMessage
-import akka.http.scaladsl.server.directives.Credentials
-import akka.stream.scaladsl.{Flow, Keep, Sink}
-import akka.stream.{ActorMaterializer, OverflowStrategy}
-import akka.stream.scaladsl.{Source => Src}
import java.net.URL
import java.security.MessageDigest
-import java.text.SimpleDateFormat
-import java.util.Date
-import scala.util.{Failure, Success}
+
+import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
+import akka.http.scaladsl.marshalling.{Marshaller, ToResponseMarshaller}
+import akka.http.scaladsl.model.{ContentTypes, HttpEntity}
+import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
+import akka.http.scaladsl.model.HttpResponse
import akka.http.scaladsl.server._
-import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
-import Directives._
-import SprayJsonSupport._
-import spray.json.{DefaultJsonProtocol, JsObject, JsString, JsValue}
+import akka.http.scaladsl.server.Directives._
+import akka.stream.OverflowStrategy
+import akka.stream.scaladsl.{Source => Src}
+import spray.json.DefaultJsonProtocol
trait HttpApi { self: Core with Schedulers with StreamStore =>
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Main.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Main.scala
index d2e886b..4961b86 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Main.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Main.scala
@@ -1,10 +1,9 @@
package io.crashbox.ci
-import akka.http.scaladsl.Http
-import akka.stream.ActorMaterializer
-import java.net.URL
import scala.util.{Failure, Success}
+import akka.http.scaladsl.Http
+
object Main
extends Core
with Schedulers
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Parsers.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Parsers.scala
index 20221cb..020521c 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Parsers.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Parsers.scala
@@ -2,6 +2,7 @@ package io.crashbox.ci
import java.io.File
import java.nio.file.Files
+
import scala.collection.JavaConverters._
trait Parsers {
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala
index 01c278d..7632d95 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Schedulers.scala
@@ -1,27 +1,14 @@
package io.crashbox.ci
-import akka.actor.{
- Actor,
- ActorLogging,
- ActorRef,
- OneForOneStrategy,
- Props,
- Terminated
-}
-import akka.stream.stage.GraphStageLogic
-import akka.stream.{Attributes, Outlet, SourceShape}
-import akka.stream.stage.GraphStage
import java.io.{File, OutputStream}
import java.net.URL
import java.nio.file.Files
-import java.util.Base64
+
import scala.collection.mutable.HashMap
-import scala.concurrent.{Await, Future}
-import scala.concurrent.duration._
-import scala.util.control.NonFatal
-import akka.actor.SupervisorStrategy._
import scala.util.{Failure, Success}
+import akka.actor.{Actor, ActorLogging, ActorRef, Props, Terminated}
+
trait Schedulers extends { self: Core with Source with Builders with Parsers =>
private def newTempDir: File =
diff --git a/crashbox-server/src/main/scala/io/crashbox/ci/Source.scala b/crashbox-server/src/main/scala/io/crashbox/ci/Source.scala
index 335e59c..dffb5ea 100644
--- a/crashbox-server/src/main/scala/io/crashbox/ci/Source.scala
+++ b/crashbox-server/src/main/scala/io/crashbox/ci/Source.scala
@@ -2,9 +2,11 @@ package io.crashbox.ci
import java.io.File
import java.net.URL
-import org.eclipse.jgit.api.Git
+
import scala.concurrent.Future
+import org.eclipse.jgit.api.Git
+
trait Source { self: Core =>
def fetchSource(from: URL, to: File): Future[File] =
diff --git a/crashbox-server/src/test/scala/io/crashbox/ci/SourceSpec.scala b/crashbox-server/src/test/scala/io/crashbox/ci/SourceSpec.scala
index a03e476..ac21fdb 100644
--- a/crashbox-server/src/test/scala/io/crashbox/ci/SourceSpec.scala
+++ b/crashbox-server/src/test/scala/io/crashbox/ci/SourceSpec.scala
@@ -1,11 +1,11 @@
package io.crashbox.ci
import java.io.File
-import java.nio.file.Files
-import java.net.URL
-import org.eclipse.jgit.api.Git
-import scala.concurrent.duration._
+
import scala.concurrent.Await
+import scala.concurrent.duration._
+
+import org.eclipse.jgit.api.Git
import org.scalatest._
class SourceSpec extends FlatSpec with Matchers with Source with Core {