From 6fdce76eaf6b25114b11725d728705b05d5da3da Mon Sep 17 00:00:00 2001 From: Bryce Willey Date: Thu, 18 Jun 2026 11:25:08 -0400 Subject: [PATCH] Moving classes and packages around So they make at least a little more sense than they do now. --- .../suffolk/litlab/efsp/db/LoginDatabase.java | 8 +- .../efsp/db/MessageSettingsDatabase.java | 4 +- .../suffolk/litlab/efsp/db/UserDatabase.java | 4 +- ...AddressDocassembleJacksonDeserializer.java | 2 +- ...cassembleToFilingInformationConverter.java | 2 +- ...lingDocDocassembleJacksonDeserializer.java | 16 +- ...rmationDocassembleJacksonDeserializer.java | 10 +- .../NameDocassembleDeserializer.java | 2 +- .../PersonDocassembleJacksonDeserializer.java | 2 +- .../ecfcodes/{tyler => }/CodeAndLocation.java | 4 +- .../litlab/efsp/ecfcodes/CodeDatabaseAPI.java | 96 ++++++++++++ .../efsp/ecfcodes/CodeDatabaseUtils.java | 38 +++++ .../litlab/efsp/ecfcodes/CodeDocIterator.java | 1 + .../ecf4 => ecfcodes}/CodesParser.java | 23 +-- .../ecfcodes/{tyler => }/NameAndCode.java | 2 +- .../litlab/efsp/model/FilingAttachment.java | 4 +- .../suffolk/litlab/efsp/model/FilingDoc.java | 4 +- .../litlab/efsp/model/FilingInformation.java | 8 +- .../litlab/efsp/model/OptionalService.java | 2 +- .../suffolk/litlab/efsp/model/PartyInfo.java | 2 +- .../litlab/efsp/server/EfspServer.java | 2 +- .../efsp/server/ecf4/EcfCaseTypeFactory.java | 8 +- .../ecf4/EcfCourtSpecificSerializer.java | 10 +- .../server/ecf4/Ecfv5CaseTypeFactory.java | 6 +- .../efsp/server/ecf4/PaymentFactory.java | 1 + .../{utils => logging}/MDCWrappers.java | 2 +- .../server/services/AdminUserService.java | 6 +- .../services/AuthenticationService.java | 2 +- .../efsp/server/services/CasesService.java | 8 +- .../services/CourtSchedulingService.java | 18 +-- .../efsp/server/services/EcfCodesService.java | 30 ++-- .../server/services/FilingReviewService.java | 6 +- .../FirmAttorneyAndServiceService.java | 6 +- .../services/MessageSettingsService.java | 2 +- .../efsp/server/services/PaymentsService.java | 4 +- .../{impl => api}/EfmFilingInterface.java | 4 +- .../tyler => services/impl}/Ecf4Filer.java | 23 ++- .../impl/EfmCheckableFilingInterface.java | 1 + .../setup/tyler/OasisEcfWsCallback.java | 8 +- .../setup/tyler/OasisEcfv5WsCallback.java | 5 +- .../server/setup/tyler/TylerModuleSetup.java | 11 +- .../utils/AuthenticateRequestInterceptor.java | 1 + .../ObservabilityHeadersInterceptor.java | 1 + .../utils/ObservabilityResetInterceptor.java | 1 + .../efsp/server/utils/ServiceHelpers.java | 2 +- .../efsp/server/utils/UpdateCodeVersions.java | 5 +- .../ecf4 => tyler}/TylerConstants.java | 2 +- .../ecfcodes}/CaseCategory.java | 2 +- .../tyler => tyler/ecfcodes}/CaseType.java | 2 +- .../ecfcodes}/CodeDatabase.java | 144 +++++++----------- .../ecfcodes}/CodeTableConstants.java | 23 +-- .../{ => tyler}/ecfcodes/CodeUpdater.java | 8 +- .../ecfcodes}/ComboCaseCodes.java | 2 +- .../ecfcodes}/CourtLocationInfo.java | 2 +- .../ecfcodes}/CrossReference.java | 2 +- .../ecfcodes}/DataFieldRow.java | 2 +- .../tyler => tyler/ecfcodes}/DataFields.java | 2 +- .../tyler => tyler/ecfcodes}/Disclaimer.java | 2 +- .../ecfcodes}/DocumentTypeTableRow.java | 2 +- .../tyler => tyler/ecfcodes}/FileType.java | 2 +- .../tyler => tyler/ecfcodes}/FilerType.java | 2 +- .../tyler => tyler/ecfcodes}/FilingCode.java | 2 +- .../ecfcodes}/FilingComponent.java | 2 +- .../ecfcodes}/OptionalServiceCode.java | 2 +- .../tyler => tyler/ecfcodes}/PartyType.java | 2 +- .../ecfcodes}/ServiceCodeType.java | 2 +- .../ecfcodes}/TylerCodesParser.java | 20 +-- .../litlab/efsp/utils/InfoCollector.java | 24 +-- ...InterviewToFilingInformationConverter.java | 2 +- .../litlab/efsp/db/DatabaseVersionTest.java | 8 +- ...embleToFilingInformationConverterTest.java | 22 +-- ...DocDocassembleJacksonDeserializerTest.java | 22 +-- ...sonDocassembleJacksonDeserializerTest.java | 12 +- .../efsp/ecfcodes/tyler/CodeDatabaseTest.java | 9 +- .../litlab/efsp/server/AddressTest.java | 2 +- .../server/ecf4/EcfCaseTypeFactoryTest.java | 6 +- .../ecf4/EcfCourtSpecificSerializerTest.java | 24 +-- .../ecf4/tyler/TylerCodesParserTest.java | 41 ++--- .../server/services/AdminUserServiceTest.java | 4 +- .../server/services/CodesServiceTest.java | 2 +- .../setup/tyler/OasisEcfWsCallbackTest.java | 4 +- .../ObservabilityHeadersInterceptorTest.java | 1 + 82 files changed, 456 insertions(+), 363 deletions(-) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/{tyler => }/CodeAndLocation.java (83%) create mode 100644 proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDatabaseUtils.java rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{server/ecf4 => ecfcodes}/CodesParser.java (90%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/{tyler => }/NameAndCode.java (95%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/{utils => logging}/MDCWrappers.java (94%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/{impl => api}/EfmFilingInterface.java (96%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/{setup/tyler => services/impl}/Ecf4Filer.java (98%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{server/ecf4 => tyler}/TylerConstants.java (91%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/CaseCategory.java (99%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/CaseType.java (99%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/CodeDatabase.java (94%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/CodeTableConstants.java (97%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ => tyler}/ecfcodes/CodeUpdater.java (99%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/ComboCaseCodes.java (93%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/CourtLocationInfo.java (99%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/CrossReference.java (97%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/DataFieldRow.java (98%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/DataFields.java (91%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/Disclaimer.java (93%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/DocumentTypeTableRow.java (97%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/FileType.java (95%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/FilerType.java (94%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/FilingCode.java (99%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/FilingComponent.java (97%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/OptionalServiceCode.java (99%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/PartyType.java (98%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{ecfcodes/tyler => tyler/ecfcodes}/ServiceCodeType.java (94%) rename proxyserver/src/main/java/edu/suffolk/litlab/efsp/{server/ecf4/tyler => tyler/ecfcodes}/TylerCodesParser.java (97%) diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/LoginDatabase.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/LoginDatabase.java index 9a58d035b..a624011f3 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/LoginDatabase.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/LoginDatabase.java @@ -1,8 +1,8 @@ package edu.suffolk.litlab.efsp.db; import edu.suffolk.litlab.efsp.db.model.AtRest; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeTableConstants; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; +import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.stdlib.RandomString; import edu.suffolk.litlab.efsp.utils.Hasher; import java.sql.Connection; @@ -65,7 +65,7 @@ public void createTablesIfAbsent() throws SQLException { String tableName = "at_rest_keys"; String createQuery = atRestCreate; - String tableExistsQuery = CodeTableConstants.getTableExists(); + String tableExistsQuery = CodeDatabaseUtils.getTableExists(); try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) { existsSt.setString(1, tableName); ResultSet rs = existsSt.executeQuery(); @@ -84,7 +84,7 @@ public void createTablesIfAbsent() throws SQLException { public boolean tablesExist() throws SQLException { String tableName = "at_rest_keys"; - String tableExistsQuery = CodeTableConstants.getTableExists(); + String tableExistsQuery = CodeDatabaseUtils.getTableExists(); try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) { existsSt.setString(1, tableName); ResultSet rs = existsSt.executeQuery(); diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/MessageSettingsDatabase.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/MessageSettingsDatabase.java index a14d47172..3c22b64ea 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/MessageSettingsDatabase.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/MessageSettingsDatabase.java @@ -1,7 +1,7 @@ package edu.suffolk.litlab.efsp.db; import edu.suffolk.litlab.efsp.db.model.MessageInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeTableConstants; +import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -36,7 +36,7 @@ public void createTablesIfAbsent() throws SQLException { throw new SQLException(); } - String tableExistsQuery = CodeTableConstants.getTableExists(); + String tableExistsQuery = CodeDatabaseUtils.getTableExists(); try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) { existsSt.setString(1, "message_settings"); ResultSet rs = existsSt.executeQuery(); diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/UserDatabase.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/UserDatabase.java index 09aa8c1a6..3b2d55e49 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/UserDatabase.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/UserDatabase.java @@ -1,7 +1,7 @@ package edu.suffolk.litlab.efsp.db; import edu.suffolk.litlab.efsp.db.model.Transaction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeTableConstants; +import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils; import edu.suffolk.litlab.efsp.model.EmailTemplates; import java.sql.Connection; import java.sql.PreparedStatement; @@ -42,7 +42,7 @@ public static UserDatabase fromDS(DataSource ds) { /** Creates the userdatabase table if it doesn't exist yet. */ public void createTablesIfAbsent() throws SQLException { - String tableExistsQuery = CodeTableConstants.getTableExists(); + String tableExistsQuery = CodeDatabaseUtils.getTableExists(); try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) { existsSt.setString(1, "submitted_filings"); ResultSet rs = existsSt.executeQuery(); diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/AddressDocassembleJacksonDeserializer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/AddressDocassembleJacksonDeserializer.java index 321d288a7..56b61d249 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/AddressDocassembleJacksonDeserializer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/AddressDocassembleJacksonDeserializer.java @@ -1,8 +1,8 @@ package edu.suffolk.litlab.efsp.docassemble; import com.fasterxml.jackson.databind.JsonNode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.Address; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; import edu.suffolk.litlab.efsp.utils.InterviewVariable; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverter.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverter.java index b1f64ccc0..216a09ace 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverter.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverter.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.hubspot.algebra.Result; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.FilingInformation; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.tyler.TylerEnv; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializer.java index 9c6ff7e52..b10a46b40 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializer.java @@ -10,19 +10,19 @@ import com.fasterxml.jackson.databind.JsonNode; import com.hubspot.algebra.Result; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.CodeError; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.FileExtensionNotAllowed; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.FileNameTextError; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.InputOptionalService; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.TextVarError; import edu.suffolk.litlab.efsp.model.FilingAction; import edu.suffolk.litlab.efsp.model.FilingAttachment; import edu.suffolk.litlab.efsp.model.FilingDoc; import edu.suffolk.litlab.efsp.model.OptionalService; import edu.suffolk.litlab.efsp.model.PartyId; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.CodeError; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.FileExtensionNotAllowed; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.FileNameTextError; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.InputOptionalService; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.TextVarError; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; import edu.suffolk.litlab.efsp.utils.InterviewVariable; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingInformationDocassembleJacksonDeserializer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingInformationDocassembleJacksonDeserializer.java index 844d17985..7e6a778c0 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingInformationDocassembleJacksonDeserializer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingInformationDocassembleJacksonDeserializer.java @@ -11,7 +11,10 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.node.NullNode; import com.hubspot.algebra.Result; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.AttorneyError; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.NoMultipleAttorneys; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.RequiredAttorneys; import edu.suffolk.litlab.efsp.model.CaseServiceContact; import edu.suffolk.litlab.efsp.model.EmailTemplates; import edu.suffolk.litlab.efsp.model.FilingDoc; @@ -19,11 +22,8 @@ import edu.suffolk.litlab.efsp.model.LowerCourtInfo; import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.Person; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.AttorneyError; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.NoMultipleAttorneys; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.RequiredAttorneys; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; import edu.suffolk.litlab.efsp.utils.InterviewVariable; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/NameDocassembleDeserializer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/NameDocassembleDeserializer.java index ef39985a0..dbefc1962 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/NameDocassembleDeserializer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/NameDocassembleDeserializer.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.NullNode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.Name; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; import edu.suffolk.litlab.efsp.utils.InterviewVariable; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializer.java index 2d07c0e95..350632e51 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializer.java @@ -7,12 +7,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.hubspot.algebra.Result; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.Address; import edu.suffolk.litlab.efsp.model.ContactInformation; import edu.suffolk.litlab.efsp.model.Name; import edu.suffolk.litlab.efsp.model.Person; import edu.suffolk.litlab.efsp.model.Person.Gender; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; import java.time.LocalDate; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeAndLocation.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeAndLocation.java similarity index 83% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeAndLocation.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeAndLocation.java index a261aa6ac..d23fa5a5c 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeAndLocation.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeAndLocation.java @@ -1,7 +1,7 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.ecfcodes; /** - * The code and location for a Tyler code. + * The code and location for an ECF code. * *

Returned by the various "search" APIs; you search for all codes with "XYZ" in the name, and * then do `/filing_code_names/XYZ` to get the code and location, enough to find all of the diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDatabaseAPI.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDatabaseAPI.java index f15328278..c83ccc5ae 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDatabaseAPI.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDatabaseAPI.java @@ -1,13 +1,21 @@ package edu.suffolk.litlab.efsp.ecfcodes; import edu.suffolk.litlab.efsp.db.Database; +import edu.suffolk.litlab.efsp.stdlib.SQLFunction; +import edu.suffolk.litlab.efsp.stdlib.SQLGetter; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import java.io.InputStream; import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.sql.SQLException; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ECF says that certain parts of the information model of the data that we exchange with the EFM is @@ -19,6 +27,8 @@ * jurisiction. */ public abstract class CodeDatabaseAPI extends Database { + private static final Logger log = LoggerFactory.getLogger(CodeDatabaseAPI.class); + public CodeDatabaseAPI(Connection conn) { super(conn); } @@ -61,4 +71,90 @@ public abstract boolean deleteFromTable(String tableName, String courtLocation) // TODO(brycew): needed for compatibility, but should be renamed to something more general // i.e. 'postUpdateClean' public abstract void vacuumAll(); + + /** + * Gets all distinct case category names that have the search term in them. + * + * @param searchTerm + * @return + */ + public abstract List searchCaseCategory(String searchTerm); + + public abstract List courtCoverageCaseCategory(String searchTerm); + + /** + * Get the code and court locations of the case categories that match the given name exactly. + * + * @param categoryName + * @return + */ + public abstract List retrieveCaseCategoryByName(String categoryName); + + public abstract List getCaseCategoryNames(String courtLocationId); + + // Note: to get the full object, need to have the child code database type object. + + /** + * Gets all distinct case type names that have the search term in them. + * + * @param searchTerm + * @return + */ + public abstract List searchCaseType(String searchTerm); + + public abstract List courtCoverageCaseType(String searchTerm); + + /** + * Get the code and court locations of the case types that match the given name exactly. + * + * @param caseTypeName + * @return + */ + public abstract List retrieveCaseTypeByName(String caseTypeName); + + public abstract List getCaseTypeNamesFor( + String courtLocationId, String caseCategoryCode, Optional initial); + + /** Runs all of the logic for search queries (both name searches and court coverage searches). */ + protected List genericSearch( + String searchTerm, SQLFunction queryMaker) { + String finalSearchTerm = CodeDatabaseUtils.likeWildcard(searchTerm); + return safetyWrap( + () -> { + try (PreparedStatement st = queryMaker.apply(finalSearchTerm)) { + List types = new ArrayList<>(); + ResultSet rs = st.executeQuery(); + while (rs.next()) { + types.add(rs.getString(1)); + } + return types; + } + }); + } + + protected List safetyWrap(SQLGetter> sup) { + if (conn == null) { + log.error("SQL connection not created yet!"); + return List.of(); + } + try { + return sup.get(); + } catch (SQLException ex) { + log.error("SQL excption: ", ex); + return List.of(); + } + } + + protected Optional safetyWrapOpt(SQLGetter> sup) { + if (conn == null) { + log.error("SQL connection not created yet!"); + return Optional.empty(); + } + try { + return sup.get(); + } catch (SQLException ex) { + log.error("SQL excption: ", ex); + return Optional.empty(); + } + } } diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDatabaseUtils.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDatabaseUtils.java new file mode 100644 index 000000000..34ba34137 --- /dev/null +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDatabaseUtils.java @@ -0,0 +1,38 @@ +package edu.suffolk.litlab.efsp.ecfcodes; + +import java.sql.SQLException; + +public class CodeDatabaseUtils { + /** This exception is returned when a given table name isn't in the pre-approved list of names. */ + public static class UnsupportedTableException extends SQLException { + public UnsupportedTableException(String message) { + super(message); + } + } + + public static String getTableExists() { + return """ + SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = 'public' + AND table_name = ? LIMIT 1;"""; + } + + public static String getIndicesExist() { + return """ + SELECT COUNT(*) FROM pg_catalog.pg_indexes where schemaname='public' + AND tablename = ? LIMIT 1;"""; + } + + /** + * In most cases, we want to find all instances of the search term, not the exact term. It's a + * LIKE compare, so add the 0 or more characters on either side. + * + * @param searchTerm + * @return + */ + public static String likeWildcard(String searchTerm) { + if (searchTerm == null) { + return "%"; + } + return "%" + searchTerm + "%"; + } +} diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDocIterator.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDocIterator.java index f2bc1d172..3b58e2d5b 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDocIterator.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeDocIterator.java @@ -48,6 +48,7 @@ public class CodeDocIterator implements Iterator> { private final XMLEventReader reader; /// From the Identification / Version tags. private final String version; + // TODO: factor out these ECF4 specific types, this should be ECF 4 / 5 independent. private final ColumnSet columnSet; private Map nextRow; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/CodesParser.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodesParser.java similarity index 90% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/CodesParser.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodesParser.java index 3d18b2198..2a47ed646 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/CodesParser.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodesParser.java @@ -1,15 +1,7 @@ -package edu.suffolk.litlab.efsp.server.ecf4; +package edu.suffolk.litlab.efsp.ecfcodes; import com.hubspot.algebra.NullValue; import com.hubspot.algebra.Result; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DocumentTypeTableRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FileType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilerType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; import edu.suffolk.litlab.efsp.model.FilingAction; import edu.suffolk.litlab.efsp.model.FilingDoc; import edu.suffolk.litlab.efsp.model.OptionalService; @@ -17,6 +9,13 @@ import edu.suffolk.litlab.efsp.model.PartyInfo; import edu.suffolk.litlab.efsp.model.Person; import edu.suffolk.litlab.efsp.model.Person.Gender; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DocumentTypeTableRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FileType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilerType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; import edu.suffolk.litlab.efsp.utils.FilingError; import java.math.BigDecimal; import java.time.LocalDate; @@ -28,6 +27,12 @@ import java.util.Set; import java.util.regex.Pattern; +/** + * Given the strings from an input case, 'parses' them (i.e. checks, confirms, and converts them + * into slightly more strict types). + * + *

TODO(brycew): still needs to remove the tyler specific codes from this API + */ public interface CodesParser extends AutoCloseable { // Types specifically for errors. // spotless:off diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/NameAndCode.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/NameAndCode.java similarity index 95% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/NameAndCode.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/NameAndCode.java index 9c4c3ae57..01e9fb4bc 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/NameAndCode.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/NameAndCode.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.ecfcodes; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingAttachment.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingAttachment.java index 2888dfc7b..6274fbe46 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingAttachment.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingAttachment.java @@ -1,7 +1,7 @@ package edu.suffolk.litlab.efsp.model; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DocumentTypeTableRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DocumentTypeTableRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; import java.util.Optional; /** An individual PDF, all a part of the same "document". The equivalent of an ALDocument. */ diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingDoc.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingDoc.java index 24928f747..6e6e0b997 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingDoc.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingDoc.java @@ -1,8 +1,8 @@ package edu.suffolk.litlab.efsp.model; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; import edu.suffolk.litlab.efsp.stdlib.NonEmptyString; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; import fj.data.NonEmptyList; import java.time.LocalDate; import java.util.List; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingInformation.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingInformation.java index d8da93a9a..3318d5413 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingInformation.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/FilingInformation.java @@ -1,9 +1,9 @@ package edu.suffolk.litlab.efsp.model; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilerType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilerType; import java.math.BigDecimal; import java.time.LocalDate; import java.util.ArrayList; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/OptionalService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/OptionalService.java index 99e6519c9..6583fd16d 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/OptionalService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/OptionalService.java @@ -1,6 +1,6 @@ package edu.suffolk.litlab.efsp.model; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.OptionalServiceCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.OptionalServiceCode; import java.math.BigDecimal; import java.util.Optional; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/PartyInfo.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/PartyInfo.java index c0378f808..e6a766a29 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/PartyInfo.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/model/PartyInfo.java @@ -1,6 +1,6 @@ package edu.suffolk.litlab.efsp.model; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.PartyType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.PartyType; /** * PartyType code / role code, and isOrg value isOrg is hacky, but Tyler expects us to create the diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java index d272cc35a..f510bf6c9 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java @@ -12,7 +12,6 @@ import edu.suffolk.litlab.efsp.db.MessageSettingsDatabase; import edu.suffolk.litlab.efsp.db.UserDatabase; import edu.suffolk.litlab.efsp.docassemble.DocassembleToFilingInformationConverter; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; import edu.suffolk.litlab.efsp.server.auth.SecurityHub; import edu.suffolk.litlab.efsp.server.services.ApiUserSettingsService; import edu.suffolk.litlab.efsp.server.services.AuthenticationService; @@ -34,6 +33,7 @@ import edu.suffolk.litlab.efsp.server.utils.SoapExceptionMapper; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; import edu.suffolk.litlab.efsp.utils.InterviewToFilingInformationConverter; import jakarta.ws.rs.core.MediaType; import java.security.NoSuchAlgorithmException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCaseTypeFactory.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCaseTypeFactory.java index 4bce8b1e8..fe926abcc 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCaseTypeFactory.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCaseTypeFactory.java @@ -21,16 +21,16 @@ import ecf4.latest.tyler.ecf.extensions.common.ProcedureRemedyType; import ecf4.latest.tyler.ecf.extensions.common.ServicePartyDataType; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.ComboCaseCodes; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; import edu.suffolk.litlab.efsp.model.CaseServiceContact; import edu.suffolk.litlab.efsp.model.ContactInformation; import edu.suffolk.litlab.efsp.model.FilingInformation; import edu.suffolk.litlab.efsp.model.Name; import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.Person; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.ComboCaseCodes; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; import edu.suffolk.litlab.efsp.utils.InterviewVariable; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java index 5fa3b8cb8..85c1ae11e 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java @@ -33,11 +33,6 @@ import ecf4.latest.tyler.ecf.extensions.common.DocumentOptionalServiceType; import ecf4.latest.tyler.ecf.extensions.common.DocumentType; import ecf4.latest.tyler.ecf.extensions.common.FilingTypeType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.ComboCaseCodes; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; import edu.suffolk.litlab.efsp.model.Address; import edu.suffolk.litlab.efsp.model.ContactInformation; import edu.suffolk.litlab.efsp.model.FilingAction; @@ -49,6 +44,11 @@ import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.PartyInfo; import edu.suffolk.litlab.efsp.model.Person; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.ComboCaseCodes; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; import jakarta.xml.bind.JAXBElement; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/Ecfv5CaseTypeFactory.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/Ecfv5CaseTypeFactory.java index 1acc6fe76..7b61c0715 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/Ecfv5CaseTypeFactory.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/Ecfv5CaseTypeFactory.java @@ -26,14 +26,14 @@ import ecf4.latest.tyler.ecf.v5_0.extensions.common.FilingAttorneyEntityType; import ecf4.latest.tyler.ecf.v5_0.extensions.common.FilingPartyEntityType; import ecf4.latest.tyler.ecf.v5_0.extensions.common.FilingReferenceType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.ComboCaseCodes; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.PartyType; import edu.suffolk.litlab.efsp.model.FilingDoc; import edu.suffolk.litlab.efsp.model.FilingInformation; import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.PartyInfo; import edu.suffolk.litlab.efsp.model.Person; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.ComboCaseCodes; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.PartyType; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; import java.math.BigDecimal; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/PaymentFactory.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/PaymentFactory.java index 0d8dabc9e..a3d626d1e 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/PaymentFactory.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/PaymentFactory.java @@ -11,6 +11,7 @@ import ecf4.latest.oasis.names.tc.legalxml_courtfiling.schema.xsd.paymentmessage_4.PaymentMessageType; import ecf4.latest.tyler.ecf.extensions.common.ProviderChargeType; import edu.suffolk.litlab.efsp.Jurisdiction; +import edu.suffolk.litlab.efsp.tyler.TylerConstants; import java.math.BigDecimal; public class PaymentFactory { diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/MDCWrappers.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/logging/MDCWrappers.java similarity index 94% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/MDCWrappers.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/logging/MDCWrappers.java index 6c520be9a..b33ff8dd6 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/MDCWrappers.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/logging/MDCWrappers.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.server.utils; +package edu.suffolk.litlab.efsp.server.logging; import org.slf4j.MDC; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AdminUserService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AdminUserService.java index dd8803d5c..d0abcecba 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AdminUserService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AdminUserService.java @@ -9,12 +9,10 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; import edu.suffolk.litlab.efsp.server.auth.TylerLogin; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.EfspSecurityContext; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.NeedsAuthorization; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; import edu.suffolk.litlab.efsp.server.utils.TylerUserFromServer; @@ -24,6 +22,8 @@ import edu.suffolk.litlab.efsp.tyler.TylerFirmFactory; import edu.suffolk.litlab.efsp.tyler.TylerUserClient; import edu.suffolk.litlab.efsp.tyler.TylerUserFactory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AuthenticationService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AuthenticationService.java index ab13bd11d..9e3ec2aa1 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AuthenticationService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AuthenticationService.java @@ -8,7 +8,7 @@ import com.webcohesion.enunciate.metadata.rs.StatusCodes; import edu.suffolk.litlab.efsp.db.model.NewTokens; import edu.suffolk.litlab.efsp.server.auth.SecurityHub; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CasesService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CasesService.java index a820d61e0..e1580da0e 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CasesService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CasesService.java @@ -25,19 +25,19 @@ import ecf4.latest.tyler.ecf.extensions.serviceinformationhistoryresponsemessage.ServiceInformationHistoryResponseMessageType; import ecf4.latest.tyler.efm.wsdl.webservicesprofile_implementation_4_0.CourtRecordMDEService; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; import edu.suffolk.litlab.efsp.model.Name; import edu.suffolk.litlab.efsp.server.auth.TylerLogin; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; import edu.suffolk.litlab.efsp.server.ecf4.EcfCaseTypeFactory; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.NeedsAuthorization; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; import edu.suffolk.litlab.efsp.tyler.SoapClientChooser; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; import edu.suffolk.litlab.efsp.utils.Hasher; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CourtSchedulingService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CourtSchedulingService.java index ff8a9c42a..a0ec7a1c8 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CourtSchedulingService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CourtSchedulingService.java @@ -36,25 +36,19 @@ import ecf4.latest.tyler.efm.wsdl.webservicesprofile_implementation_4_0.CourtRecordMDEService; import ecf4.latest.tyler.efm.wsdl.webservicesprofile_implementation_4_0.FilingReviewMDEService; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.ComboCaseCodes; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.FilingInformation; import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.Person; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; import edu.suffolk.litlab.efsp.server.ecf4.EcfCaseTypeFactory; import edu.suffolk.litlab.efsp.server.ecf4.EcfCourtSpecificSerializer; import edu.suffolk.litlab.efsp.server.ecf4.Ecfv5CaseTypeFactory; import edu.suffolk.litlab.efsp.server.ecf4.PolicyCacher; -import edu.suffolk.litlab.efsp.server.ecf4.tyler.TylerCodesParser; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.Ecfv5XmlHelper; import edu.suffolk.litlab.efsp.server.utils.EfspSecurityContext; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.NeedsAuthorization; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; import edu.suffolk.litlab.efsp.server.utils.TylerUserFromServer; @@ -62,6 +56,12 @@ import edu.suffolk.litlab.efsp.tyler.TylerClients; import edu.suffolk.litlab.efsp.tyler.TylerFirmFactory; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.ComboCaseCodes; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.TylerCodesParser; import edu.suffolk.litlab.efsp.utils.FailFastCollector; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; @@ -354,7 +354,7 @@ public Response getReturnDate( .name("case type (fom tyler)") .description("(shouldn't be wrong)")); } - edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType typeCode = typeRes.expect(""); + edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType typeCode = typeRes.expect(""); existingParties = EcfCaseTypeFactory.getCaseParticipants(resp.getCase().getValue()); if (existingParties.isEmpty()) { log.info("Couldn't get exsting parties?"); diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/EcfCodesService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/EcfCodesService.java index 048bb76ad..537e370bb 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/EcfCodesService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/EcfCodesService.java @@ -3,24 +3,24 @@ import static edu.suffolk.litlab.efsp.server.utils.EndpointReflection.replacePathParam; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CrossReference; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.Disclaimer; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DocumentTypeTableRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FileType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilerType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.OptionalServiceCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.PartyType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.ServiceCodeType; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection.Endpoint; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CrossReference; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.Disclaimer; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DocumentTypeTableRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FileType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilerType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.OptionalServiceCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.PartyType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.ServiceCodeType; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FilingReviewService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FilingReviewService.java index 4ad4974ed..18601a291 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FilingReviewService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FilingReviewService.java @@ -7,15 +7,15 @@ import com.webcohesion.enunciate.metadata.rs.ResourceGroup; import edu.suffolk.litlab.efsp.Jurisdiction; import edu.suffolk.litlab.efsp.db.UserDatabase; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.FilingInformation; import edu.suffolk.litlab.efsp.model.FilingResult; import edu.suffolk.litlab.efsp.model.Person; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; -import edu.suffolk.litlab.efsp.server.services.impl.EfmFilingInterface; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; +import edu.suffolk.litlab.efsp.server.services.api.EfmFilingInterface; import edu.suffolk.litlab.efsp.server.setup.EfmRestCallbackInterface; import edu.suffolk.litlab.efsp.server.utils.EfspSecurityContext; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.NeedsAuthorization; import edu.suffolk.litlab.efsp.server.utils.OrgMessageSender; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FirmAttorneyAndServiceService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FirmAttorneyAndServiceService.java index 7712233b8..cf6d4416b 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FirmAttorneyAndServiceService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FirmAttorneyAndServiceService.java @@ -9,17 +9,17 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.webcohesion.enunciate.metadata.rs.ResourceGroup; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.services.api.ServiceContactInput; import edu.suffolk.litlab.efsp.server.utils.EfspSecurityContext; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.NeedsAuthorization; import edu.suffolk.litlab.efsp.tyler.TylerClients; import edu.suffolk.litlab.efsp.tyler.TylerErrorCodes; import edu.suffolk.litlab.efsp.tyler.TylerFirmClient; import edu.suffolk.litlab.efsp.tyler.TylerFirmFactory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.PATCH; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/MessageSettingsService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/MessageSettingsService.java index 3800c6ad1..4b621150f 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/MessageSettingsService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/MessageSettingsService.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import edu.suffolk.litlab.efsp.db.MessageSettingsDatabase; import edu.suffolk.litlab.efsp.db.model.MessageInfo; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.EfspSecurityContext; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.NeedsAuthorization; import edu.suffolk.litlab.efsp.server.utils.OrgMessageSender; import jakarta.ws.rs.GET; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/PaymentsService.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/PaymentsService.java index 4bd875aa5..0488e4c91 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/PaymentsService.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/PaymentsService.java @@ -11,10 +11,9 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.EfspSecurityContext; import edu.suffolk.litlab.efsp.server.utils.EndpointReflection; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.NeedsAuthorization; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; import edu.suffolk.litlab.efsp.stdlib.RandomString; @@ -23,6 +22,7 @@ import edu.suffolk.litlab.efsp.tyler.TylerFirmClient; import edu.suffolk.litlab.efsp.tyler.TylerFirmFactory; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; import edu.suffolk.litlab.efsp.utils.Hasher; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/EfmFilingInterface.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/api/EfmFilingInterface.java similarity index 96% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/EfmFilingInterface.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/api/EfmFilingInterface.java index 33a7c9c3f..450047c9e 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/EfmFilingInterface.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/api/EfmFilingInterface.java @@ -1,10 +1,10 @@ -package edu.suffolk.litlab.efsp.server.services.impl; +package edu.suffolk.litlab.efsp.server.services.api; import com.hubspot.algebra.NullValue; import com.hubspot.algebra.Result; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.FilingInformation; import edu.suffolk.litlab.efsp.model.FilingResult; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/Ecf4Filer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/Ecf4Filer.java similarity index 98% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/Ecf4Filer.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/Ecf4Filer.java index 5e41aed2f..1b3f88c62 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/Ecf4Filer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/Ecf4Filer.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.server.setup.tyler; +package edu.suffolk.litlab.efsp.server.services.impl; import static edu.suffolk.litlab.efsp.server.utils.ServiceHelpers.getIsIndividual; import static edu.suffolk.litlab.efsp.stdlib.StdLib.exists; @@ -44,14 +44,7 @@ import ecf4.latest.tyler.efm.wsdl.webservicesprofile_implementation_4_0.FilingReviewMDEService; import ecf4.latest.tyler.efm.wsdl.webservicesprofile_implementation_4_0.ServiceMDEService; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.ComboCaseCodes; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.Disclaimer; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.ServiceCodeType; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.CaseServiceContact; import edu.suffolk.litlab.efsp.model.FilingDoc; import edu.suffolk.litlab.efsp.model.FilingInformation; @@ -59,20 +52,26 @@ import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.Person; import edu.suffolk.litlab.efsp.server.auth.TylerLogin; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; import edu.suffolk.litlab.efsp.server.ecf4.EcfCaseTypeFactory; import edu.suffolk.litlab.efsp.server.ecf4.EcfCourtSpecificSerializer; import edu.suffolk.litlab.efsp.server.ecf4.PaymentFactory; import edu.suffolk.litlab.efsp.server.ecf4.PolicyCacher; import edu.suffolk.litlab.efsp.server.ecf4.QueryType; -import edu.suffolk.litlab.efsp.server.ecf4.tyler.TylerCodesParser; -import edu.suffolk.litlab.efsp.server.services.impl.EfmCheckableFilingInterface; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; import edu.suffolk.litlab.efsp.tyler.SoapClientChooser; import edu.suffolk.litlab.efsp.tyler.TylerClients; import edu.suffolk.litlab.efsp.tyler.TylerFirmFactory; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.ComboCaseCodes; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.Disclaimer; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.ServiceCodeType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.TylerCodesParser; import edu.suffolk.litlab.efsp.utils.FailFastCollector; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/EfmCheckableFilingInterface.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/EfmCheckableFilingInterface.java index 3238575dc..88d034a17 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/EfmCheckableFilingInterface.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/impl/EfmCheckableFilingInterface.java @@ -4,6 +4,7 @@ import com.hubspot.algebra.Result; import edu.suffolk.litlab.efsp.model.FilingInformation; import edu.suffolk.litlab.efsp.model.FilingResult; +import edu.suffolk.litlab.efsp.server.services.api.EfmFilingInterface; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; import edu.suffolk.litlab.efsp.utils.FailFastCollector; import edu.suffolk.litlab.efsp.utils.FilingError; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallback.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallback.java index 74f4b8ef8..cc8799d66 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallback.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallback.java @@ -19,14 +19,14 @@ import ecf4.latest.tyler.ecf.extensions.servicecallbackmessage.ServiceCallbackMessageType; import edu.suffolk.litlab.efsp.db.UserDatabase; import edu.suffolk.litlab.efsp.db.model.Transaction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; import edu.suffolk.litlab.efsp.server.ecf4.EcfCaseTypeFactory; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.services.api.UpdateMessageStatus; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.OrgMessageSender; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; import java.sql.SQLException; import java.util.List; import java.util.Optional; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfv5WsCallback.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfv5WsCallback.java index 461a457e9..775d7fac6 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfv5WsCallback.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfv5WsCallback.java @@ -24,11 +24,12 @@ import ecf4.latest.oasis.names.specification.ubl.schema.xsd.commonaggregatecomponents_2.CardAccountType; import edu.suffolk.litlab.efsp.db.UserDatabase; import edu.suffolk.litlab.efsp.db.model.Transaction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; import edu.suffolk.litlab.efsp.server.services.api.UpdateMessageStatus; +import edu.suffolk.litlab.efsp.server.services.impl.Ecf4Filer; import edu.suffolk.litlab.efsp.server.utils.Ecfv5XmlHelper; import edu.suffolk.litlab.efsp.server.utils.OrgMessageSender; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; import jakarta.xml.bind.JAXBElement; import java.sql.SQLException; import java.time.LocalDateTime; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/TylerModuleSetup.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/TylerModuleSetup.java index 990d2c623..004fd2930 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/TylerModuleSetup.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/TylerModuleSetup.java @@ -6,10 +6,8 @@ import com.hubspot.algebra.Result; import edu.suffolk.litlab.efsp.Jurisdiction; import edu.suffolk.litlab.efsp.db.UserDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.CodeUpdater; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; import edu.suffolk.litlab.efsp.server.ecf4.PolicyCacher; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.services.AdminUserService; import edu.suffolk.litlab.efsp.server.services.CasesService; import edu.suffolk.litlab.efsp.server.services.CourtSchedulingService; @@ -18,10 +16,10 @@ import edu.suffolk.litlab.efsp.server.services.FirmAttorneyAndServiceService; import edu.suffolk.litlab.efsp.server.services.JurisdictionServiceHandle; import edu.suffolk.litlab.efsp.server.services.PaymentsService; -import edu.suffolk.litlab.efsp.server.services.impl.EfmFilingInterface; +import edu.suffolk.litlab.efsp.server.services.api.EfmFilingInterface; +import edu.suffolk.litlab.efsp.server.services.impl.Ecf4Filer; import edu.suffolk.litlab.efsp.server.setup.EfmModuleSetup; import edu.suffolk.litlab.efsp.server.setup.EfmRestCallbackInterface; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.OrgMessageSender; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; import edu.suffolk.litlab.efsp.server.utils.SoapX509CallbackHandler; @@ -29,6 +27,9 @@ import edu.suffolk.litlab.efsp.stdlib.StdLib; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeUpdater; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; import edu.suffolk.litlab.efsp.utils.InterviewToFilingInformationConverter; import java.sql.SQLException; import java.time.LocalTime; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/AuthenticateRequestInterceptor.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/AuthenticateRequestInterceptor.java index 78dee6e2f..960af1257 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/AuthenticateRequestInterceptor.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/AuthenticateRequestInterceptor.java @@ -4,6 +4,7 @@ import edu.suffolk.litlab.efsp.db.LoginDatabase; import edu.suffolk.litlab.efsp.db.model.AtRest; import edu.suffolk.litlab.efsp.server.auth.TylerLogin; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; import edu.suffolk.litlab.efsp.utils.Hasher; import jakarta.annotation.Priority; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityHeadersInterceptor.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityHeadersInterceptor.java index f42b43e14..30a9eaa94 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityHeadersInterceptor.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityHeadersInterceptor.java @@ -1,5 +1,6 @@ package edu.suffolk.litlab.efsp.server.utils; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerRequestFilter; import jakarta.ws.rs.container.PreMatching; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityResetInterceptor.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityResetInterceptor.java index c1d5363ca..dc5d2f61c 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityResetInterceptor.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityResetInterceptor.java @@ -1,5 +1,6 @@ package edu.suffolk.litlab.efsp.server.utils; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerResponseContext; import jakarta.ws.rs.container.ContainerResponseFilter; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ServiceHelpers.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ServiceHelpers.java index babe924ee..ecf01021a 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ServiceHelpers.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/ServiceHelpers.java @@ -2,11 +2,11 @@ import static edu.suffolk.litlab.efsp.stdlib.StdLib.GetEnv; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; import edu.suffolk.litlab.efsp.tyler.TylerErrorCodes; import edu.suffolk.litlab.efsp.tyler.TylerFirmClient; import edu.suffolk.litlab.efsp.tyler.TylerFirmFactory; import edu.suffolk.litlab.efsp.tyler.TylerUserNamePassword; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; import jakarta.ws.rs.core.Response; import jakarta.xml.ws.BindingProvider; import java.util.List; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/UpdateCodeVersions.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/UpdateCodeVersions.java index 123270a51..38595a882 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/UpdateCodeVersions.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/UpdateCodeVersions.java @@ -2,11 +2,12 @@ import edu.suffolk.litlab.efsp.Jurisdiction; import edu.suffolk.litlab.efsp.db.DatabaseCreator; -import edu.suffolk.litlab.efsp.ecfcodes.CodeUpdater; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.logging.Monitor; import edu.suffolk.litlab.efsp.tyler.TylerClients; import edu.suffolk.litlab.efsp.tyler.TylerDomain; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeUpdater; import java.sql.Connection; import java.sql.SQLException; import java.time.LocalDate; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/TylerConstants.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/TylerConstants.java similarity index 91% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/TylerConstants.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/TylerConstants.java index b82909920..eb27270d4 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/TylerConstants.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/TylerConstants.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.server.ecf4; +package edu.suffolk.litlab.efsp.tyler; import edu.suffolk.litlab.efsp.Jurisdiction; import java.math.BigDecimal; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CaseCategory.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CaseCategory.java similarity index 99% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CaseCategory.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CaseCategory.java index 91a1be387..9448a3c10 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CaseCategory.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CaseCategory.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CaseType.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CaseType.java similarity index 99% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CaseType.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CaseType.java index 896301728..30065e43d 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CaseType.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CaseType.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.math.BigDecimal; import java.sql.Connection; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeDatabase.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeDatabase.java similarity index 94% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeDatabase.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeDatabase.java index 56d997934..defd87ebe 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeDatabase.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeDatabase.java @@ -1,11 +1,12 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; +import edu.suffolk.litlab.efsp.ecfcodes.CodeAndLocation; import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseAPI; +import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils; +import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils.UnsupportedTableException; import edu.suffolk.litlab.efsp.ecfcodes.CodeDocException; import edu.suffolk.litlab.efsp.ecfcodes.CodeDocIterator; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeTableConstants.UnsupportedTableException; -import edu.suffolk.litlab.efsp.stdlib.SQLFunction; -import edu.suffolk.litlab.efsp.stdlib.SQLGetter; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import java.io.InputStream; import java.sql.Connection; @@ -59,7 +60,7 @@ public static CodeDatabase fromDS(TylerDomain domain, DataSource ds) { } public boolean tablesExist() throws SQLException { - String tableExistsQuery = CodeTableConstants.getTableExists(); + String tableExistsQuery = CodeDatabaseUtils.getTableExists(); boolean locationExists = false; boolean installedExists = false; try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) { @@ -101,7 +102,7 @@ public void createTableIfAbsent(String tableName) throws SQLException { // TODO(brycew-later): eventually make the create tables have foreign keys and // required from the Id / columnRefs - String tableExistsQuery = CodeTableConstants.getTableExists(); + String tableExistsQuery = CodeDatabaseUtils.getTableExists(); try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) { existsSt.setString(1, tableName); ResultSet rs = existsSt.executeQuery(); @@ -132,7 +133,7 @@ public void createIndicesIfAbsent(String tableName) throws SQLException { return; } - String indicesExist = CodeTableConstants.getIndicesExist(); + String indicesExist = CodeDatabaseUtils.getIndicesExist(); try (PreparedStatement existsSt = conn.prepareStatement(indicesExist)) { existsSt.setString(1, tableName); ResultSet rs = existsSt.executeQuery(); @@ -253,26 +254,7 @@ private PreparedStatement singleInsert( return stmt; } - /** - * In most cases, we want to find all instances of the search term, not the exact term. It's a - * LIKE compare, so add the 0 or more characters on either side. - * - * @param searchTerm - * @return - */ - private static String likeWildcard(String searchTerm) { - if (searchTerm == null) { - return "%"; - } - return "%" + searchTerm + "%"; - } - - /** - * Gets all distinct case category names that have the search term in them. - * - * @param searchTerm - * @return - */ + @Override public List searchCaseCategory(String searchTerm) { return genericSearch( searchTerm, @@ -285,6 +267,7 @@ public List searchCaseCategory(String searchTerm) { }); } + @Override public List courtCoverageCaseCategory(String searchTerm) { return genericSearch( searchTerm, @@ -297,12 +280,7 @@ public List courtCoverageCaseCategory(String searchTerm) { }); } - /** - * Get the code and court locations of the case categories that match the given name exactly. - * - * @param categoryName - * @return - */ + @Override public List retrieveCaseCategoryByName(String categoryName) { return safetyWrap( () -> { @@ -320,6 +298,23 @@ public List retrieveCaseCategoryByName(String categoryName) { }); } + public List getCaseCategoryNames(String courtLocationId) { + return safetyWrap( + () -> { + String query = CaseCategory.getCaseCategoriesForLoc(); + List nacs = new ArrayList<>(); + try (PreparedStatement st = conn.prepareStatement(query)) { + st.setString(1, domainStr()); + st.setString(2, courtLocationId); + ResultSet rs = st.executeQuery(); + while (rs.next()) { + nacs.add(new NameAndCode(rs.getString(2), rs.getString(1))); + } + } + return nacs; + }); + } + public List getCaseCategoriesFor(String courtLocationId) { return safetyWrap( () -> { @@ -380,26 +375,17 @@ public Optional getCaseCategoryWithCode( }); } - /** - * Gets all distinct case type names that have the search term in them. - * - * @param searchTerm - * @return - */ + @Override public List searchCaseType(String searchTerm) { return genericSearch(searchTerm, (term) -> CaseType.prepSearchQuery(conn, domainStr(), term)); } + @Override public List courtCoverageCaseType(String searchTerm) { return genericSearch(searchTerm, (term) -> CaseType.prepCourtCoverage(conn, domainStr(), term)); } - /** - * Get the code and court locations of the case types that match the given name exactly. - * - * @param caseTypeName - * @return - */ + @Override public List retrieveCaseTypeByName(String caseTypeName) { return safetyWrap( () -> { @@ -414,6 +400,31 @@ public List retrieveCaseTypeByName(String caseTypeName) { }); } + @Override + public List getCaseTypeNamesFor( + String courtLocationId, String caseCategoryCode, Optional initial) { + return safetyWrap( + () -> { + PreparedStatement st; + if (initial.isPresent()) { + st = + CaseType.prepQueryTiming( + conn, domainStr(), courtLocationId, caseCategoryCode, initial); + } else { + st = CaseType.prepQueryBroad(conn, domainStr(), courtLocationId, caseCategoryCode); + } + ResultSet rs = st.executeQuery(); + List nacs = new ArrayList<>(); + // TODO(bryce): can be more efficient, just grabbing the name and code and not all of the + // other data. + while (rs.next()) { + nacs.add(new NameAndCode(rs.getString(2), rs.getString(1))); + } + st.close(); + return nacs; + }); + } + public List getCaseTypesFor( String courtLocationId, String caseCategoryCode, Optional initial) { return safetyWrap( @@ -631,23 +642,6 @@ public List courtCoverageFilingType(String searchTerm) { searchTerm, (term) -> FilingCode.prepCourtCoverageQuery(conn, domainStr(), term)); } - /** Runs all of the logic for search queries (both name searches and court coverage searches). */ - private List genericSearch( - String searchTerm, SQLFunction queryMaker) { - String finalSearchTerm = likeWildcard(searchTerm); - return safetyWrap( - () -> { - try (PreparedStatement st = queryMaker.apply(finalSearchTerm)) { - List types = new ArrayList<>(); - ResultSet rs = st.executeQuery(); - while (rs.next()) { - types.add(rs.getString(1)); - } - return types; - } - }); - } - /** * Get the code and court locations of the filing types that match the given name exactly. * @@ -1377,30 +1371,4 @@ public List getDisclaimerRequirements(String courtLocation) { } }); } - - private List safetyWrap(SQLGetter> sup) { - if (conn == null) { - log.error("SQL connection not created yet!"); - return List.of(); - } - try { - return sup.get(); - } catch (SQLException ex) { - log.error("SQL excption: ", ex); - return List.of(); - } - } - - private Optional safetyWrapOpt(SQLGetter> sup) { - if (conn == null) { - log.error("SQL connection not created yet!"); - return Optional.empty(); - } - try { - return sup.get(); - } catch (SQLException ex) { - log.error("SQL excption: ", ex); - return Optional.empty(); - } - } } diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeTableConstants.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeTableConstants.java similarity index 97% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeTableConstants.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeTableConstants.java index 748047fd5..853d14de6 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeTableConstants.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeTableConstants.java @@ -1,6 +1,5 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; -import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -9,6 +8,8 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils.UnsupportedTableException; + public class CodeTableConstants { /* * a list of CREATE INDEX queries you should run for on creation of these tables. @@ -387,18 +388,6 @@ public static boolean isCourtTable(String tableName) { return tableColumns.getOrDefault(tableName, new TableColumns()).needsExtraLocCol; } - public static String getTableExists() { - return """ - SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = 'public' - AND table_name = ? LIMIT 1;"""; - } - - public static String getIndicesExist() { - return """ - SELECT COUNT(*) FROM pg_catalog.pg_indexes where schemaname='public' - AND tablename = ? LIMIT 1;"""; - } - public static String updateVersion() { return """ INSERT INTO installedversion (location, codelist, installedversion, domain) VALUES(?, ?, ?, ?) @@ -452,12 +441,6 @@ public static String vacuumAnalyzeAll() { return "VACUUM ANALYZE"; } - /** This exception is returned when a given table name isn't in the pre-approved list of names. */ - public static class UnsupportedTableException extends SQLException { - public UnsupportedTableException(String message) { - super(message); - } - } public static boolean tableHasLocation(String tableName) { return tableColumns.containsKey(tableName) && tableColumns.get(tableName).needsExtraLocCol; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeUpdater.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeUpdater.java similarity index 99% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeUpdater.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeUpdater.java index 1f043e857..56817d97e 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeUpdater.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CodeUpdater.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import ecf4.latest.oasis.names.tc.legalxml_courtfiling.schema.xsd.courtpolicyquerymessage_4.CourtPolicyQueryMessageType; import ecf4.latest.oasis.names.tc.legalxml_courtfiling.schema.xsd.courtpolicyresponsemessage_4.CourtPolicyResponseMessageType; @@ -6,11 +6,11 @@ import ecf4.latest.tyler.efm.wsdl.webservicesprofile_implementation_4_0.FilingReviewMDEService; import edu.suffolk.litlab.efsp.Jurisdiction; import edu.suffolk.litlab.efsp.db.DatabaseCreator; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeTableConstants.UnsupportedTableException; +import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseAPI; +import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils.UnsupportedTableException; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.HeaderSigner; -import edu.suffolk.litlab.efsp.server.utils.MDCWrappers; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; import edu.suffolk.litlab.efsp.server.utils.SoapX509CallbackHandler; import edu.suffolk.litlab.efsp.tyler.SoapClientChooser; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/ComboCaseCodes.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/ComboCaseCodes.java similarity index 93% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/ComboCaseCodes.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/ComboCaseCodes.java index f87f7f6ac..3fd769671 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/ComboCaseCodes.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/ComboCaseCodes.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.PartyInfo; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CourtLocationInfo.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CourtLocationInfo.java similarity index 99% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CourtLocationInfo.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CourtLocationInfo.java index 7510fc246..7cb4f2468 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CourtLocationInfo.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CourtLocationInfo.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CrossReference.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CrossReference.java similarity index 97% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CrossReference.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CrossReference.java index 9b01e6bc7..3b41976e0 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CrossReference.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/CrossReference.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DataFieldRow.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DataFieldRow.java similarity index 98% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DataFieldRow.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DataFieldRow.java index e1078b5a6..38c7715c9 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DataFieldRow.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DataFieldRow.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DataFields.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DataFields.java similarity index 91% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DataFields.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DataFields.java index 509987e5c..46472bd42 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DataFields.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DataFields.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.util.List; import java.util.Map; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/Disclaimer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/Disclaimer.java similarity index 93% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/Disclaimer.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/Disclaimer.java index 54f945b4e..5063ca51e 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/Disclaimer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/Disclaimer.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; public class Disclaimer { public String code; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DocumentTypeTableRow.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DocumentTypeTableRow.java similarity index 97% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DocumentTypeTableRow.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DocumentTypeTableRow.java index 305647f2d..56baffb82 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/DocumentTypeTableRow.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/DocumentTypeTableRow.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FileType.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FileType.java similarity index 95% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FileType.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FileType.java index 3f9850bb0..ce9a7ac07 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FileType.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FileType.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilerType.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilerType.java similarity index 94% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilerType.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilerType.java index 1d0e8c3a7..05f2f3d89 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilerType.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilerType.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilingCode.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilingCode.java similarity index 99% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilingCode.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilingCode.java index 3555679f4..f47b0e533 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilingCode.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilingCode.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilingComponent.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilingComponent.java similarity index 97% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilingComponent.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilingComponent.java index fe1c827dc..f12390002 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/FilingComponent.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/FilingComponent.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/OptionalServiceCode.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/OptionalServiceCode.java similarity index 99% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/OptionalServiceCode.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/OptionalServiceCode.java index ca276b51c..0946439fd 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/OptionalServiceCode.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/OptionalServiceCode.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/PartyType.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/PartyType.java similarity index 98% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/PartyType.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/PartyType.java index f95f0c28f..26da0d010 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/PartyType.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/PartyType.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.math.BigDecimal; import java.sql.ResultSet; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/ServiceCodeType.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/ServiceCodeType.java similarity index 94% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/ServiceCodeType.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/ServiceCodeType.java index 761c07b8f..86d6a8ccf 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/ServiceCodeType.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/ServiceCodeType.java @@ -1,4 +1,4 @@ -package edu.suffolk.litlab.efsp.ecfcodes.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/tyler/TylerCodesParser.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/TylerCodesParser.java similarity index 97% rename from proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/tyler/TylerCodesParser.java rename to proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/TylerCodesParser.java index b81414551..e7e7d98be 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/tyler/TylerCodesParser.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/tyler/ecfcodes/TylerCodesParser.java @@ -1,24 +1,11 @@ -package edu.suffolk.litlab.efsp.server.ecf4.tyler; +package edu.suffolk.litlab.efsp.tyler.ecfcodes; import com.hubspot.algebra.NullValue; import com.hubspot.algebra.Result; import ecf4.latest.gov.niem.niem.niem_core._2.MeasureType; import ecf4.latest.oasis.names.tc.legalxml_courtfiling.schema.xsd.courtpolicyresponsemessage_4.DevelopmentPolicyParametersType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CrossReference; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFields; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DocumentTypeTableRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FileType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilerType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.OptionalServiceCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.PartyType; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; import edu.suffolk.litlab.efsp.model.FilingAction; import edu.suffolk.litlab.efsp.model.FilingDoc; import edu.suffolk.litlab.efsp.model.OptionalService; @@ -26,7 +13,6 @@ import edu.suffolk.litlab.efsp.model.PartyInfo; import edu.suffolk.litlab.efsp.model.Person; import edu.suffolk.litlab.efsp.model.Person.Gender; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; import edu.suffolk.litlab.efsp.utils.FilingError; import java.math.BigDecimal; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/utils/InfoCollector.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/utils/InfoCollector.java index fc41f1a65..f6e2455ce 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/utils/InfoCollector.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/utils/InfoCollector.java @@ -1,18 +1,18 @@ package edu.suffolk.litlab.efsp.utils; import com.hubspot.algebra.Result; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.BadCode; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.CodeError; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.CrossReferenceError; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.MissingRequiredRefs; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.MissingVar; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.NoMatchingCode; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.NoMatchingRef; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.RequiredCodeNotPresent; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.TextVarError; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.TooLongVar; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.WrongRefVal; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.WrongVar; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.BadCode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.CodeError; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.CrossReferenceError; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.MissingRequiredRefs; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.MissingVar; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.NoMatchingCode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.NoMatchingRef; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.RequiredCodeNotPresent; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.TextVarError; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.TooLongVar; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.WrongRefVal; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.WrongVar; import edu.suffolk.litlab.efsp.utils.InterviewVariable.VarBuilder; import java.util.ArrayList; import java.util.EmptyStackException; diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/utils/InterviewToFilingInformationConverter.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/utils/InterviewToFilingInformationConverter.java index 9cefc7efe..1664e9c0f 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/utils/InterviewToFilingInformationConverter.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/utils/InterviewToFilingInformationConverter.java @@ -1,8 +1,8 @@ package edu.suffolk.litlab.efsp.utils; import com.hubspot.algebra.Result; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.FilingInformation; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; public abstract class InterviewToFilingInformationConverter { diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/db/DatabaseVersionTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/db/DatabaseVersionTest.java index 387bbdd1b..093c6bcf7 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/db/DatabaseVersionTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/db/DatabaseVersionTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.OptionalServiceCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.PartyType; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.OptionalServiceCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.PartyType; import edu.suffolk.litlab.efsp.utils.Hasher; import java.io.File; import java.io.FileInputStream; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverterTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverterTest.java index 6d4992e71..1eda2a460 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverterTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverterTest.java @@ -10,22 +10,22 @@ import com.hubspot.algebra.Result; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFields; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FileType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.FilingDoc; import edu.suffolk.litlab.efsp.model.FilingInformation; import edu.suffolk.litlab.efsp.model.Person; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; -import edu.suffolk.litlab.efsp.server.ecf4.tyler.TylerCodesParser; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFields; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FileType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.TylerCodesParser; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InterviewToFilingInformationConverter; import edu.suffolk.litlab.efsp.utils.InterviewVariable; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializerTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializerTest.java index 1623c1314..43f8d2e64 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializerTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializerTest.java @@ -13,19 +13,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; import ecf4.latest.gov.niem.niem.niem_core._2.MeasureType; import ecf4.latest.oasis.names.tc.legalxml_courtfiling.schema.xsd.courtpolicyresponsemessage_4.DevelopmentPolicyParametersType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFields; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DocumentTypeTableRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FileType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.OptionalServiceCode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.PartyId; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; -import edu.suffolk.litlab.efsp.server.ecf4.tyler.TylerCodesParser; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFields; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DocumentTypeTableRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FileType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.OptionalServiceCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.TylerCodesParser; import edu.suffolk.litlab.efsp.utils.FailFastCollector; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializerTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializerTest.java index 0cb993700..ff8491594 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializerTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializerTest.java @@ -9,15 +9,15 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import edu.suffolk.litlab.efsp.Jurisdiction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFields; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; import edu.suffolk.litlab.efsp.model.PartyId; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; -import edu.suffolk.litlab.efsp.server.ecf4.tyler.TylerCodesParser; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFields; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.TylerCodesParser; import edu.suffolk.litlab.efsp.utils.AllWrongCollector; import edu.suffolk.litlab.efsp.utils.FailFastCollector; import edu.suffolk.litlab.efsp.utils.FilingError; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeDatabaseTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeDatabaseTest.java index fd956aad6..7d7dd1ec7 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeDatabaseTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeDatabaseTest.java @@ -8,9 +8,16 @@ import edu.suffolk.litlab.efsp.Jurisdiction; import edu.suffolk.litlab.efsp.db.DatabaseCreator; import edu.suffolk.litlab.efsp.db.DatabaseVersionTest; -import edu.suffolk.litlab.efsp.ecfcodes.CodeUpdater; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeTableConstants; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeUpdater; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.OptionalServiceCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.ServiceCodeType; import java.sql.Connection; import java.sql.SQLException; import java.util.List; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/AddressTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/AddressTest.java index c112c6197..a3e751926 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/AddressTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/AddressTest.java @@ -12,10 +12,10 @@ import ecf4.latest.gov.niem.niem.niem_core._2.AddressType; import ecf4.latest.gov.niem.niem.niem_core._2.ProperNameTextType; import ecf4.latest.gov.niem.niem.niem_core._2.StructuredAddressType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; import edu.suffolk.litlab.efsp.model.Address; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; import edu.suffolk.litlab.efsp.server.ecf4.EcfCourtSpecificSerializer; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; import edu.suffolk.litlab.efsp.utils.FilingError; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCaseTypeFactoryTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCaseTypeFactoryTest.java index 2ac8279e3..39fcbffc1 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCaseTypeFactoryTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCaseTypeFactoryTest.java @@ -11,13 +11,13 @@ import ecf4.latest.gov.niem.niem.niem_core._2.ObjectFactory; import ecf4.latest.oasis.names.tc.legalxml_courtfiling.schema.xsd.caseresponsemessage_4.CaseResponseMessageType; import edu.suffolk.litlab.efsp.docassemble.DocassembleToFilingInformationConverter; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CrossReference; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; import edu.suffolk.litlab.efsp.model.FilingInformation; import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.Person; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CrossReference; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; import edu.suffolk.litlab.efsp.utils.FailFastCollector; import edu.suffolk.litlab.efsp.utils.FilingError; import edu.suffolk.litlab.efsp.utils.InfoCollector; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java index f1a5062f9..79bbb1e89 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java @@ -14,24 +14,24 @@ import ecf4.latest.oasis.names.tc.legalxml_courtfiling.schema.xsd.commontypes_4.PersonType; import ecf4.latest.tyler.ecf.extensions.common.CapabilityType; import edu.suffolk.litlab.efsp.docassemble.FilingDocDocassembleJacksonDeserializer; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CrossReference; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFields; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FileType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.PartyType; import edu.suffolk.litlab.efsp.model.ContactInformation; import edu.suffolk.litlab.efsp.model.Name; import edu.suffolk.litlab.efsp.model.PartyId; import edu.suffolk.litlab.efsp.model.PartyInfo; import edu.suffolk.litlab.efsp.model.Person; import edu.suffolk.litlab.efsp.model.Person.Gender; -import edu.suffolk.litlab.efsp.server.ecf4.tyler.TylerCodesParser; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CrossReference; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFields; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FileType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.PartyType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.TylerCodesParser; import edu.suffolk.litlab.efsp.utils.AllWrongCollector; import edu.suffolk.litlab.efsp.utils.FailFastCollector; import edu.suffolk.litlab.efsp.utils.FilingError; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/tyler/TylerCodesParserTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/tyler/TylerCodesParserTest.java index dae548b80..0f18fa6a8 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/tyler/TylerCodesParserTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/tyler/TylerCodesParserTest.java @@ -5,28 +5,29 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseCategory; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CaseType; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CrossReference; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFieldRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DataFields; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.DocumentTypeTableRow; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.NameAndCode; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.OptionalServiceCode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.BadCode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.NoMatchingCode; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.NoMatchingRef; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.NoMultipleAttorneys; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.RequiredCodeNotPresent; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.TooLongVar; +import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.WrongRefVal; +import edu.suffolk.litlab.efsp.ecfcodes.NameAndCode; import edu.suffolk.litlab.efsp.model.OptionalService; import edu.suffolk.litlab.efsp.model.PartyId; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.BadCode; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.NoMatchingCode; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.NoMatchingRef; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.NoMultipleAttorneys; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.RequiredCodeNotPresent; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.TooLongVar; -import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.WrongRefVal; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseCategory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CaseType; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CrossReference; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFieldRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DataFields; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.DocumentTypeTableRow; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.OptionalServiceCode; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.TylerCodesParser; import edu.suffolk.litlab.efsp.utils.FilingError; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/services/AdminUserServiceTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/services/AdminUserServiceTest.java index 97ec6cb56..901604754 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/services/AdminUserServiceTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/services/AdminUserServiceTest.java @@ -11,14 +11,14 @@ import edu.suffolk.litlab.efsp.Jurisdiction; import edu.suffolk.litlab.efsp.db.LoginDatabase; import edu.suffolk.litlab.efsp.db.model.AtRest; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; import edu.suffolk.litlab.efsp.server.EfspServer; import edu.suffolk.litlab.efsp.tyler.TylerClients; import edu.suffolk.litlab.efsp.tyler.TylerFirmClient; import edu.suffolk.litlab.efsp.tyler.TylerFirmFactory; import edu.suffolk.litlab.efsp.tyler.TylerUserClient; import edu.suffolk.litlab.efsp.tyler.TylerUserFactory; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import java.util.List; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/services/CodesServiceTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/services/CodesServiceTest.java index cfcc28ff3..4039380b4 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/services/CodesServiceTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/services/CodesServiceTest.java @@ -10,11 +10,11 @@ import edu.suffolk.litlab.efsp.Jurisdiction; import edu.suffolk.litlab.efsp.db.DatabaseCreator; import edu.suffolk.litlab.efsp.db.DatabaseVersionTest; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; import edu.suffolk.litlab.efsp.server.EfspServer; import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers; import edu.suffolk.litlab.efsp.tyler.TylerDomain; import edu.suffolk.litlab.efsp.tyler.TylerEnv; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import java.util.List; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallbackTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallbackTest.java index 2e9434aaf..5317b868a 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallbackTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallbackTest.java @@ -18,12 +18,12 @@ import ecf4.latest.tyler.ecf.extensions.common.ReviewedDocumentType; import edu.suffolk.litlab.efsp.db.UserDatabase; import edu.suffolk.litlab.efsp.db.model.Transaction; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeDatabase; -import edu.suffolk.litlab.efsp.ecfcodes.tyler.CourtLocationInfo; import edu.suffolk.litlab.efsp.server.ecf4.Ecf4Helper; import edu.suffolk.litlab.efsp.server.ecf4.ReviewedFilingExamples; import edu.suffolk.litlab.efsp.server.services.api.UpdateMessageStatus; import edu.suffolk.litlab.efsp.server.utils.OrgMessageSender; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CodeDatabase; +import edu.suffolk.litlab.efsp.tyler.ecfcodes.CourtLocationInfo; import java.sql.SQLException; import java.time.LocalDate; import java.util.Optional; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityHeadersInterceptorTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityHeadersInterceptorTest.java index caea8ce06..051688701 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityHeadersInterceptorTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/utils/ObservabilityHeadersInterceptorTest.java @@ -3,6 +3,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import edu.suffolk.litlab.efsp.server.logging.MDCWrappers; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.core.MultivaluedHashMap; import java.io.IOException;