Skip to content

Commit 39318e0

Browse files
BryceStevenWilleyBryceStevenWilley
committed
Moving classes and packages around
So they make at least a little more sense than they do now.
1 parent 44a22dd commit 39318e0

82 files changed

Lines changed: 456 additions & 363 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/LoginDatabase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package edu.suffolk.litlab.efsp.db;
22

33
import edu.suffolk.litlab.efsp.db.model.AtRest;
4-
import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeTableConstants;
5-
import edu.suffolk.litlab.efsp.server.utils.MDCWrappers;
4+
import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils;
5+
import edu.suffolk.litlab.efsp.server.logging.MDCWrappers;
66
import edu.suffolk.litlab.efsp.stdlib.RandomString;
77
import edu.suffolk.litlab.efsp.utils.Hasher;
88
import java.sql.Connection;
@@ -65,7 +65,7 @@ public void createTablesIfAbsent() throws SQLException {
6565

6666
String tableName = "at_rest_keys";
6767
String createQuery = atRestCreate;
68-
String tableExistsQuery = CodeTableConstants.getTableExists();
68+
String tableExistsQuery = CodeDatabaseUtils.getTableExists();
6969
try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) {
7070
existsSt.setString(1, tableName);
7171
ResultSet rs = existsSt.executeQuery();
@@ -84,7 +84,7 @@ public void createTablesIfAbsent() throws SQLException {
8484

8585
public boolean tablesExist() throws SQLException {
8686
String tableName = "at_rest_keys";
87-
String tableExistsQuery = CodeTableConstants.getTableExists();
87+
String tableExistsQuery = CodeDatabaseUtils.getTableExists();
8888
try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) {
8989
existsSt.setString(1, tableName);
9090
ResultSet rs = existsSt.executeQuery();

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/MessageSettingsDatabase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package edu.suffolk.litlab.efsp.db;
22

33
import edu.suffolk.litlab.efsp.db.model.MessageInfo;
4-
import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeTableConstants;
4+
import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils;
55
import java.sql.Connection;
66
import java.sql.PreparedStatement;
77
import java.sql.ResultSet;
@@ -36,7 +36,7 @@ public void createTablesIfAbsent() throws SQLException {
3636
throw new SQLException();
3737
}
3838

39-
String tableExistsQuery = CodeTableConstants.getTableExists();
39+
String tableExistsQuery = CodeDatabaseUtils.getTableExists();
4040
try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) {
4141
existsSt.setString(1, "message_settings");
4242
ResultSet rs = existsSt.executeQuery();

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/db/UserDatabase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package edu.suffolk.litlab.efsp.db;
22

33
import edu.suffolk.litlab.efsp.db.model.Transaction;
4-
import edu.suffolk.litlab.efsp.ecfcodes.tyler.CodeTableConstants;
4+
import edu.suffolk.litlab.efsp.ecfcodes.CodeDatabaseUtils;
55
import edu.suffolk.litlab.efsp.model.EmailTemplates;
66
import java.sql.Connection;
77
import java.sql.PreparedStatement;
@@ -42,7 +42,7 @@ public static UserDatabase fromDS(DataSource ds) {
4242

4343
/** Creates the userdatabase table if it doesn't exist yet. */
4444
public void createTablesIfAbsent() throws SQLException {
45-
String tableExistsQuery = CodeTableConstants.getTableExists();
45+
String tableExistsQuery = CodeDatabaseUtils.getTableExists();
4646
try (PreparedStatement existsSt = conn.prepareStatement(tableExistsQuery)) {
4747
existsSt.setString(1, "submitted_filings");
4848
ResultSet rs = existsSt.executeQuery();

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/AddressDocassembleJacksonDeserializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package edu.suffolk.litlab.efsp.docassemble;
22

33
import com.fasterxml.jackson.databind.JsonNode;
4+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser;
45
import edu.suffolk.litlab.efsp.model.Address;
5-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser;
66
import edu.suffolk.litlab.efsp.utils.FilingError;
77
import edu.suffolk.litlab.efsp.utils.InfoCollector;
88
import edu.suffolk.litlab.efsp.utils.InterviewVariable;

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/DocassembleToFilingInformationConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import com.fasterxml.jackson.databind.module.SimpleModule;
66
import com.hubspot.algebra.Result;
7+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser;
78
import edu.suffolk.litlab.efsp.model.FilingInformation;
8-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser;
99
import edu.suffolk.litlab.efsp.tyler.TylerEnv;
1010
import edu.suffolk.litlab.efsp.utils.FilingError;
1111
import edu.suffolk.litlab.efsp.utils.InfoCollector;

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingDocDocassembleJacksonDeserializer.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010

1111
import com.fasterxml.jackson.databind.JsonNode;
1212
import com.hubspot.algebra.Result;
13-
import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode;
14-
import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingComponent;
13+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser;
14+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.CodeError;
15+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.FileExtensionNotAllowed;
16+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.FileNameTextError;
17+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.InputOptionalService;
18+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.TextVarError;
1519
import edu.suffolk.litlab.efsp.model.FilingAction;
1620
import edu.suffolk.litlab.efsp.model.FilingAttachment;
1721
import edu.suffolk.litlab.efsp.model.FilingDoc;
1822
import edu.suffolk.litlab.efsp.model.OptionalService;
1923
import edu.suffolk.litlab.efsp.model.PartyId;
20-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser;
21-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.CodeError;
22-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.FileExtensionNotAllowed;
23-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.FileNameTextError;
24-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.InputOptionalService;
25-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.TextVarError;
24+
import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode;
25+
import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingComponent;
2626
import edu.suffolk.litlab.efsp.utils.FilingError;
2727
import edu.suffolk.litlab.efsp.utils.InfoCollector;
2828
import edu.suffolk.litlab.efsp.utils.InterviewVariable;

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/FilingInformationDocassembleJacksonDeserializer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
1212
import com.fasterxml.jackson.databind.node.NullNode;
1313
import com.hubspot.algebra.Result;
14-
import edu.suffolk.litlab.efsp.ecfcodes.tyler.FilingCode;
14+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser;
15+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.AttorneyError;
16+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.NoMultipleAttorneys;
17+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser.RequiredAttorneys;
1518
import edu.suffolk.litlab.efsp.model.CaseServiceContact;
1619
import edu.suffolk.litlab.efsp.model.EmailTemplates;
1720
import edu.suffolk.litlab.efsp.model.FilingDoc;
1821
import edu.suffolk.litlab.efsp.model.FilingInformation;
1922
import edu.suffolk.litlab.efsp.model.LowerCourtInfo;
2023
import edu.suffolk.litlab.efsp.model.PartyId;
2124
import edu.suffolk.litlab.efsp.model.Person;
22-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser;
23-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.AttorneyError;
24-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.NoMultipleAttorneys;
25-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser.RequiredAttorneys;
2625
import edu.suffolk.litlab.efsp.tyler.TylerEnv;
26+
import edu.suffolk.litlab.efsp.tyler.ecfcodes.FilingCode;
2727
import edu.suffolk.litlab.efsp.utils.FilingError;
2828
import edu.suffolk.litlab.efsp.utils.InfoCollector;
2929
import edu.suffolk.litlab.efsp.utils.InterviewVariable;

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/NameDocassembleDeserializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import com.fasterxml.jackson.databind.JsonNode;
77
import com.fasterxml.jackson.databind.node.NullNode;
8+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser;
89
import edu.suffolk.litlab.efsp.model.Name;
9-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser;
1010
import edu.suffolk.litlab.efsp.utils.FilingError;
1111
import edu.suffolk.litlab.efsp.utils.InfoCollector;
1212
import edu.suffolk.litlab.efsp.utils.InterviewVariable;

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/docassemble/PersonDocassembleJacksonDeserializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
import com.fasterxml.jackson.databind.JsonNode;
99
import com.hubspot.algebra.Result;
10+
import edu.suffolk.litlab.efsp.ecfcodes.CodesParser;
1011
import edu.suffolk.litlab.efsp.model.Address;
1112
import edu.suffolk.litlab.efsp.model.ContactInformation;
1213
import edu.suffolk.litlab.efsp.model.Name;
1314
import edu.suffolk.litlab.efsp.model.Person;
1415
import edu.suffolk.litlab.efsp.model.Person.Gender;
15-
import edu.suffolk.litlab.efsp.server.ecf4.CodesParser;
1616
import edu.suffolk.litlab.efsp.utils.FilingError;
1717
import edu.suffolk.litlab.efsp.utils.InfoCollector;
1818
import java.time.LocalDate;

proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/tyler/CodeAndLocation.java renamed to proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeAndLocation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package edu.suffolk.litlab.efsp.ecfcodes.tyler;
1+
package edu.suffolk.litlab.efsp.ecfcodes;
22

33
/**
4-
* The code and location for a Tyler code.
4+
* The code and location for an ECF code.
55
*
66
* <p>Returned by the various "search" APIs; you search for all codes with "XYZ" in the name, and
77
* then do `/filing_code_names/XYZ` to get the code and location, enough to find all of the

0 commit comments

Comments
 (0)