Skip to content

Commit be1992b

Browse files
Get rid of filter attribute when parsing people
And other misc diamond operators. Found when working on the REST guide.
1 parent 33c3a30 commit be1992b

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,11 @@ public FilingInformationDocassembleJacksonDeserializer(
5555
* @param topObj
5656
* @param potentialMember
5757
* @param collector
58-
* @param filterFlag: the person will be skipped if that attribute is set to false.
5958
* @return
6059
* @throws FilingError
6160
*/
6261
private static List<Person> collectPeople(
63-
JsonNode topObj, String potentialMember, InfoCollector collector, String filterFlag)
64-
throws FilingError {
62+
JsonNode topObj, String potentialMember, InfoCollector collector) throws FilingError {
6563
if (!topObj.has(potentialMember)) {
6664
return List.of(); // Just an empty list: we don't know if it's required
6765
}
@@ -70,16 +68,10 @@ private static List<Person> collectPeople(
7068
throw FilingError.malformedInterview(
7169
potentialMember + " isn't an List with an array attribute called '.elements'");
7270
}
73-
List<Person> people = new ArrayList<Person>();
71+
List<Person> people = new ArrayList<>();
7472
JsonNode peopleElements = maybePplElements.get();
7573
for (int i = 0; i < peopleElements.size(); i++) {
7674
JsonNode personJson = peopleElements.get(i);
77-
if (filterFlag != null && !filterFlag.isBlank()) {
78-
// Assume not setting filterFlag is the same as it being false (i.e. skipping)
79-
if (!personJson.has(filterFlag) || !personJson.get(filterFlag).asBoolean(false)) {
80-
continue;
81-
}
82-
}
8375
collector.pushAttributeStack(potentialMember + "[" + i + "]");
8476
Result<Person, FilingError> per =
8577
PersonDocassembleJacksonDeserializer.fromNode(personJson, collector);
@@ -106,8 +98,8 @@ public FilingInformation fromNode(JsonNode node, InfoCollector collector) throws
10698
entities.setCaseDocketNumber(extractNullableString(node.get("docket_number")));
10799
boolean isFirstIndexedFiling = entities.getPreviousCaseId().isEmpty();
108100

109-
List<Person> users = collectPeople(node, "users", collector, "");
110-
List<Person> otherParties = collectPeople(node, "other_parties", collector, "");
101+
List<Person> users = collectPeople(node, "users", collector);
102+
List<Person> otherParties = collectPeople(node, "other_parties", collector);
111103

112104
var varToPartyId = new HashMap<String, PartyId>();
113105
int perIdx = 0;
@@ -314,7 +306,7 @@ public FilingInformation fromNode(JsonNode node, InfoCollector collector) throws
314306
}
315307

316308
private static List<String> extractAttorneyIds(JsonNode attorneyIdsJson) {
317-
List<String> ids = new ArrayList<String>();
309+
List<String> ids = new ArrayList<>();
318310
if (attorneyIdsJson != null && attorneyIdsJson.isArray()) {
319311
attorneyIdsJson.elements().forEachRemaining(jId -> ids.add(jId.asText()));
320312
}

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
@@ -96,10 +96,10 @@ public static Result<Person, FilingError> fromNode(JsonNode node, InfoCollector
9696
}
9797
String partyType = partyJson.asText("");
9898

99+
boolean isFormFiller = getBoolMember(node, "is_form_filler").orElse(false);
99100
Optional<String> language = getStringMember(node, "prefered_language");
100101
Optional<String> gender = getStringMember(node, "gender");
101102
Optional<String> birthdateString = getStringMember(node, "date_of_birth");
102-
boolean isFormFiller = getBoolMember(node, "is_form_filler").orElse(false);
103103
Optional<LocalDate> birthdate =
104104
birthdateString
105105
.map(

0 commit comments

Comments
 (0)