Skip to content

Commit

Permalink
Merge pull request #1075 from jmarin/compiler-warnings
Browse files Browse the repository at this point in the history
Compiler warnings
  • Loading branch information
schbetsy committed Aug 3, 2017
2 parents b611285 + 25e2a3d commit 88afb49
Show file tree
Hide file tree
Showing 85 changed files with 47 additions and 179 deletions.
5 changes: 2 additions & 3 deletions api/src/main/scala/hmda/api/HmdaFilingApi.scala
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package hmda.api

import akka.actor.{ ActorRef, ActorSystem, Props }
import akka.actor.{ ActorSystem, Props }
import akka.event.Logging
import akka.http.scaladsl.Http
import akka.http.scaladsl.Http.ServerBinding
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server.Route
import akka.pattern.{ ask, pipe }
import akka.pattern.pipe
import akka.stream.ActorMaterializer
import akka.util.Timeout
import com.typesafe.config.ConfigFactory
import hmda.api.http.{ BaseHttpApi, HmdaCustomDirectives, InstitutionsHttpApi, LarHttpApi }
import hmda.api.HmdaConfig._
import scala.concurrent.duration._
Expand Down
1 change: 0 additions & 1 deletion api/src/main/scala/hmda/api/HmdaPlatform.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import hmda.query.projections.filing.HmdaFilingDBProjection._
import hmda.validation.ValidationStats
import hmda.api.HmdaConfig._
import hmda.query.HmdaProjectionQuery
import hmda.query.projections.institutions.InstitutionCassandraProjection

