diff --git a/api-model/src/main/scala/hmda.apiModel/model/EditResults.scala b/api-model/src/main/scala/hmda/api/model/EditResults.scala similarity index 97% rename from api-model/src/main/scala/hmda.apiModel/model/EditResults.scala rename to api-model/src/main/scala/hmda/api/model/EditResults.scala index 608f38c6dc..7d023804f5 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/EditResults.scala +++ b/api-model/src/main/scala/hmda/api/model/EditResults.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.model.fi.SubmissionStatus import spray.json.JsObject diff --git a/api-model/src/main/scala/hmda.apiModel/model/ErrorResponse.scala b/api-model/src/main/scala/hmda/api/model/ErrorResponse.scala similarity index 81% rename from api-model/src/main/scala/hmda.apiModel/model/ErrorResponse.scala rename to api-model/src/main/scala/hmda/api/model/ErrorResponse.scala index 84eeaa300b..79d81c64ab 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/ErrorResponse.scala +++ b/api-model/src/main/scala/hmda/api/model/ErrorResponse.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import akka.http.scaladsl.model.Uri.Path diff --git a/api-model/src/main/scala/hmda.apiModel/model/FilingDetail.scala b/api-model/src/main/scala/hmda/api/model/FilingDetail.scala similarity index 81% rename from api-model/src/main/scala/hmda.apiModel/model/FilingDetail.scala rename to api-model/src/main/scala/hmda/api/model/FilingDetail.scala index d1aaee2cb3..4009fd6538 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/FilingDetail.scala +++ b/api-model/src/main/scala/hmda/api/model/FilingDetail.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.model.fi.{ Filing, Submission } diff --git a/api-model/src/main/scala/hmda.apiModel/model/Filings.scala b/api-model/src/main/scala/hmda/api/model/Filings.scala similarity index 71% rename from api-model/src/main/scala/hmda.apiModel/model/Filings.scala rename to api-model/src/main/scala/hmda/api/model/Filings.scala index 97081582f2..a27059111b 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/Filings.scala +++ b/api-model/src/main/scala/hmda/api/model/Filings.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.model.fi.Filing diff --git a/api-model/src/main/scala/hmda.apiModel/model/InstitutionDetail.scala b/api-model/src/main/scala/hmda/api/model/InstitutionDetail.scala similarity index 81% rename from api-model/src/main/scala/hmda.apiModel/model/InstitutionDetail.scala rename to api-model/src/main/scala/hmda/api/model/InstitutionDetail.scala index 297b9dab02..13f38576c2 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/InstitutionDetail.scala +++ b/api-model/src/main/scala/hmda/api/model/InstitutionDetail.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.model.fi.Filing diff --git a/api-model/src/main/scala/hmda.apiModel/model/InstitutionWrapper.scala b/api-model/src/main/scala/hmda/api/model/InstitutionWrapper.scala similarity index 69% rename from api-model/src/main/scala/hmda.apiModel/model/InstitutionWrapper.scala rename to api-model/src/main/scala/hmda/api/model/InstitutionWrapper.scala index 061486787e..44e4449a92 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/InstitutionWrapper.scala +++ b/api-model/src/main/scala/hmda/api/model/InstitutionWrapper.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model case class InstitutionWrapper( id: String, diff --git a/api-model/src/main/scala/hmda.apiModel/model/Institutions.scala b/api-model/src/main/scala/hmda/api/model/Institutions.scala similarity index 69% rename from api-model/src/main/scala/hmda.apiModel/model/Institutions.scala rename to api-model/src/main/scala/hmda/api/model/Institutions.scala index 3cc3c65781..c2df8d53a6 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/Institutions.scala +++ b/api-model/src/main/scala/hmda/api/model/Institutions.scala @@ -1,3 +1,3 @@ -package hmda.apiModel.model +package hmda.api.model case class Institutions(institutions: Set[InstitutionWrapper]) diff --git a/api-model/src/main/scala/hmda.apiModel/model/IrsResponse.scala b/api-model/src/main/scala/hmda/api/model/IrsResponse.scala similarity index 97% rename from api-model/src/main/scala/hmda.apiModel/model/IrsResponse.scala rename to api-model/src/main/scala/hmda/api/model/IrsResponse.scala index 2787354400..3da34e36d7 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/IrsResponse.scala +++ b/api-model/src/main/scala/hmda/api/model/IrsResponse.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.census.model.{ MsaSummary, Msa } import hmda.persistence.PaginatedResource diff --git a/api-model/src/main/scala/hmda.apiModel/model/ModifiedLoanApplicationRegister.scala b/api-model/src/main/scala/hmda/api/model/ModifiedLoanApplicationRegister.scala similarity index 93% rename from api-model/src/main/scala/hmda.apiModel/model/ModifiedLoanApplicationRegister.scala rename to api-model/src/main/scala/hmda/api/model/ModifiedLoanApplicationRegister.scala index 6ff283ab30..f7d1a5eea7 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/ModifiedLoanApplicationRegister.scala +++ b/api-model/src/main/scala/hmda/api/model/ModifiedLoanApplicationRegister.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.model.fi.lar.{ Applicant, Denial, Geography, Loan } diff --git a/api-model/src/main/scala/hmda.apiModel/model/PaginatedResponse.scala b/api-model/src/main/scala/hmda/api/model/PaginatedResponse.scala similarity index 98% rename from api-model/src/main/scala/hmda.apiModel/model/PaginatedResponse.scala rename to api-model/src/main/scala/hmda/api/model/PaginatedResponse.scala index cc7ef613cd..b8e961b50a 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/PaginatedResponse.scala +++ b/api-model/src/main/scala/hmda/api/model/PaginatedResponse.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.persistence.WithPagination diff --git a/api-model/src/main/scala/hmda.apiModel/model/ParsingErrorSummary.scala b/api-model/src/main/scala/hmda/api/model/ParsingErrorSummary.scala similarity index 95% rename from api-model/src/main/scala/hmda.apiModel/model/ParsingErrorSummary.scala rename to api-model/src/main/scala/hmda/api/model/ParsingErrorSummary.scala index 98d6a3c2b3..dced478839 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/ParsingErrorSummary.scala +++ b/api-model/src/main/scala/hmda/api/model/ParsingErrorSummary.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.model.fi.SubmissionStatus import hmda.model.parser.LarParsingError diff --git a/api-model/src/main/scala/hmda.apiModel/model/Receipt.scala b/api-model/src/main/scala/hmda/api/model/Receipt.scala similarity index 80% rename from api-model/src/main/scala/hmda.apiModel/model/Receipt.scala rename to api-model/src/main/scala/hmda/api/model/Receipt.scala index 81a74fe041..05bf39a55e 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/Receipt.scala +++ b/api-model/src/main/scala/hmda/api/model/Receipt.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.model.fi.SubmissionStatus diff --git a/api-model/src/main/scala/hmda.apiModel/model/SingleValidationErrorResult.scala b/api-model/src/main/scala/hmda/api/model/SingleValidationErrorResult.scala similarity index 88% rename from api-model/src/main/scala/hmda.apiModel/model/SingleValidationErrorResult.scala rename to api-model/src/main/scala/hmda/api/model/SingleValidationErrorResult.scala index c66d07eedd..ab7fcceaa4 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/SingleValidationErrorResult.scala +++ b/api-model/src/main/scala/hmda/api/model/SingleValidationErrorResult.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.validation.engine.ValidationErrorsSummary diff --git a/api-model/src/main/scala/hmda.apiModel/model/Status.scala b/api-model/src/main/scala/hmda/api/model/Status.scala similarity index 74% rename from api-model/src/main/scala/hmda.apiModel/model/Status.scala rename to api-model/src/main/scala/hmda/api/model/Status.scala index 38112a2b25..1917aa8d42 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/Status.scala +++ b/api-model/src/main/scala/hmda/api/model/Status.scala @@ -1,3 +1,3 @@ -package hmda.apiModel.model +package hmda.api.model case class Status(status: String, service: String, time: String, host: String) diff --git a/api-model/src/main/scala/hmda.apiModel/model/Submissions.scala b/api-model/src/main/scala/hmda/api/model/Submissions.scala similarity index 75% rename from api-model/src/main/scala/hmda.apiModel/model/Submissions.scala rename to api-model/src/main/scala/hmda/api/model/Submissions.scala index 86a17fd1a8..7d5c36249a 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/Submissions.scala +++ b/api-model/src/main/scala/hmda/api/model/Submissions.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model +package hmda.api.model import hmda.model.fi.Submission diff --git a/api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/ContactSummary.scala b/api-model/src/main/scala/hmda/api/model/institutions/submissions/ContactSummary.scala similarity index 59% rename from api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/ContactSummary.scala rename to api-model/src/main/scala/hmda/api/model/institutions/submissions/ContactSummary.scala index a3a59859c3..01fb320dda 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/ContactSummary.scala +++ b/api-model/src/main/scala/hmda/api/model/institutions/submissions/ContactSummary.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model.institutions.submissions +package hmda.api.model.institutions.submissions case class ContactSummary( name: String, diff --git a/api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/FileSummary.scala b/api-model/src/main/scala/hmda/api/model/institutions/submissions/FileSummary.scala similarity index 58% rename from api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/FileSummary.scala rename to api-model/src/main/scala/hmda/api/model/institutions/submissions/FileSummary.scala index 0a59306e7a..697031bf72 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/FileSummary.scala +++ b/api-model/src/main/scala/hmda/api/model/institutions/submissions/FileSummary.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model.institutions.submissions +package hmda.api.model.institutions.submissions case class FileSummary( name: String, diff --git a/api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/RespondentSummary.scala b/api-model/src/main/scala/hmda/api/model/institutions/submissions/RespondentSummary.scala similarity index 70% rename from api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/RespondentSummary.scala rename to api-model/src/main/scala/hmda/api/model/institutions/submissions/RespondentSummary.scala index 594a626cc0..dea69169c4 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/RespondentSummary.scala +++ b/api-model/src/main/scala/hmda/api/model/institutions/submissions/RespondentSummary.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model.institutions.submissions +package hmda.api.model.institutions.submissions case class RespondentSummary( name: String, diff --git a/api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/SubmissionSummary.scala b/api-model/src/main/scala/hmda/api/model/institutions/submissions/SubmissionSummary.scala similarity index 61% rename from api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/SubmissionSummary.scala rename to api-model/src/main/scala/hmda/api/model/institutions/submissions/SubmissionSummary.scala index c347859fb3..28aa87413d 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/institutions/submissions/SubmissionSummary.scala +++ b/api-model/src/main/scala/hmda/api/model/institutions/submissions/SubmissionSummary.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model.institutions.submissions +package hmda.api.model.institutions.submissions case class SubmissionSummary( respondent: RespondentSummary, diff --git a/api-model/src/main/scala/hmda.apiModel/model/public/InstitutionSearch.scala b/api-model/src/main/scala/hmda/api/model/public/InstitutionSearch.scala similarity index 87% rename from api-model/src/main/scala/hmda.apiModel/model/public/InstitutionSearch.scala rename to api-model/src/main/scala/hmda/api/model/public/InstitutionSearch.scala index 506ebce5b8..16c586666c 100644 --- a/api-model/src/main/scala/hmda.apiModel/model/public/InstitutionSearch.scala +++ b/api-model/src/main/scala/hmda/api/model/public/InstitutionSearch.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.model.public +package hmda.api.model.public import hmda.model.institution.ExternalId diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/HmdaApiProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/HmdaApiProtocol.scala similarity index 69% rename from api-model/src/main/scala/hmda.apiModel/protocol/HmdaApiProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/HmdaApiProtocol.scala index d0c38d6f93..5a256838c8 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/HmdaApiProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/HmdaApiProtocol.scala @@ -1,7 +1,7 @@ -package hmda.apiModel.protocol +package hmda.api.protocol import spray.json.DefaultJsonProtocol -import hmda.apiModel.model.Status +import hmda.api.model.Status trait HmdaApiProtocol extends DefaultJsonProtocol { implicit val statusFormat = jsonFormat4(Status.apply) diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/admin/WriteInstitutionProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/admin/WriteInstitutionProtocol.scala similarity index 98% rename from api-model/src/main/scala/hmda.apiModel/protocol/admin/WriteInstitutionProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/admin/WriteInstitutionProtocol.scala index 3f189ff443..ce0c757769 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/admin/WriteInstitutionProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/admin/WriteInstitutionProtocol.scala @@ -1,8 +1,8 @@ -package hmda.apiModel.protocol.admin +package hmda.api.protocol.admin import java.util.NoSuchElementException -import hmda.apiModel.protocol.processing.InstitutionProtocol +import hmda.api.protocol.processing.InstitutionProtocol import hmda.model.institution.Agency._ import hmda.model.institution._ import spray.json._ diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/fi/lar/LarProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/fi/lar/LarProtocol.scala similarity index 91% rename from api-model/src/main/scala/hmda.apiModel/protocol/fi/lar/LarProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/fi/lar/LarProtocol.scala index 008a09ca7e..0589860d2d 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/fi/lar/LarProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/fi/lar/LarProtocol.scala @@ -1,4 +1,4 @@ -package hmda.apiModel.protocol.fi.lar +package hmda.api.protocol.fi.lar import hmda.model.fi.lar._ import spray.json.DefaultJsonProtocol diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/processing/ApiErrorProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/processing/ApiErrorProtocol.scala similarity index 87% rename from api-model/src/main/scala/hmda.apiModel/protocol/processing/ApiErrorProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/processing/ApiErrorProtocol.scala index 66cd97de8b..17992dc2ee 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/processing/ApiErrorProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/processing/ApiErrorProtocol.scala @@ -1,7 +1,7 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing import akka.http.scaladsl.model.Uri.Path -import hmda.apiModel.model.ErrorResponse +import hmda.api.model.ErrorResponse import spray.json.{ DefaultJsonProtocol, DeserializationException, JsString, JsValue, RootJsonFormat } trait ApiErrorProtocol extends DefaultJsonProtocol { diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/processing/EditResultsProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/processing/EditResultsProtocol.scala similarity index 93% rename from api-model/src/main/scala/hmda.apiModel/protocol/processing/EditResultsProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/processing/EditResultsProtocol.scala index 23ef0b79cc..bad3dacc38 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/processing/EditResultsProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/processing/EditResultsProtocol.scala @@ -1,7 +1,7 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.protocol.validation.ValidationResultProtocol -import hmda.apiModel.model._ +import hmda.api.protocol.validation.ValidationResultProtocol +import hmda.api.model._ import spray.json._ trait EditResultsProtocol extends ValidationResultProtocol with SubmissionProtocol with PaginationProtocol { diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/processing/FilingProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/processing/FilingProtocol.scala similarity index 91% rename from api-model/src/main/scala/hmda.apiModel/protocol/processing/FilingProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/processing/FilingProtocol.scala index e2eddf8075..ae531bd4a1 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/processing/FilingProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/processing/FilingProtocol.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.{ FilingDetail, Filings } +import hmda.api.model.{ FilingDetail, Filings } import hmda.model.fi._ import spray.json.{ DefaultJsonProtocol, DeserializationException, JsNumber, JsObject, JsString, JsValue, RootJsonFormat } diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/processing/InstitutionProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/processing/InstitutionProtocol.scala similarity index 73% rename from api-model/src/main/scala/hmda.apiModel/protocol/processing/InstitutionProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/processing/InstitutionProtocol.scala index d746b0bb0a..2102902b8d 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/processing/InstitutionProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/processing/InstitutionProtocol.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.{ InstitutionDetail, InstitutionWrapper, Institutions } +import hmda.api.model.{ InstitutionDetail, InstitutionWrapper, Institutions } import spray.json.DefaultJsonProtocol trait InstitutionProtocol extends DefaultJsonProtocol with FilingProtocol { diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/processing/MsaProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/processing/MsaProtocol.scala similarity index 92% rename from api-model/src/main/scala/hmda.apiModel/protocol/processing/MsaProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/processing/MsaProtocol.scala index e1f8d62598..4dde386b19 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/processing/MsaProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/processing/MsaProtocol.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.{ IrsResponse, PaginatedResponse } +import hmda.api.model.{ IrsResponse, PaginatedResponse } import hmda.census.model.{ Msa, MsaSummary } import spray.json._ diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/processing/PaginationProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/processing/PaginationProtocol.scala similarity index 67% rename from api-model/src/main/scala/hmda.apiModel/protocol/processing/PaginationProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/processing/PaginationProtocol.scala index ebc60f46ed..65ce919714 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/processing/PaginationProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/processing/PaginationProtocol.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.PaginationLinks +import hmda.api.model.PaginationLinks import spray.json.DefaultJsonProtocol trait PaginationProtocol extends DefaultJsonProtocol { diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/processing/ParserResultsProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/processing/ParserResultsProtocol.scala similarity index 93% rename from api-model/src/main/scala/hmda.apiModel/protocol/processing/ParserResultsProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/processing/ParserResultsProtocol.scala index 312357afb4..b29c0bc40b 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/processing/ParserResultsProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/processing/ParserResultsProtocol.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.{ PaginatedResponse, ParsingErrorSummary } +import hmda.api.model.{ PaginatedResponse, ParsingErrorSummary } import hmda.model.fi.SubmissionStatus import hmda.model.parser.LarParsingError import spray.json._ diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/processing/SubmissionProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/processing/SubmissionProtocol.scala similarity index 86% rename from api-model/src/main/scala/hmda.apiModel/protocol/processing/SubmissionProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/processing/SubmissionProtocol.scala index 815e0882dd..b4d7e1202c 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/processing/SubmissionProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/processing/SubmissionProtocol.scala @@ -1,9 +1,9 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing import hmda.model.fi._ -import hmda.apiModel.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary } -import hmda.apiModel.model.{ Receipt, Submissions } -import hmda.apiModel.protocol.validation.ValidationResultProtocol +import hmda.api.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary } +import hmda.api.model.{ Receipt, Submissions } +import hmda.api.protocol.validation.ValidationResultProtocol import spray.json.{ DeserializationException, JsNumber, JsObject, JsString, JsValue, RootJsonFormat } trait SubmissionProtocol extends ValidationResultProtocol { diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/public/InstitutionSearchProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/public/InstitutionSearchProtocol.scala similarity index 65% rename from api-model/src/main/scala/hmda.apiModel/protocol/public/InstitutionSearchProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/public/InstitutionSearchProtocol.scala index b9ac111605..c66e4ca04f 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/public/InstitutionSearchProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/public/InstitutionSearchProtocol.scala @@ -1,7 +1,7 @@ -package hmda.apiModel.protocol.public +package hmda.api.protocol.public -import hmda.apiModel.model.public.{ InstitutionSearch, InstitutionSearchResults } -import hmda.apiModel.protocol.admin.WriteInstitutionProtocol +import hmda.api.model.public.{ InstitutionSearch, InstitutionSearchResults } +import hmda.api.protocol.admin.WriteInstitutionProtocol import hmda.model.institution.ExternalId trait InstitutionSearchProtocol extends WriteInstitutionProtocol { diff --git a/api-model/src/main/scala/hmda.apiModel/protocol/validation/ValidationResultProtocol.scala b/api-model/src/main/scala/hmda/api/protocol/validation/ValidationResultProtocol.scala similarity index 96% rename from api-model/src/main/scala/hmda.apiModel/protocol/validation/ValidationResultProtocol.scala rename to api-model/src/main/scala/hmda/api/protocol/validation/ValidationResultProtocol.scala index a463f1b634..d389b5f10a 100644 --- a/api-model/src/main/scala/hmda.apiModel/protocol/validation/ValidationResultProtocol.scala +++ b/api-model/src/main/scala/hmda/api/protocol/validation/ValidationResultProtocol.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.validation +package hmda.api.protocol.validation -import hmda.apiModel.model.SingleValidationErrorResult +import hmda.api.model.SingleValidationErrorResult import hmda.model.validation._ import hmda.validation.engine._ import spray.json.{ DefaultJsonProtocol, DeserializationException, JsString, JsValue, RootJsonFormat } diff --git a/api-model/src/test/scala/hmda.apiModel/model/ModelGenerators.scala b/api-model/src/test/scala/hmda/api/model/ModelGenerators.scala similarity index 94% rename from api-model/src/test/scala/hmda.apiModel/model/ModelGenerators.scala rename to api-model/src/test/scala/hmda/api/model/ModelGenerators.scala index 3d8475a867..54fa872385 100644 --- a/api-model/src/test/scala/hmda.apiModel/model/ModelGenerators.scala +++ b/api-model/src/test/scala/hmda/api/model/ModelGenerators.scala @@ -1,10 +1,10 @@ -package hmda.apiModel.model +package hmda.api.model import java.util.Calendar import akka.http.scaladsl.model.Uri.Path -import hmda.apiModel.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary } -import hmda.apiModel.model.public.InstitutionSearch +import hmda.api.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary } +import hmda.api.model.public.InstitutionSearch import org.scalacheck.Gen import spray.json.{ JsObject, JsString } import hmda.model.institution.InstitutionGenerators._ diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/HmdaApiProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/HmdaApiProtocolSpec.scala similarity index 80% rename from api-model/src/test/scala/hmda.apiModel/protocol/HmdaApiProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/HmdaApiProtocolSpec.scala index da228c94f3..4d51e11ba4 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/HmdaApiProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/HmdaApiProtocolSpec.scala @@ -1,8 +1,8 @@ -package hmda.apiModel.protocol +package hmda.api.protocol import org.scalatest._ import prop._ -import hmda.apiModel.model.{ ModelGenerators, Status } +import hmda.api.model.{ ModelGenerators, Status } import spray.json._ class HmdaApiProtocolSpec extends PropSpec with PropertyChecks with MustMatchers with ModelGenerators with HmdaApiProtocol { diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/admin/WriteInstitutionProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/admin/WriteInstitutionProtocolSpec.scala similarity index 97% rename from api-model/src/test/scala/hmda.apiModel/protocol/admin/WriteInstitutionProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/admin/WriteInstitutionProtocolSpec.scala index ccb6ca5382..b40c4fa049 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/admin/WriteInstitutionProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/admin/WriteInstitutionProtocolSpec.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.admin +package hmda.api.protocol.admin -import hmda.apiModel.model.ModelGenerators +import hmda.api.model.ModelGenerators import hmda.model.institution.InstitutionGenerators._ import hmda.model.institution.Institution import org.scalatest.{ MustMatchers, PropSpec } diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/processing/ApiErrorProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/processing/ApiErrorProtocolSpec.scala similarity index 79% rename from api-model/src/test/scala/hmda.apiModel/protocol/processing/ApiErrorProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/processing/ApiErrorProtocolSpec.scala index 7f6986d865..42206668cb 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/processing/ApiErrorProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/processing/ApiErrorProtocolSpec.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.{ ErrorResponse, ModelGenerators } +import hmda.api.model.{ ErrorResponse, ModelGenerators } import org.scalatest.{ MustMatchers, PropSpec } import org.scalatest.prop.PropertyChecks import spray.json._ diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/processing/EditResultsProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/processing/EditResultsProtocolSpec.scala similarity index 96% rename from api-model/src/test/scala/hmda.apiModel/protocol/processing/EditResultsProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/processing/EditResultsProtocolSpec.scala index b5bc5c242c..dc70ab1932 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/processing/EditResultsProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/processing/EditResultsProtocolSpec.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model._ +import hmda.api.model._ import hmda.model.fi.ValidatedWithErrors import org.scalatest.{ MustMatchers, PropSpec } import org.scalatest.prop.PropertyChecks diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/processing/FilingProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/processing/FilingProtocolSpec.scala similarity index 91% rename from api-model/src/test/scala/hmda.apiModel/protocol/processing/FilingProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/processing/FilingProtocolSpec.scala index d862ff8733..872ea12d9b 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/processing/FilingProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/processing/FilingProtocolSpec.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.{ FilingDetail, ModelGenerators } +import hmda.api.model.{ FilingDetail, ModelGenerators } import hmda.model.fi.Filing import org.scalatest.prop.PropertyChecks import org.scalatest.{ MustMatchers, PropSpec } diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/processing/InstitutionProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/processing/InstitutionProtocolSpec.scala similarity index 84% rename from api-model/src/test/scala/hmda.apiModel/protocol/processing/InstitutionProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/processing/InstitutionProtocolSpec.scala index 8769c6d9cf..cf8943da68 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/processing/InstitutionProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/processing/InstitutionProtocolSpec.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.{ InstitutionWrapper, ModelGenerators } +import hmda.api.model.{ InstitutionWrapper, ModelGenerators } import hmda.model.institution.InstitutionGenerators._ import org.scalatest.prop.PropertyChecks import org.scalatest.{ MustMatchers, PropSpec } diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/processing/MsaProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/processing/MsaProtocolSpec.scala similarity index 96% rename from api-model/src/test/scala/hmda.apiModel/protocol/processing/MsaProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/processing/MsaProtocolSpec.scala index a1b56f1dd1..191c5da384 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/processing/MsaProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/processing/MsaProtocolSpec.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.IrsResponse +import hmda.api.model.IrsResponse import hmda.census.model.{ Msa, MsaSummary } import org.scalatest.{ MustMatchers, PropSpec } import org.scalatest.prop.PropertyChecks diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/processing/ParserResultsProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/processing/ParserResultsProtocolSpec.scala similarity index 94% rename from api-model/src/test/scala/hmda.apiModel/protocol/processing/ParserResultsProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/processing/ParserResultsProtocolSpec.scala index fa4c81b480..af8ba6b560 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/processing/ParserResultsProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/processing/ParserResultsProtocolSpec.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.{ ModelGenerators, ParsingErrorSummary } +import hmda.api.model.{ ModelGenerators, ParsingErrorSummary } import hmda.model.fi.ParsedWithErrors import hmda.model.parser.LarParsingError import org.scalatest.{ MustMatchers, PropSpec } diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/processing/SubmissionProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/processing/SubmissionProtocolSpec.scala similarity index 93% rename from api-model/src/test/scala/hmda.apiModel/protocol/processing/SubmissionProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/processing/SubmissionProtocolSpec.scala index 2bf29c7483..0151d1829f 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/processing/SubmissionProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/processing/SubmissionProtocolSpec.scala @@ -1,7 +1,7 @@ -package hmda.apiModel.protocol.processing +package hmda.api.protocol.processing -import hmda.apiModel.model.ModelGenerators -import hmda.apiModel.model.institutions.submissions.SubmissionSummary +import hmda.api.model.ModelGenerators +import hmda.api.model.institutions.submissions.SubmissionSummary import hmda.model.fi.Submission import org.scalatest.{ MustMatchers, PropSpec } import org.scalatest.prop.PropertyChecks diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/public/InstitutionSearchProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/public/InstitutionSearchProtocolSpec.scala similarity index 83% rename from api-model/src/test/scala/hmda.apiModel/protocol/public/InstitutionSearchProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/public/InstitutionSearchProtocolSpec.scala index 8641cbdc89..0aa8d57cd6 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/public/InstitutionSearchProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/public/InstitutionSearchProtocolSpec.scala @@ -1,7 +1,7 @@ -package hmda.apiModel.protocol.public +package hmda.api.protocol.public -import hmda.apiModel.model.ModelGenerators -import hmda.apiModel.model.public.InstitutionSearch +import hmda.api.model.ModelGenerators +import hmda.api.model.public.InstitutionSearch import org.scalatest.{ MustMatchers, PropSpec } import org.scalatest.prop.PropertyChecks import spray.json._ diff --git a/api-model/src/test/scala/hmda.apiModel/protocol/validation/ValidationResultProtocolSpec.scala b/api-model/src/test/scala/hmda/api/protocol/validation/ValidationResultProtocolSpec.scala similarity index 92% rename from api-model/src/test/scala/hmda.apiModel/protocol/validation/ValidationResultProtocolSpec.scala rename to api-model/src/test/scala/hmda/api/protocol/validation/ValidationResultProtocolSpec.scala index 33628a483e..91bf2573fe 100644 --- a/api-model/src/test/scala/hmda.apiModel/protocol/validation/ValidationResultProtocolSpec.scala +++ b/api-model/src/test/scala/hmda/api/protocol/validation/ValidationResultProtocolSpec.scala @@ -1,6 +1,6 @@ -package hmda.apiModel.protocol.validation +package hmda.api.protocol.validation -import hmda.apiModel.model.ModelGenerators +import hmda.api.model.ModelGenerators import hmda.model.validation.ValidationErrorGenerators._ import hmda.model.validation._ import org.scalatest.{ MustMatchers, PropSpec } diff --git a/api/src/main/scala/hmda/api/http/BaseHttpApi.scala b/api/src/main/scala/hmda/api/http/BaseHttpApi.scala index e88c592738..af16921c76 100644 --- a/api/src/main/scala/hmda/api/http/BaseHttpApi.scala +++ b/api/src/main/scala/hmda/api/http/BaseHttpApi.scala @@ -7,9 +7,9 @@ import akka.event.LoggingAdapter import akka.http.scaladsl.marshalling.ToResponseMarshallable import akka.http.scaladsl.server.Directives._ import akka.stream.ActorMaterializer -import hmda.apiModel.model.Status +import hmda.api.model.Status import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ -import hmda.apiModel.protocol.HmdaApiProtocol +import hmda.api.protocol.HmdaApiProtocol import spray.json._ trait BaseHttpApi extends HmdaApiProtocol with HmdaCustomDirectives { diff --git a/api/src/main/scala/hmda/api/http/HmdaCustomDirectives.scala b/api/src/main/scala/hmda/api/http/HmdaCustomDirectives.scala index c1248aecc4..90067099ad 100644 --- a/api/src/main/scala/hmda/api/http/HmdaCustomDirectives.scala +++ b/api/src/main/scala/hmda/api/http/HmdaCustomDirectives.scala @@ -5,8 +5,8 @@ import akka.http.scaladsl.server.Directives._ import akka.event.LoggingAdapter import akka.http.scaladsl.marshalling.ToResponseMarshallable import akka.http.scaladsl.model.{ StatusCodes, Uri } -import hmda.apiModel.model.ErrorResponse -import hmda.apiModel.protocol.processing.ApiErrorProtocol +import hmda.api.model.ErrorResponse +import hmda.api.protocol.processing.ApiErrorProtocol import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ trait HmdaCustomDirectives extends ApiErrorProtocol { diff --git a/api/src/main/scala/hmda/api/http/InstitutionsHttpApi.scala b/api/src/main/scala/hmda/api/http/InstitutionsHttpApi.scala index f72172155b..451ea5fbd2 100644 --- a/api/src/main/scala/hmda/api/http/InstitutionsHttpApi.scala +++ b/api/src/main/scala/hmda/api/http/InstitutionsHttpApi.scala @@ -7,7 +7,7 @@ import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.http.institutions.submissions._ import hmda.api.http.institutions.{ FilingPaths, InstitutionPaths, UploadPaths } -import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol } +import hmda.api.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol } import scala.concurrent.ExecutionContext diff --git a/api/src/main/scala/hmda/api/http/LarHttpApi.scala b/api/src/main/scala/hmda/api/http/LarHttpApi.scala index adbed056a3..c11064d0d0 100644 --- a/api/src/main/scala/hmda/api/http/LarHttpApi.scala +++ b/api/src/main/scala/hmda/api/http/LarHttpApi.scala @@ -9,10 +9,10 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.stream.ActorMaterializer import akka.util.Timeout import akka.pattern.ask -import hmda.apiModel.model.SingleValidationErrorResult -import hmda.apiModel.protocol.fi.lar.LarProtocol -import hmda.apiModel.protocol.processing.ParserResultsProtocol -import hmda.apiModel.protocol.validation.ValidationResultProtocol +import hmda.api.model.SingleValidationErrorResult +import hmda.api.protocol.fi.lar.LarProtocol +import hmda.api.protocol.processing.ParserResultsProtocol +import hmda.api.protocol.validation.ValidationResultProtocol import hmda.model.fi.lar.LoanApplicationRegister import hmda.model.validation.{ Quality, Syntactical, ValidationErrorType, Validity } import hmda.parser.fi.lar.LarCsvParser diff --git a/api/src/main/scala/hmda/api/http/ValidationErrorConverter.scala b/api/src/main/scala/hmda/api/http/ValidationErrorConverter.scala index 8b75d27c51..a0718680a5 100644 --- a/api/src/main/scala/hmda/api/http/ValidationErrorConverter.scala +++ b/api/src/main/scala/hmda/api/http/ValidationErrorConverter.scala @@ -1,6 +1,6 @@ package hmda.api.http -import hmda.apiModel.model._ +import hmda.api.model._ import hmda.census.model.CbsaLookup import hmda.model.edits.EditMetaDataLookup import hmda.model.fi.{ HmdaFileRow, HmdaRowError } diff --git a/api/src/main/scala/hmda/api/http/admin/InstitutionAdminHttpApi.scala b/api/src/main/scala/hmda/api/http/admin/InstitutionAdminHttpApi.scala index 886fb6b4c4..702a03ae39 100644 --- a/api/src/main/scala/hmda/api/http/admin/InstitutionAdminHttpApi.scala +++ b/api/src/main/scala/hmda/api/http/admin/InstitutionAdminHttpApi.scala @@ -10,8 +10,8 @@ import akka.pattern.ask import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.http.HmdaCustomDirectives -import hmda.apiModel.protocol.admin.WriteInstitutionProtocol -import hmda.apiModel.protocol.processing.ApiErrorProtocol +import hmda.api.protocol.admin.WriteInstitutionProtocol +import hmda.api.protocol.processing.ApiErrorProtocol import hmda.model.fi.Filing import hmda.model.institution.Institution import hmda.persistence.HmdaSupervisor.FindFilings diff --git a/api/src/main/scala/hmda/api/http/institutions/FilingPaths.scala b/api/src/main/scala/hmda/api/http/institutions/FilingPaths.scala index 3c2f163d86..6bcddd77c7 100644 --- a/api/src/main/scala/hmda/api/http/institutions/FilingPaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/FilingPaths.scala @@ -11,8 +11,8 @@ import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.EC import hmda.api.http.HmdaCustomDirectives -import hmda.apiModel.model.{ ErrorResponse, FilingDetail } -import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol } +import hmda.api.model.{ ErrorResponse, FilingDetail } +import hmda.api.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol } import hmda.model.fi.{ Filing, Submission } import hmda.persistence.messages.CommonMessages.GetState import hmda.persistence.HmdaSupervisor.{ FindFilings, FindSubmissions } diff --git a/api/src/main/scala/hmda/api/http/institutions/InstitutionPaths.scala b/api/src/main/scala/hmda/api/http/institutions/InstitutionPaths.scala index f3c63fe870..8847160e48 100644 --- a/api/src/main/scala/hmda/api/http/institutions/InstitutionPaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/InstitutionPaths.scala @@ -11,8 +11,8 @@ import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.EC import hmda.api.http.HmdaCustomDirectives -import hmda.apiModel.model._ -import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol } +import hmda.api.model._ +import hmda.api.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol } import hmda.model.fi.Filing import hmda.model.institution.Institution import hmda.persistence.HmdaSupervisor.FindFilings diff --git a/api/src/main/scala/hmda/api/http/institutions/UploadPaths.scala b/api/src/main/scala/hmda/api/http/institutions/UploadPaths.scala index 436fad28d8..3964d01813 100644 --- a/api/src/main/scala/hmda/api/http/institutions/UploadPaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/UploadPaths.scala @@ -17,7 +17,7 @@ import akka.util.{ ByteString, Timeout } import hmda.api.EC import hmda.api.http.HmdaCustomDirectives import hmda.persistence.messages.CommonMessages._ -import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol, SubmissionProtocol } +import hmda.api.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol, SubmissionProtocol } import hmda.model.fi.{ Created, Failed, Submission, SubmissionId, Uploaded } import hmda.persistence.HmdaSupervisor.{ FindProcessingActor, FindSubmissions } import hmda.persistence.institutions.SubmissionPersistence diff --git a/api/src/main/scala/hmda/api/http/institutions/submissions/RequestVerificationUtils.scala b/api/src/main/scala/hmda/api/http/institutions/submissions/RequestVerificationUtils.scala index 0caff86913..46b9a4e7cb 100644 --- a/api/src/main/scala/hmda/api/http/institutions/submissions/RequestVerificationUtils.scala +++ b/api/src/main/scala/hmda/api/http/institutions/submissions/RequestVerificationUtils.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.server.Directives._ import akka.pattern.ask import akka.util.Timeout import hmda.api.http.HmdaCustomDirectives -import hmda.apiModel.model.ErrorResponse +import hmda.api.model.ErrorResponse import hmda.model.fi.{ Filing, Submission, SubmissionId } import hmda.model.institution.Institution import hmda.persistence.HmdaSupervisor.{ FindFilings, FindSubmissions } diff --git a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionBasePaths.scala b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionBasePaths.scala index ab85dbf81d..124b8bccbd 100644 --- a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionBasePaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionBasePaths.scala @@ -10,8 +10,8 @@ import akka.pattern.ask import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.http.{ HmdaCustomDirectives, ValidationErrorConverter } -import hmda.apiModel.model._ -import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, EditResultsProtocol, InstitutionProtocol } +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 diff --git a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionEditPaths.scala b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionEditPaths.scala index 61de33df4f..56ca8d6a2e 100644 --- a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionEditPaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionEditPaths.scala @@ -10,8 +10,8 @@ import akka.pattern.ask import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.http.{ HmdaCustomDirectives, ValidationErrorConverter } -import hmda.apiModel.model._ -import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, EditResultsProtocol, InstitutionProtocol } +import hmda.api.model._ +import hmda.api.protocol.processing.{ ApiErrorProtocol, EditResultsProtocol, InstitutionProtocol } import hmda.model.fi.{ Submission, SubmissionId, SubmissionStatus } import hmda.model.validation.{ Macro, Quality, ValidationErrorType } import hmda.persistence.messages.CommonMessages.GetState diff --git a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionIrsPaths.scala b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionIrsPaths.scala index 570a5ead75..b3173d7429 100644 --- a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionIrsPaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionIrsPaths.scala @@ -8,8 +8,8 @@ import akka.stream.ActorMaterializer import akka.util.Timeout import akka.pattern.ask import hmda.api.http.HmdaCustomDirectives -import hmda.apiModel.model.{ Irs, IrsResponse } -import hmda.apiModel.protocol.processing.MsaProtocol +import hmda.api.model.{ Irs, IrsResponse } +import hmda.api.protocol.processing.MsaProtocol import hmda.census.model.Msa import hmda.model.fi.SubmissionId import hmda.query.repository.filing.FilingComponent diff --git a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionParseErrorsPaths.scala b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionParseErrorsPaths.scala index cfbc067a1d..c13754510d 100644 --- a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionParseErrorsPaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionParseErrorsPaths.scala @@ -9,8 +9,8 @@ import akka.pattern.ask import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.http.HmdaCustomDirectives -import hmda.apiModel.model.ParsingErrorSummary -import hmda.apiModel.protocol.processing.ParserResultsProtocol +import hmda.api.model.ParsingErrorSummary +import hmda.api.protocol.processing.ParserResultsProtocol import hmda.model.fi.{ Submission, SubmissionId } import hmda.persistence.HmdaSupervisor.{ FindProcessingActor, FindSubmissions } import hmda.persistence.institutions.SubmissionPersistence diff --git a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionSignPaths.scala b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionSignPaths.scala index 2c839401dd..065107b12c 100644 --- a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionSignPaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionSignPaths.scala @@ -11,8 +11,8 @@ import akka.http.scaladsl.server.Directives._ import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.http.{ HmdaCustomDirectives, ValidationErrorConverter } -import hmda.apiModel.model._ -import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, EditResultsProtocol, InstitutionProtocol, SubmissionProtocol } +import hmda.api.model._ +import hmda.api.protocol.processing.{ ApiErrorProtocol, EditResultsProtocol, InstitutionProtocol, SubmissionProtocol } import hmda.model.fi.{ Submission, SubmissionId } import hmda.persistence.HmdaSupervisor.{ FindProcessingActor, FindSubmissions } import hmda.persistence.institutions.SubmissionPersistence diff --git a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPaths.scala b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPaths.scala index cc299452be..b73ddd26af 100644 --- a/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPaths.scala +++ b/api/src/main/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPaths.scala @@ -10,9 +10,9 @@ import akka.http.scaladsl.server.Directives._ import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.http.ValidationErrorConverter -import hmda.apiModel.model.ErrorResponse -import hmda.apiModel.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary } -import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, EditResultsProtocol, InstitutionProtocol, SubmissionProtocol } +import hmda.api.model.ErrorResponse +import hmda.api.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary } +import hmda.api.protocol.processing.{ ApiErrorProtocol, EditResultsProtocol, InstitutionProtocol, SubmissionProtocol } import hmda.model.fi.SubmissionId import hmda.model.fi.ts.TransmittalSheet import hmda.model.institution.Agency diff --git a/api/src/main/scala/hmda/api/http/public/InstitutionSearchPaths.scala b/api/src/main/scala/hmda/api/http/public/InstitutionSearchPaths.scala index 6d08ef26b2..a792266dc1 100644 --- a/api/src/main/scala/hmda/api/http/public/InstitutionSearchPaths.scala +++ b/api/src/main/scala/hmda/api/http/public/InstitutionSearchPaths.scala @@ -9,9 +9,9 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.stream.ActorMaterializer import akka.util.Timeout import hmda.api.http.HmdaCustomDirectives -import hmda.apiModel.model.ErrorResponse -import hmda.apiModel.model.public.{ InstitutionSearch, InstitutionSearchResults } -import hmda.apiModel.protocol.public.InstitutionSearchProtocol +import hmda.api.model.ErrorResponse +import hmda.api.model.public.{ InstitutionSearch, InstitutionSearchResults } +import hmda.api.protocol.public.InstitutionSearchProtocol import hmda.model.institution.Institution import hmda.query.view.institutions.InstitutionView.FindInstitutionByPeriodAndDomain diff --git a/api/src/test/scala/hmda/api/http/BaseHttpApiSpec.scala b/api/src/test/scala/hmda/api/http/BaseHttpApiSpec.scala index ef72f13b18..a66b5c08b8 100644 --- a/api/src/test/scala/hmda/api/http/BaseHttpApiSpec.scala +++ b/api/src/test/scala/hmda/api/http/BaseHttpApiSpec.scala @@ -5,7 +5,7 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.http.scaladsl.model.headers.{ HttpEncodings, `Accept-Encoding` } import akka.http.scaladsl.model.headers.HttpEncodings._ import akka.http.scaladsl.testkit.ScalatestRouteTest -import hmda.apiModel.model.Status +import hmda.api.model.Status import org.scalatest.{ MustMatchers, WordSpec } import scala.concurrent.ExecutionContext diff --git a/api/src/test/scala/hmda/api/http/LarHttpApiSpec.scala b/api/src/test/scala/hmda/api/http/LarHttpApiSpec.scala index 95c597b601..1e7a213e43 100644 --- a/api/src/test/scala/hmda/api/http/LarHttpApiSpec.scala +++ b/api/src/test/scala/hmda/api/http/LarHttpApiSpec.scala @@ -3,7 +3,7 @@ package hmda.api.http import akka.event.{ LoggingAdapter, NoLogging } import akka.http.javadsl.model.StatusCodes import akka.http.scaladsl.testkit.{ RouteTestTimeout, ScalatestRouteTest } -import hmda.apiModel.model.SingleValidationErrorResult +import hmda.api.model.SingleValidationErrorResult import hmda.model.fi.lar.LoanApplicationRegister import hmda.parser.fi.lar.LarCsvParser import hmda.validation.engine.ValidationErrorsSummary diff --git a/api/src/test/scala/hmda/api/http/ValidationErrorConverterSpec.scala b/api/src/test/scala/hmda/api/http/ValidationErrorConverterSpec.scala index 7d90378a90..40647fe6f0 100644 --- a/api/src/test/scala/hmda/api/http/ValidationErrorConverterSpec.scala +++ b/api/src/test/scala/hmda/api/http/ValidationErrorConverterSpec.scala @@ -1,6 +1,6 @@ package hmda.api.http -import hmda.apiModel.model._ +import hmda.api.model._ import hmda.model.fi.lar.LoanApplicationRegister import hmda.model.fi.ts.TransmittalSheet import hmda.model.util.FITestData._ diff --git a/api/src/test/scala/hmda/api/http/admin/InstitutionAdminHttpApiSpec.scala b/api/src/test/scala/hmda/api/http/admin/InstitutionAdminHttpApiSpec.scala index f0d0bec1f9..811f3e1e93 100644 --- a/api/src/test/scala/hmda/api/http/admin/InstitutionAdminHttpApiSpec.scala +++ b/api/src/test/scala/hmda/api/http/admin/InstitutionAdminHttpApiSpec.scala @@ -6,7 +6,7 @@ import akka.http.scaladsl.model.headers.HttpEncodings._ import akka.http.scaladsl.model._ import akka.http.scaladsl.testkit._ import akka.util.{ ByteString, Timeout } -import hmda.apiModel.model.{ ModelGenerators, Status } +import hmda.api.model.{ ModelGenerators, Status } import org.scalatest.{ BeforeAndAfterAll, MustMatchers, WordSpec } import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.http.scaladsl.server.MalformedRequestContentRejection diff --git a/api/src/test/scala/hmda/api/http/institutions/FilingPathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/FilingPathsSpec.scala index 7d48719e5a..950ae1a009 100644 --- a/api/src/test/scala/hmda/api/http/institutions/FilingPathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/FilingPathsSpec.scala @@ -4,7 +4,7 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.model.Uri.Path import hmda.api.http.InstitutionHttpApiSpec -import hmda.apiModel.model.{ ErrorResponse, FilingDetail } +import hmda.api.model.{ ErrorResponse, FilingDetail } import hmda.model.fi.{ Filing, NotStarted } import hmda.persistence.demo.DemoData diff --git a/api/src/test/scala/hmda/api/http/institutions/InstitutionsPathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/InstitutionsPathsSpec.scala index 678ef76cb0..f7b168e0fc 100644 --- a/api/src/test/scala/hmda/api/http/institutions/InstitutionsPathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/InstitutionsPathsSpec.scala @@ -5,7 +5,7 @@ import akka.http.scaladsl.model.headers.RawHeader import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.http.scaladsl.model.Uri.Path import hmda.api.http.InstitutionHttpApiSpec -import hmda.apiModel.model._ +import hmda.api.model._ import hmda.model.institution.Institution import hmda.persistence.demo.DemoData diff --git a/api/src/test/scala/hmda/api/http/institutions/UploadPathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/UploadPathsSpec.scala index 0838da5b86..f2948e7256 100644 --- a/api/src/test/scala/hmda/api/http/institutions/UploadPathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/UploadPathsSpec.scala @@ -6,7 +6,7 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.http.scaladsl.model.Uri.Path import akka.pattern.ask import hmda.api.http.InstitutionHttpApiAsyncSpec -import hmda.apiModel.protocol.processing.SubmissionProtocol +import hmda.api.protocol.processing.SubmissionProtocol import hmda.model.fi._ import hmda.persistence.HmdaSupervisor.FindSubmissions import hmda.persistence.institutions.SubmissionPersistence diff --git a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionBasePathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionBasePathsSpec.scala index a353c51506..f2d3b67e4b 100644 --- a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionBasePathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionBasePathsSpec.scala @@ -5,7 +5,7 @@ import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.model.Uri.Path import akka.http.scaladsl.server.MethodRejection import hmda.api.http.InstitutionHttpApiSpec -import hmda.apiModel.model._ +import hmda.api.model._ import hmda.model.fi._ import hmda.persistence.demo.DemoData diff --git a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionEditPathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionEditPathsSpec.scala index 63c92f03e1..e211376d14 100644 --- a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionEditPathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionEditPathsSpec.scala @@ -6,7 +6,7 @@ import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.server.Route import akka.pattern.ask import hmda.api.http.InstitutionHttpApiSpec -import hmda.apiModel.model.{ EditResult, _ } +import hmda.api.model.{ EditResult, _ } import hmda.model.fi._ import hmda.model.fi.lar.LarGenerators import hmda.model.fi.ts.{ TransmittalSheet, TsGenerators } diff --git a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionIrsPathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionIrsPathsSpec.scala index a632fb45c7..5dc083a692 100644 --- a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionIrsPathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionIrsPathsSpec.scala @@ -3,7 +3,7 @@ package hmda.api.http.institutions.submissions import akka.http.javadsl.model.StatusCodes import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import hmda.api.http.InstitutionHttpApiSpec -import hmda.apiModel.model.IrsResponse +import hmda.api.model.IrsResponse import hmda.census.model.Msa import hmda.model.fi.SubmissionId import hmda.persistence.model.MsaGenerators diff --git a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionParseErrorsPathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionParseErrorsPathsSpec.scala index 59e1a874b3..1473f51084 100644 --- a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionParseErrorsPathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionParseErrorsPathsSpec.scala @@ -5,7 +5,7 @@ import akka.actor.ActorRef import akka.pattern.ask import akka.http.scaladsl.model.StatusCodes import hmda.api.http.InstitutionHttpApiSpec -import hmda.apiModel.model.{ ErrorResponse, ParsingErrorSummary } +import hmda.api.model.{ ErrorResponse, ParsingErrorSummary } import hmda.model.fi._ import hmda.model.parser.LarParsingError import hmda.persistence.messages.CommonMessages.GetState diff --git a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSignPathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSignPathsSpec.scala index 07eb96782a..9363a9b92b 100644 --- a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSignPathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSignPathsSpec.scala @@ -4,7 +4,7 @@ import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.http.scaladsl.model.Uri.Path import hmda.api.http.InstitutionHttpApiAsyncSpec -import hmda.apiModel.model.{ ErrorResponse, Receipt } +import hmda.api.model.{ ErrorResponse, Receipt } import hmda.model.fi._ import spray.json.{ JsBoolean, JsObject } diff --git a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPathsSpec.scala b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPathsSpec.scala index 165cc8c34a..e89cb8efb4 100644 --- a/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPathsSpec.scala +++ b/api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPathsSpec.scala @@ -4,13 +4,13 @@ import akka.actor.ActorRef import akka.pattern.ask import akka.http.scaladsl.model.StatusCodes import hmda.api.http.InstitutionHttpApiSpec -import hmda.apiModel.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary } +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 org.scalatest.BeforeAndAfterAll import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ -import hmda.apiModel.model.ErrorResponse +import hmda.api.model.ErrorResponse import hmda.parser.fi.lar.LarCsvParser import scala.concurrent.Await diff --git a/api/src/test/scala/hmda/api/http/public/InstitutionSearchPathSpec.scala b/api/src/test/scala/hmda/api/http/public/InstitutionSearchPathSpec.scala index 4f016cf16b..32daab4518 100644 --- a/api/src/test/scala/hmda/api/http/public/InstitutionSearchPathSpec.scala +++ b/api/src/test/scala/hmda/api/http/public/InstitutionSearchPathSpec.scala @@ -8,8 +8,8 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest import akka.util.Timeout import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ import akka.http.scaladsl.model.Uri.Path -import hmda.apiModel.model.ErrorResponse -import hmda.apiModel.model.public.InstitutionSearchResults +import hmda.api.model.ErrorResponse +import hmda.api.model.public.InstitutionSearchResults import hmda.model.institution.{ Institution, InstitutionGenerators } import hmda.persistence.messages.events.institutions.InstitutionEvents.InstitutionCreated import hmda.persistence.processing.HmdaQuery.EventWithSeqNr diff --git a/panel/src/main/scala/hmda/panel/PanelCsvLoader.scala b/panel/src/main/scala/hmda/panel/PanelCsvLoader.scala index e93fa67ab7..4cecf50491 100644 --- a/panel/src/main/scala/hmda/panel/PanelCsvLoader.scala +++ b/panel/src/main/scala/hmda/panel/PanelCsvLoader.scala @@ -11,7 +11,7 @@ import akka.http.scaladsl.Http import akka.http.scaladsl.model.{ HttpEntity, _ } import akka.http.scaladsl.unmarshalling.Unmarshal import com.typesafe.config.ConfigFactory -import hmda.apiModel.protocol.admin.WriteInstitutionProtocol +import hmda.api.protocol.admin.WriteInstitutionProtocol import scala.concurrent.duration._ import hmda.parser.fi.InstitutionParser