update scala

.travis.yml

@@ -1,7 +1,7 @@
 language: scala
 
 scala:
-  - 2.12.6
+  - 2.12.7
 
 python:
   - 2.7

build.sbt

@@ -46,7 +46,7 @@ def scalaStyleSettings: Seq[Def.Setting[_]] = scalaStyleCompile ++ scalaStyleTes
 // settings that should be inherited by all projects
 lazy val sharedSettings = Seq(
   organization := "vinyldns",
-  scalaVersion := "2.12.6",
+  scalaVersion := "2.12.7",
   organizationName := "Comcast Cable Communications Management, LLC",
   startYear := Some(2018),
   licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")),

modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala

@@ -93,7 +93,7 @@ trait MembershipRoute extends Directives {
             }
           }
       } ~
-      path("groups" / Segment) { id =>
+      path("groups" / Segment) { _ =>
         put {
           monitor("Endpoint.updateGroup") {
             entity(as[UpdateGroupInput]) { input =>

modules/api/src/main/scala/vinyldns/api/route/RecordSetRouting.scala

@@ -104,7 +104,7 @@ trait RecordSetRoute extends Directives {
           }
       } ~
       path("zones" / Segment / "recordsets" / Segment / "changes" / Segment) {
-        (zoneId, rsId, changeId) =>
+        (zoneId, _, changeId) =>
           get {
             monitor("Endpoint.getRecordSetChange") {
               execute(recordSetService.getRecordSetChange(zoneId, changeId, authPrincipal)) {

modules/api/src/main/scala/vinyldns/api/route/VinylDNSDirectives.scala

@@ -35,19 +35,16 @@ trait VinylDNSDirectives extends Directives {
 
   val vinylDNSAuthenticator: VinylDNSAuthenticator
 
-  def authenticate: Directive1[AuthPrincipal] =
-    extractExecutionContext.flatMap { implicit ec ⇒
-      extractRequestContext.flatMap { ctx =>
-        extractStrictEntity(10.seconds).flatMap { strictEntity =>
-          onSuccess(
-            vinylDNSAuthenticator.authenticate(ctx, strictEntity.data.utf8String).unsafeToFuture())
-            .flatMap {
-              case Right(authPrincipal) ⇒
-                provide(authPrincipal)
-              case Left(e) ⇒
-                complete(handleAuthenticateError(e))
-            }
-        }
+  def authenticate: Directive1[AuthPrincipal] = extractRequestContext.flatMap { ctx =>
+      extractStrictEntity(10.seconds).flatMap { strictEntity =>
+        onSuccess(
+          vinylDNSAuthenticator.authenticate(ctx, strictEntity.data.utf8String).unsafeToFuture())
+          .flatMap {
+            case Right(authPrincipal) ⇒
+              provide(authPrincipal)
+            case Left(e) ⇒
+              complete(handleAuthenticateError(e))
+          }
       }
     }
 

modules/api/src/main/scala/vinyldns/api/route/ZoneRouting.scala

@@ -76,7 +76,7 @@ trait ZoneRoute extends Directives {
           complete(StatusCodes.Accepted, chg)
         }
       } ~
-      (put & path("zones" / Segment) & monitor("Endpoint.updateZone")) { id =>
+      (put & path("zones" / Segment) & monitor("Endpoint.updateZone")) { _ =>
         entity(as[Zone]) { zone =>
           execute(zoneService.updateZone(encrypt(zone), authPrincipal)) { chg =>
             complete(StatusCodes.Accepted, chg)

modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala

@@ -153,12 +153,7 @@ class BatchChangeServiceSpec
       IO.pure(dbZones.filter(zn => zoneNames.contains(zn.name)))
 
     override def getZonesByFilters(zoneNames: Set[String]): IO[Set[Zone]] = {
-      val zones = for {
-        zoneInDB <- dbZones
-        zoneMatch <- zoneNames
-        if zoneInDB.name.endsWith(zoneMatch)
-      } yield zoneInDB
-      IO.pure(zones)
+      IO.pure(dbZones.filter(z => zoneNames.exists(z.name.endsWith)))
     }
   }
 

modules/core/src/test/scala/vinyldns/core/crypto/JavaCryptoSpec.scala

@@ -48,7 +48,7 @@ class JavaCryptoSpec extends WordSpec with Matchers {
     }
 
     "be thread safe" in {
-      (1 to 100).par.foreach { i =>
+      (1 to 100).par.foreach { _ =>
         val e = unencryptedString
         val h = javaCrypto.encrypt(e)
         val r = javaCrypto.decrypt(h)

modules/core/src/test/scala/vinyldns/core/route/MonitorSpec.scala

@@ -75,7 +75,7 @@ class MonitorSpec
     "record successful futures" in {
       val traitTest = new TestMonitoring
 
-      whenReady(traitTest.doSomethingGood().unsafeToFuture()) { result =>
+      whenReady(traitTest.doSomethingGood().unsafeToFuture()) { _ =>
         verify(mockLatency).+=(anyLong)
         verifyZeroInteractions(mockErrors)
       }

modules/dynamodb/src/test/scala/vinyldns/dynamodb/repository/DynamoDBRecordChangeRepositorySpec.scala

@@ -49,7 +49,7 @@ class DynamoDBRecordChangeRepositorySpec
 
   "DynamoDBRecordChangeRepository.save" should {
     "group change sets into batch writes with 25 in each" in {
-      val changes = for (i <- 1 to 52) yield pendingCreateAAAA
+      val changes = for (_ <- 1 to 52) yield pendingCreateAAAA
       val changeSet = ChangeSet(changes)
 
       val batchCaptor = ArgumentCaptor.forClass(classOf[Seq[WriteRequest]])
@@ -81,7 +81,7 @@ class DynamoDBRecordChangeRepositorySpec
     }
 
     "returns a future failure if the first batch fails" in {
-      val changes = for (i <- 0 to 52) yield pendingCreateAAAA
+      val changes = for (_ <- 0 to 52) yield pendingCreateAAAA
       val changeSet = ChangeSet(changes)
 
       val dynamoResponse = mock[BatchWriteItemResult]
@@ -100,7 +100,7 @@ class DynamoDBRecordChangeRepositorySpec
     }
 
     "returns a future failure if any batch fails" in {
-      val changes = for (i <- 0 to 52) yield pendingCreateAAAA
+      val changes = for (_ <- 0 to 52) yield pendingCreateAAAA
       val changeSet = ChangeSet(changes)
 
       val dynamoResponse = mock[BatchWriteItemResult]

modules/dynamodb/src/test/scala/vinyldns/dynamodb/repository/DynamoDBRecordSetRepositorySpec.scala

@@ -72,7 +72,7 @@ class DynamoDBRecordSetRepositorySpec
     }
 
     "group change sets into batch writes with 25 in each" in {
-      val changes = for (i <- 1 to 52) yield pendingCreateAAAA
+      val changes = for (_ <- 1 to 52) yield pendingCreateAAAA
       val batchCaptor = ArgumentCaptor.forClass(classOf[Seq[WriteRequest]])
       val dynamoResponse = mock[BatchWriteItemResult]
       val dynamoRequest = mock[BatchWriteItemRequest]
@@ -108,7 +108,7 @@ class DynamoDBRecordSetRepositorySpec
     }
 
     "returns a future failure if any batch fails" in {
-      val changes = for (i <- 0 to 52) yield pendingCreateAAAA
+      val changes = for (_ <- 0 to 52) yield pendingCreateAAAA
       val dynamoResponse = mock[BatchWriteItemResult]
       val unprocessed = mock[java.util.Map[String, AttributeValue]]
       doReturn(null).when(unprocessed).get(anyString())