object HmdaPlatform {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import hmda.model.edits.EditMetaDataLookup
import hmda.model.fi.{ HmdaFileRow, HmdaRowError }
import hmda.model.validation.ValidationError
import hmda.persistence.processing.HmdaFileValidator.HmdaFileValidationState
import hmda.validation.engine._
import spray.json.{ JsNumber, JsObject, JsString, JsValue }

trait ValidationErrorConverter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import hmda.persistence.HmdaSupervisor.{ FindFilings, FindSubmissions }
import hmda.persistence.institutions.FilingPersistence.GetFilingByPeriod
import hmda.persistence.institutions.{ FilingPersistence, SubmissionPersistence }

import scala.concurrent.{ ExecutionContext, Future }
import scala.concurrent.Future
import scala.util.{ Failure, Success }

trait FilingPaths extends InstitutionProtocol with ApiErrorProtocol with HmdaCustomDirectives {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import hmda.persistence.model.HmdaSupervisorActor.FindActorByName
import hmda.query.view.institutions.InstitutionView
import hmda.query.view.institutions.InstitutionView.{ GetInstitutionById, GetInstitutionsById }

import scala.concurrent.{ ExecutionContext, Future }
import scala.concurrent.Future
import scala.util.{ Failure, Success }

trait InstitutionPaths extends InstitutionProtocol with ApiErrorProtocol with HmdaCustomDirectives {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import hmda.persistence.processing.SubmissionManager
import hmda.query.HmdaQuerySupervisor.FindHmdaFilingView
import hmda.query.projections.filing.HmdaFilingDBProjection.{ CreateSchema, DeleteLars }

import scala.concurrent.ExecutionContext
import scala.util.{ Failure, Success }

trait UploadPaths extends InstitutionProtocol with ApiErrorProtocol with SubmissionProtocol with HmdaCustomDirectives {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,11 @@ import akka.util.Timeout
import hmda.api.http.{ HmdaCustomDirectives, ValidationErrorConverter }
import hmda.api.model._
import hmda.api.protocol.processing.{ ApiErrorProtocol, EditResultsProtocol, InstitutionProtocol }
import hmda.model.fi.{ Filing, Submission, SubmissionId }
import hmda.model.validation.Macro
import hmda.persistence.messages.CommonMessages.GetState
import hmda.persistence.HmdaSupervisor.{ FindFilings, FindProcessingActor, FindSubmissions }
import hmda.model.fi.{ Filing, Submission }
import hmda.persistence.HmdaSupervisor.{ FindFilings, FindSubmissions }
import hmda.persistence.institutions.FilingPersistence.GetFilingByPeriod
import hmda.persistence.institutions.SubmissionPersistence.{ CreateSubmission, GetLatestSubmission }
import hmda.persistence.institutions.{ FilingPersistence, SubmissionPersistence }
import hmda.persistence.processing.HmdaFileValidator
import hmda.persistence.processing.HmdaFileValidator.HmdaFileValidationState

import scala.concurrent.ExecutionContext
import scala.util.{ Failure, Success }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import akka.actor.{ ActorRef, ActorSelection, ActorSystem }
import akka.event.LoggingAdapter
import akka.http.scaladsl.marshalling.ToResponseMarshallable
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
import akka.http.scaladsl.model.Uri
import akka.http.scaladsl.server.Directives._
import akka.pattern.ask
import akka.stream.ActorMaterializer
Expand All @@ -20,8 +19,6 @@ import hmda.persistence.institutions.SubmissionPersistence
import hmda.persistence.institutions.SubmissionPersistence.GetSubmissionById
import hmda.persistence.processing.{ HmdaFileValidator, SubmissionManager }
import hmda.persistence.processing.HmdaFileValidator._
import hmda.validation.engine._

import scala.concurrent.{ ExecutionContext, Future }
import scala.util.matching.Regex
import scala.util.{ Failure, Success }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ trait SubmissionIrsPaths
}
}

private def getMsa(instId: String, period: String, seqNr: Int)(implicit ec: ExecutionContext): Future[Seq[Msa]] = {
private def getMsa(instId: String, period: String, seqNr: Int): Future[Seq[Msa]] = {
val validationStats = system.actorSelection("/user/validation-stats")
val submissionId = SubmissionId(instId, period, seqNr)
(validationStats ? FindIrsStats(submissionId)).mapTo[Seq[Msa]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import hmda.persistence.processing.HmdaFileParser.{ GetStatePaginated, Paginated
import hmda.persistence.processing.HmdaFileParser

import scala.concurrent.ExecutionContext
import scala.util.{ Failure, Success, Try }
import scala.util.{ Failure, Success }

trait SubmissionParseErrorsPaths
extends ParserResultsProtocol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package hmda.api.http.public

import akka.actor.{ ActorRef, ActorSystem }
import akka.http.scaladsl.marshalling.ToResponseMarshallable
import akka.http.scaladsl.model.{ HttpEntity, HttpResponse, StatusCodes }
import akka.http.scaladsl.model.StatusCodes
import akka.pattern.ask
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import hmda.api.http.HmdaCustomDirectives
import hmda.query.DbConfiguration._
import hmda.query.repository.filing.FilingComponent

import scala.concurrent.ExecutionContext

trait PublicLarHttpApi extends HmdaCustomDirectives with FilingComponent {

implicit val system: ActorSystem
Expand Down
5 changes: 1 addition & 4 deletions api/src/test/scala/hmda/api/RequestHeaderUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import akka.http.scaladsl.marshalling.ToEntityMarshaller
import akka.http.scaladsl.model.{ HttpMethods, HttpRequest }
import hmda.api.headers.{ HmdaInstitutionsHeader, HmdaUsernameHeader }

import scala.concurrent.ExecutionContext
import scala.concurrent.ExecutionContext.Implicits.global

trait RequestHeaderUtils extends RequestBuilding {
import HttpMethods._

Expand All @@ -17,7 +14,7 @@ trait RequestHeaderUtils extends RequestBuilding {
.addHeader(institutionsHeader)
}

def postWithCfpbHeaders[T](path: String, content: T)(implicit m: ToEntityMarshaller[T]) = {
def postWithCfpbHeaders[T, ec: EC](path: String, content: T)(implicit m: ToEntityMarshaller[T]) = {
new RequestBuilder(POST).apply(path, content)
.addHeader(usernameHeader)
.addHeader(institutionsHeader)
Expand Down
1 change: 0 additions & 1 deletion api/src/test/scala/hmda/api/http/InstitutionHttpSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package hmda.api.http

import java.io.File

import akka.actor.ActorSystem
import akka.event.{ LoggingAdapter, NoLogging }
import akka.http.scaladsl.model.{ ContentTypes, HttpEntity, Multipart }
import akka.http.scaladsl.testkit.ScalatestRouteTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ class InstitutionsAuthSpec extends InstitutionHttpApiSpec {
val parent = Parent("123", 123, "test parent", "", "")
val topHolder = TopHolder(-1, "", "", "", "")
val caseInsensitiveBank = Institution("1", CFPB, 2017, MBS, cra = true, Set(), Set(), respondent = respondent, hmdaFilerFlag = true, parent = parent, assets = 0, otherLenderCode = 0, topHolder = topHolder)
val querySupervisor = system.actorSelection("/user/query-supervisor")
val fInstitutionsActor = (supervisor ? FindActorByName(InstitutionPersistence.name)).mapTo[ActorRef]

val fInstitutions: Future[Unit] = for {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ class InstitutionAdminHttpApiSpec
}
}
"return conflict when trying to upload existing entity" in {
val id = newInstitution.id
val jsonRequest = ByteString(newInstitution.toJson.toString)
val postRequest = createRequest(jsonRequest, HttpMethods.POST)
postRequest ~> institutionAdminRoutes ~> check {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import akka.http.scaladsl.model.Uri.Path
import hmda.api.http.InstitutionHttpApiSpec
import hmda.api.model.{ ErrorResponse, FilingDetail }
import hmda.model.fi.{ Filing, NotStarted }
import hmda.persistence.demo.DemoData

class FilingPathsSpec extends InstitutionHttpApiSpec with FilingPaths {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import akka.http.scaladsl.server.MethodRejection
import hmda.api.http.InstitutionHttpApiSpec
import hmda.api.model._
import hmda.model.fi._
import hmda.persistence.demo.DemoData

class SubmissionBasePathsSpec extends InstitutionHttpApiSpec {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import hmda.api.http.InstitutionHttpApiSpec
import hmda.api.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary }
import hmda.model.fi.SubmissionId
import hmda.persistence.HmdaSupervisor.FindProcessingActor
import hmda.persistence.processing.{ HmdaFileValidator, HmdaRawFile, SubmissionManager }
import hmda.persistence.processing.{ HmdaFileValidator, SubmissionManager }
import org.scalatest.BeforeAndAfterAll
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
import hmda.api.model.ErrorResponse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
import akka.http.scaladsl.model.Uri.Path
import hmda.api.model.ErrorResponse
import hmda.api.model.public.InstitutionSearchResults
import hmda.model.institution.{ Institution, InstitutionGenerators }
import hmda.model.institution.InstitutionGenerators
import hmda.persistence.messages.events.institutions.InstitutionEvents.InstitutionCreated
import hmda.persistence.processing.HmdaQuery.EventWithSeqNr
import org.scalatest.{ BeforeAndAfterAll, MustMatchers, WordSpec }
Expand Down
6 changes: 0 additions & 6 deletions census/src/main/scala/hmda/census/model/CbsaLookup.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,10 @@ object CbsaLookup extends CbsaResourceUtils {
val values = parse(line, '\\', ',', '"').getOrElse(List())
val cbsaCode = values(0)
val metroDivCode = values(1)
val csaCode = values(2)
val cbsaTitle = values(3)
val metroOrMicro = values(4)
val metroDivTitle = values(5)
val csaTitle = values(6)
val countyName = values(7)
val stateName = values(8)
val stateFips = values(9)
val countyFips = values(10)
val centralOutlying = values(11)
Cbsa(
cbsaCode,
metroDivCode,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object MsaIncomeLookup extends ResourceUtils {
val lines = resourceLines("/msa17inc.csv")
lines.tail.map { line =>
val values = parse(line, '\\', ',', '"').getOrElse(List())
val fipsCode = values(0).toInt
val fipsCode = values.head.toInt
val name = values(1)
val income = values(2).toInt
MsaIncome(fipsCode, name, income)
Expand Down
13 changes: 0 additions & 13 deletions census/src/main/scala/hmda/census/model/PrPopLookup.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,10 @@ object PrPopLookup extends CbsaResourceUtils {
val lines = csvLines("/PRM-EST00INT-AGESEX-5YR.csv")

lines.drop(1).map { values =>
val sumlev = values(0)
val countyFips = leftPad(3, values(1))
val municipioName = values(2)
val sex = values(3)
val ageGrp = values(4)
val popBase2000 = values(5).toInt
val popEst2000 = values(6).toInt
val popEst2001 = values(7).toInt
val popEst2002 = values(8).toInt
val popEst2003 = values(9).toInt
val popEst2004 = values(10).toInt
val popEst2005 = values(11).toInt
val popEst2006 = values(12).toInt
val popEst2007 = values(13).toInt
val popEst2008 = values(14).toInt
val popEst2009 = values(15).toInt
val popEst2010 = values(16).toInt

PrPopulation(
"72" + countyFips,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ object StateAbrvLookup extends CbsaResourceUtils {
val stateFips = values(0)
val stateAbrv = values(1)
val stateName = values(2)
val stateEns = values(3)

StateAbrv(
stateFips,
Expand Down
16 changes: 0 additions & 16 deletions census/src/main/scala/hmda/census/model/StatesPopLookup.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,9 @@ object StatesPopLookup extends CbsaResourceUtils {
val values: Seq[Population] = {
val lines = csvLines("/2000-2010_pop_estimates.csv")
lines.drop(1).map { values =>
val sumlev = values(0)
val region = values(1)
val division = values(2)
val stateFips = leftPad(2, values(3))
val countyFips = leftPad(3, values(4))
val stateName = values(5)
val cityname = values(6)
val popBase2000 = values(7).toInt
val popEst2000 = values(9).toInt
val popEst2001 = values(10).toInt
val popEst2002 = values(11).toInt
val popEst2003 = values(12).toInt
val popEst2004 = values(13).toInt
val popEst2005 = values(14).toInt
val popEst2006 = values(15).toInt
val popEst2007 = values(16).toInt
val popEst2008 = values(17).toInt
val popEst2009 = values(18).toInt
val popEst2010 = values(19).toInt

StatesPopulation(
stateFips + countyFips,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ object EditMetaDataLookup extends ResourceUtils {

lines.drop(1).map { line =>
val values = parse(line, '\\', ',', '"').getOrElse(List())
val category = values(0)
val editType = values(1)
val editNumber = values(2)
val editDescription = values(3)
val userFriendlyEditDescription = values(4)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package hmda.model.institution

import enumeratum.values.{ IntEnum, IntEnumEntry }
import DepositoryType._
import ExternalIdType._
import enumeratum.EnumEntry

/**
* An institution's regulating federal agency.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,4 @@ class LarDatParserSpec extends PropSpec with MustMatchers with PropertyChecks wi
applicant.income mustBe "9000"
}

private def padLeftWithZero(s: String, n: Int): String = {
String.format("%1$" + n + "s", s).replace(' ', '0')
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import akka.NotUsed
import akka.actor.ActorSystem
import akka.persistence.query.PersistenceQuery
import akka.persistence.query.scaladsl._
import akka.stream.ActorMaterializer
import akka.stream.scaladsl.Source
import hmda.persistence.PersistenceConfig._
import hmda.persistence.messages.CommonMessages._
Expand All @@ -21,17 +20,17 @@ object HmdaQuery {
PersistenceQuery(system).readJournalFor[RJ](journalId)
}

def events(persistenceId: String)(implicit system: ActorSystem, materializer: ActorMaterializer): Source[Event, NotUsed] = {
def events(persistenceId: String)(implicit system: ActorSystem): Source[Event, NotUsed] = {
readJournal(system).currentEventsByPersistenceId(persistenceId, 0L, Long.MaxValue)
.map(_.event.asInstanceOf[Event])
}

def liveEvents(persistenceId: String)(implicit system: ActorSystem, materializer: ActorMaterializer): Source[Event, NotUsed] = {
def liveEvents(persistenceId: String)(implicit system: ActorSystem): Source[Event, NotUsed] = {
readJournal(system).eventsByPersistenceId(persistenceId, 0L, Long.MaxValue)
.map(_.event.asInstanceOf[Event])
}

def eventsWithSequenceNumber(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long)(implicit system: ActorSystem, materializer: ActorMaterializer): Source[EventWithSeqNr, NotUsed] = {
def eventsWithSequenceNumber(persistenceId: String, fromSequenceNr: Long, toSequenceNr: Long)(implicit system: ActorSystem): Source[EventWithSeqNr, NotUsed] = {
readJournal(system)
.eventsByPersistenceId(persistenceId, fromSequenceNr, toSequenceNr)
.map(x => EventWithSeqNr(x.sequenceNr, x.event.asInstanceOf[Event]))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package hmda.persistence

import akka.actor.{ ActorRef, ActorSystem, Props, Terminated }
import akka.actor.{ ActorRef, ActorSystem, Props }
import hmda.model.fi.SubmissionId
import hmda.persistence.institutions.{ FilingPersistence, InstitutionPersistence, SubmissionPersistence }
import hmda.persistence.model.HmdaSupervisorActor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package hmda.persistence.institutions

import akka.testkit.{ EventFilter, TestProbe }
import hmda.model.institution.Agency.CFPB
import hmda.model.institution.ExternalIdType.{ FederalTaxId, RssdId, UndeterminedExternalId }
import hmda.model.institution.InstitutionType.Bank
import hmda.model.institution._
import akka.testkit.TestProbe
import hmda.persistence.demo.DemoData
import hmda.persistence.institutions.InstitutionPersistence._
import hmda.persistence.messages.CommonMessages.GetState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package hmda.persistence.institutions

import akka.testkit.{ EventFilter, TestProbe }
import akka.testkit.TestProbe
import hmda.model.fi._
import hmda.persistence.messages.CommonMessages.GetState
import hmda.persistence.demo.DemoData
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package hmda.persistence.processing

import akka.actor.{ ActorRef, ActorSystem }
import akka.actor.ActorRef
import akka.testkit.TestProbe
import com.typesafe.config.ConfigFactory
import hmda.model.fi.SubmissionId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import hmda.persistence.messages.CommonMessages.GetState
import hmda.persistence.messages.events.processing.CommonHmdaValidatorEvents.LarValidated
import hmda.persistence.model.ActorSpec
import hmda.persistence.processing.HmdaFiling._
import hmda.persistence.processing.HmdaFileValidator._

class HmdaFilingSpec extends ActorSpec with LarGenerators {

Expand Down
Loading

0 comments on commit 88afb49

Please sign in to comment.