minor corrections

DataBiosphere · Oct 23, 2017 · 7f72cdf · 7f72cdf
1 parent 2c43058
commit 7f72cdf
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 13 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/api/UserInfoDirectives.scala b/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/api/UserInfoDirectives.scala
@@ -1,9 +1,9 @@
 package org.broadinstitute.dsde.workbench.leonardo.api
 
 import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.server.{Directive0, Directive1, Directives, Route}
+import akka.http.scaladsl.server.{Directive0, Directive1, Directives}
 import org.broadinstitute.dsde.workbench.leonardo.model.{LeoException, UserInfo}
-import org.broadinstitute.dsde.workbench.model.{WorkbenchExceptionWithErrorReport, WorkbenchUserEmail}
+import org.broadinstitute.dsde.workbench.model.WorkbenchUserEmail
 
 /**
   * Created by rtitle on 10/16/17.

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/config/package.scala b/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/config/package.scala
@@ -3,7 +3,6 @@ package org.broadinstitute.dsde.workbench.leonardo
 import net.ceedubs.ficus.Ficus._
 import net.ceedubs.ficus.readers.ValueReader
 import org.broadinstitute.dsde.workbench.leonardo.model.{GoogleProject, GoogleServiceAccount}
-import org.broadinstitute.dsde.workbench.model.WorkbenchUserEmail
 import org.broadinstitute.dsde.workbench.util.toScalaDuration
 
 package object config {

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/dao/GoogleDataprocDAO.scala b/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/dao/GoogleDataprocDAO.scala
@@ -1,7 +1,6 @@
 package org.broadinstitute.dsde.workbench.leonardo.dao
 
 import java.io.{ByteArrayInputStream, File}
-import java.lang.IllegalArgumentException
 import java.nio.charset.StandardCharsets
 import java.util.UUID
 
@@ -13,7 +12,7 @@ import cats.syntax.functor._
 import com.google.api.client.auth.oauth2.Credential
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
-import com.google.api.client.googleapis.json.{GoogleJsonError, GoogleJsonResponseException}
+import com.google.api.client.googleapis.json.GoogleJsonResponseException
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest
 import com.google.api.client.http.{AbstractInputStreamContent, FileContent, InputStreamContent}
 import com.google.api.client.json.jackson2.JacksonFactory
@@ -383,9 +382,9 @@ class GoogleDataprocDAO(protected val dataprocConfig: DataprocConfig, protected
       case e: GoogleJsonResponseException =>
         logger.error(s"Error occurred executing Google request for ${googleProject.string} / $context", e)
         throw CallToGoogleApiFailedException(googleProject, context, e.getStatusCode, e.getDetails.getMessage)
-      case illegalArguementException: IllegalArgumentException =>
-        logger.error(s"Error occurred processing Google response for ${googleProject.string} / $context", illegalArguementException)
-        throw CallToGoogleApiFailedException(googleProject, context, StatusCodes.BadRequest.intValue, illegalArguementException.getMessage)
+      case illegalArgumentException: IllegalArgumentException =>
+        logger.error(s"Illegal argument passed to Google request for ${googleProject.string} / $context", illegalArgumentException)
+        throw CallToGoogleApiFailedException(googleProject, context, StatusCodes.BadRequest.intValue, illegalArgumentException.getMessage)
     }
   }
 }
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/dns/ClusterDnsCache.scala b/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/dns/ClusterDnsCache.scala
@@ -69,7 +69,6 @@ class ClusterDnsCache(proxyConfig: ProxyConfig, dbRef: DbReference) extends Acto
   }
 
   def scheduleRefresh = {
-
     context.system.scheduler.scheduleOnce(proxyConfig.dnsPollPeriod, self, RefreshFromDatabase)
   }
 

diff --git a/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/api/LeoRoutesSpec.scala b/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/api/LeoRoutesSpec.scala
@@ -73,8 +73,6 @@ class LeoRoutesSpec extends FlatSpec with Matchers with ScalatestRouteTest with
     }
   }
 
-
-
   it should "200 when listing no clusters" in isolatedDbTest {
     Get("/api/clusters") ~> leoRoutes.route ~> check {
       status shouldEqual StatusCodes.OK

diff --git a/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/api/MockUserInfoDirectives.scala b/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/api/MockUserInfoDirectives.scala
@@ -11,4 +11,4 @@ trait MockUserInfoDirectives extends UserInfoDirectives {
   val userInfo: UserInfo
 
   override def requireUserInfo: Directive1[UserInfo] = provide(userInfo)
-}
+}
diff --git a/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/dao/MockGoogleDataprocDAO.scala b/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/dao/MockGoogleDataprocDAO.scala
@@ -47,7 +47,7 @@ class MockGoogleDataprocDAO(protected val dataprocConfig: DataprocConfig, protec
     Future.successful(())
   }
 
-  override def updateFirewallRule(googleProject: GoogleProject):  Future[Unit] = {
+  override def updateFirewallRule(googleProject: GoogleProject): Future[Unit] = {
     if (!firewallRules.contains(googleProject)) {
       firewallRules += googleProject -> proxyConfig.firewallRuleName
     }