Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion check-digit/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packageName in Docker := "check-digit"
Docker / packageName := "check-digit"

dockerExposedPorts := Vector(9091, 60080)

Expand Down
7 changes: 4 additions & 3 deletions check-digit/src/main/scala/hmda/uli/CheckDigitTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import akka.actor.ActorSystem
import akka.grpc.GrpcClientSettings
import akka.stream.Materializer
import hmda.grpc.services.{ CheckDigitServiceClient, ValidUliRequest }
import scala.concurrent.ExecutionContextExecutor

import scala.concurrent.Await
import scala.concurrent.duration._
Expand All @@ -13,9 +14,9 @@ import scala.concurrent.duration._

object CheckDigitTest extends App {

implicit val clientSystem = ActorSystem("CheckDigitClient")
implicit val mat = Materializer(clientSystem)
implicit val ec = clientSystem.dispatcher
implicit val clientSystem: ActorSystem = ActorSystem("CheckDigitClient")
implicit val mat: Materializer = Materializer(clientSystem)
implicit val ec: ExecutionContextExecutor = clientSystem.dispatcher

val client = CheckDigitServiceClient(GrpcClientSettings.connectToServiceAt("127.0.0.1", 60080).withTls(false))

Expand Down
4 changes: 2 additions & 2 deletions check-digit/src/main/scala/hmda/uli/api/http/ULIHttpApi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private class ULIHttpApi(log: Logger) {
respondWithHeader(RawHeader("Cache-Control", "no-cache")) {
fileUpload("file") {
case (_, byteSource) =>
val headerSource = Source.fromIterator(() => List("loanId,checkDigit,uli\n").toIterator)
val headerSource = Source.fromIterator(() => List("loanId,checkDigit,uli\n").iterator)
val checkDigit = processLoanIdFile(byteSource)
.map(l => l.toCSV)
.map(l => l + "\n")
Expand Down Expand Up @@ -155,7 +155,7 @@ private class ULIHttpApi(log: Logger) {
fileUpload("file") {
case (_, byteSource) =>
val headerSource =
Source.fromIterator(() => List("uli,isValid\n").toIterator)
Source.fromIterator(() => List("uli,isValid\n").iterator)
val validated = processUliFile(byteSource)
.map(u => u.toCSV)
.map(l => l + "\n")
Expand Down
5 changes: 3 additions & 2 deletions common/src/main/scala/hmda/auth/KeycloakTokenVerifier.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ class KeycloakTokenVerifier extends TokenVerifier {
def verifyToken(token: String): Try[AccessToken] = {
val tokenVerifier = keycloakTV.create(token, classOf[AccessToken])
Try {
tokenVerifier.withDefaultChecks().realmUrl(realmUrl)
tokenVerifier.publicKey(publicKey).verify().getToken
tokenVerifier.withChecks(new keycloakTV.RealmUrlCheck(realmUrl))
tokenVerifier.publicKey(publicKey).verify().getToken()
}

}
}
// $COVERAGE-ON$
2 changes: 1 addition & 1 deletion common/src/main/scala/hmda/auth/OAuth2Authorization.scala
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class OAuth2Authorization(logger: Logger, tokenVerifier: TokenVerifier) {
def authorizeVerifiedToken(): Directive1[VerifiedToken] =
withAccessLog
.&(handleRejections(authRejectionHandler))
.&(passToken)
.&(passToken())

def logAccessLog(uri: Uri, token: () => Option[VerifiedToken])(request: HttpRequest)(r: RouteResult): Unit = {
val result = r match {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import io.circe.syntax._

object Institution {

implicit val headers = List("activityYear|lei|agency|institutionType|institutionId2017|taxId|rssd|emailDomains|respondent|parent|assets|otherLenderCode|topHolder|hmdaFiler|quarterlyFiler|quarterlyFilerHasFiledQ1|quarterlyFilerHasFiledQ2|quarterlyFilerHasFiledQ3|notes\n")
implicit val headers: List[String] = List("activityYear|lei|agency|institutionType|institutionId2017|taxId|rssd|emailDomains|respondent|parent|assets|otherLenderCode|topHolder|hmdaFiler|quarterlyFiler|quarterlyFilerHasFiledQ1|quarterlyFilerHasFiledQ2|quarterlyFilerHasFiledQ3|notes\n")

def empty: Institution = Institution(
activityYear = 2018,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import hmda.model.filing.lar.LoanApplicationRegister
import hmda.model.filing.lar.enums._
import hmda.model.census.CountyLoanLimit
import hmda.census.records.OverallLoanLimit
import hmda.model.filing.EditDescriptionLookup.config
// $COVERAGE-OFF$
case class LoanLimitInfo(
totalUnits: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package hmda.parser.institution

import hmda.model.institution._
import hmda.util.CSVConsolidator.{listDeDupeToList, stringDeDupeToList}
import hmda.util.CSVConsolidator.stringDeDupeToList
import io.chrisdavenport.cormorant.parser.CSVLikeParser
import io.chrisdavenport.cormorant

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/scala/hmda/publication/KafkaUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import hmda.messages.institution.InstitutionEvents.InstitutionKafkaEvent
import hmda.serialization.kafka.InstitutionKafkaEventsSerializer
import org.apache.kafka.clients.CommonClientConfigs
import org.apache.kafka.clients.producer.{ProducerRecord, Producer => KafkaProducer}
import org.apache.kafka.common.config.{SslConfigs,SaslConfigs}
import org.apache.kafka.common.config.SaslConfigs
//import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.serialization.StringSerializer

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class InstitutionCommandsSerializer(system: ExtendedActorSystem) extends Seriali
deleteInstitutionToProtobuf(cmd, resolver).toByteArray
case cmd: AddFiling =>
addFilingToProtobuf(cmd, resolver).toByteArray
case _
case _ =>
throw new IllegalArgumentException(s"Cannot serialize object of type [${o.getClass.getName}]")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class InstitutionEventsSerializer extends SerializerWithStringManifest {
institutionNotExistsToProtobuf(evt).toByteArray
case evt: FilingAdded =>
filingAddedToProtobuf(evt).toByteArray
case _
case _ =>
throw new IllegalArgumentException(s"Cannot serialize object of type [${o.getClass.getName}]")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SubmissionEventsSerializer extends SerializerWithStringManifest {
submissionModifiedToProtobuf(evt).toByteArray
case evt: SubmissionNotExists =>
submissionNotExistsToProtobuf(evt).toByteArray
case _
case _ =>
throw new IllegalArgumentException(s"Cannot serialize object of type [${o.getClass.getName}]")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ object SubmissionProtobufConverter {
def submissionIdFromProtobuf(submissionIdMessage: SubmissionIdMessage): SubmissionId =
SubmissionId(
submissionIdMessage.lei,
parsePeriod(submissionIdMessage.period).right.get,
parsePeriod(submissionIdMessage.period).toOption.get,
submissionIdMessage.sequenceNumber
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/scala/hmda/util/CSVConsolidator.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package hmda.util

import cats.implicits._
import com.typesafe.config.ConfigFactory
import hmda.model.filing.submission.SubmissionId

object CSVConsolidator {

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/scala/hmda/util/FieldNullifyUtility.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package hmda.util

import hmda.model.institution.{Institution, InstitutionType, Parent, Respondent, TopHolder}
import hmda.model.institution.{Institution, InstitutionType, Parent, TopHolder}


object FieldNullifyUtility {
Expand Down
Loading
Loading