Skip to content

Commit bfc49f2

Browse files
BryceStevenWilleyBryceStevenWilley
committed
Getting rid of unnecessary calls to removeAllMDCs()
All of them will happen in the ObservabilityResetInterceptor now.
1 parent d08f855 commit bfc49f2

File tree

9 files changed

+338
-466
lines changed

9 files changed

+338
-466
lines changed

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import edu.suffolk.litlab.efsp.server.setup.tyler.TylerModuleSetup;
2525
import edu.suffolk.litlab.efsp.server.utils.HttpsCallbackHandler;
2626
import edu.suffolk.litlab.efsp.server.utils.JsonExceptionMapper;
27-
import edu.suffolk.litlab.efsp.server.utils.ObservabilityResetInterceptor;
2827
import edu.suffolk.litlab.efsp.server.utils.ObservabilityHeadersInterceptor;
28+
import edu.suffolk.litlab.efsp.server.utils.ObservabilityResetInterceptor;
2929
import edu.suffolk.litlab.efsp.server.utils.OrgMessageSender;
3030
import edu.suffolk.litlab.efsp.server.utils.SendMessage;
3131
import edu.suffolk.litlab.efsp.server.utils.ServiceHelpers;

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AdminUserService.java‎

Lines changed: 307 additions & 385 deletions
Large diffs are not rendered by default.

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/ApiUserSettingsService.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import edu.suffolk.litlab.efsp.db.LoginDatabase;
44
import edu.suffolk.litlab.efsp.db.model.AtRest;
55
import edu.suffolk.litlab.efsp.server.utils.EndpointReflection;
6-
import edu.suffolk.litlab.efsp.server.utils.MDCWrappers;
76
import jakarta.ws.rs.GET;
87
import jakarta.ws.rs.POST;
98
import jakarta.ws.rs.Path;
@@ -47,8 +46,6 @@ public Response getName(@Context HttpHeaders httpHeaders) {
4746
return Response.ok("\"" + atRest.get().serverName + "\"").build();
4847
} catch (SQLException ex) {
4948
return Response.status(500).build();
50-
} finally {
51-
MDCWrappers.removeAllMDCs();
5249
}
5350
}
5451

@@ -63,8 +60,6 @@ public Response getServerId(@Context HttpHeaders httpHeaders) {
6360
return Response.ok("\"" + atRest.get().serverId + "\"").build();
6461
} catch (SQLException ex) {
6562
return Response.status(500).build();
66-
} finally {
67-
MDCWrappers.removeAllMDCs();
6863
}
6964
}
7065

@@ -81,8 +76,6 @@ public Response changeName(@Context HttpHeaders httpHeaders, String newName) {
8176
return Response.ok("\"" + newName + "\"").build();
8277
} catch (SQLException ex) {
8378
return Response.status(500).build();
84-
} finally {
85-
MDCWrappers.removeAllMDCs();
8679
}
8780
}
8881

@@ -104,8 +97,6 @@ public Response getLogs(@Context HttpHeaders httpHeaders) {
10497
.build();
10598
} catch (SQLException ex) {
10699
return Response.status(500).build();
107-
} finally {
108-
MDCWrappers.removeAllMDCs();
109100
}
110101
}
111102
}

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/AuthenticationService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ public Response authenticateUser(String loginInfo) {
7474
}
7575
log.info("Invoking User Auth for an apiKey");
7676
Optional<NewTokens> activeToken = security.login(apiKey, loginInfo);
77-
MDCWrappers.removeAllMDCs();
7877
return activeToken
7978
.map((toks) -> Response.ok(toks).build())
8079
.orElse(Response.status(403).build());

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/CasesService.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ public Response getCaseList(
232232
CaseListResponseMessageType resp = maybePort.get().getCaseList(query);
233233
log.info(Ecf4Helper.objectToXmlStrOrError(resp, CaseListResponseMessageType.class));
234234

235-
MDCWrappers.removeAllMDCs();
236235
if (hasError(resp)) {
237236
// If the response has issues connecting with the CMS, we are still supposed to allow
238237
// for case search / e-filing. So, we'll return an error with the error code, but also any
@@ -256,7 +255,6 @@ public Response getCase(
256255
MDC.put(MDCWrappers.OPERATION, "CasesService.getCase");
257256
Optional<CourtRecordMDEPort> maybePort = setupRecordPort(httpHeaders);
258257
if (maybePort.isEmpty()) {
259-
MDCWrappers.removeAllMDCs();
260258
return Response.status(401).build();
261259
}
262260

@@ -312,8 +310,6 @@ public Response getCase(
312310
} catch (SQLException e) {
313311
log.error("can't get connection: ", e);
314312
return Response.status(500).build();
315-
} finally {
316-
MDCWrappers.removeAllMDCs();
317313
}
318314
}
319315

@@ -356,7 +352,6 @@ public Response getServiceAttachCaseList(
356352
query.setSendingMDELocationID(Ecf4Helper.convertId(ServiceHelpers.SERVICE_URL));
357353
query.setSendingMDEProfileCode(ServiceHelpers.MDE_PROFILE_CODE);
358354
ServiceAttachCaseListResponseMessageType resp = maybePort.get().getServiceAttachCaseList(query);
359-
MDCWrappers.removeAllMDCs();
360355
if (hasError(resp)) {
361356
return Response.status(400).entity(resp.getError()).build();
362357
}
@@ -385,7 +380,6 @@ public Response getServiceInformation(
385380
query.setSendingMDELocationID(Ecf4Helper.convertId(ServiceHelpers.SERVICE_URL));
386381
query.setSendingMDEProfileCode(ServiceHelpers.MDE_PROFILE_CODE);
387382
ServiceInformationResponseMessageType resp = maybePort.get().getServiceInformation(query);
388-
MDCWrappers.removeAllMDCs();
389383
if (hasError(resp)) {
390384
return Response.status(400).entity(resp.getError()).build();
391385
}
@@ -415,7 +409,6 @@ public Response getServiceInformationHistory(
415409
query.setSendingMDEProfileCode(ServiceHelpers.MDE_PROFILE_CODE);
416410
ServiceInformationHistoryResponseMessageType resp =
417411
maybePort.get().getServiceInformationHistory(query);
418-
MDCWrappers.removeAllMDCs();
419412
if (hasError(resp)) {
420413
return Response.status(400).entity(resp.getError()).build();
421414
}
@@ -447,7 +440,6 @@ private Optional<CourtRecordMDEPort> setupRecordPort(HttpHeaders httpHeaders) {
447440
Optional<TylerUserNamePassword> creds = ServiceHelpers.userCredsFromAuthorization(tylerToken);
448441
if (creds.isEmpty()) {
449442
log.warn("No creds?");
450-
MDCWrappers.removeAllMDCs();
451443
return Optional.empty();
452444
}
453445

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FilingReviewService.java‎

Lines changed: 30 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ public Response getFilingStatus(
133133
return Response.status(401).entity("Not logged in to file with " + courtId).build();
134134
}
135135
var toRet = filer.getFilingStatus(courtId, filingId, activeToken.get());
136-
MDCWrappers.removeAllMDCs();
137136
return toRet;
138137
}
139138

@@ -167,51 +166,45 @@ public Response getFilingList(
167166
"Dates given were incorrect, should be of the form: yyyy-MM-dd (ISO_LOCAL_DATE): "
168167
+ ex)
169168
.build();
170-
} finally {
171-
MDCWrappers.removeAllMDCs();
172169
}
173170
}
174171

175172
@GET
176173
@Path("/courts/{court_id}/filing/check")
177174
public Response checkFilingForReview(
178175
@Context HttpHeaders httpHeaders, @PathParam("court_id") String courtId, String allVars) {
179-
try {
180-
MDC.put(MDCWrappers.OPERATION, "FilingReviewService.checkFilingForReview");
181-
MediaType mediaType = httpHeaders.getMediaType();
182-
if (mediaType == null) {
183-
mediaType = MediaType.valueOf("application/json");
184-
}
185-
Result<EfmFilingInterface, Response> checked = checkFilingInterfaces(courtId);
186-
if (checked.isErr()) {
187-
return checked.unwrapErrOrElseThrow();
188-
}
189-
EfmFilingInterface filer = checked.unwrapOrElseThrow();
190-
Optional<String> activeToken = getActiveToken(httpHeaders, filer.getHeaderKey());
191-
if (activeToken.isEmpty()) {
192-
return Response.status(401).entity("Not logged in to file with " + courtId).build();
193-
}
194-
if (!converterMap.containsKey(mediaType.toString())) {
195-
return Response.status(415).entity("We only support " + converterMap.keySet()).build();
196-
}
197-
InfoCollector collector = new NeverSubmitCollector();
198-
Result<FilingInformation, FilingError> res =
199-
converterMap.get(mediaType.toString()).traverseInterview(allVars, collector);
200-
if (res.isErr()) {
201-
log.error("Error on traverseInterview: {}", res.toString());
202-
return Response.status(400).entity(collector.jsonSummary()).build();
203-
}
204-
FilingInformation info = res.unwrapOrElseThrow();
205-
info.setCourtLocation(courtId);
206-
Result<NullValue, FilingError> resEfm = filer.checkFiling(info, activeToken.get(), collector);
207-
if (resEfm.isErr()) {
208-
log.error("Error on checkFiling: {}", resEfm.toString());
209-
return Response.ok(collector.jsonSummary()).build();
210-
}
176+
MDC.put(MDCWrappers.OPERATION, "FilingReviewService.checkFilingForReview");
177+
MediaType mediaType = httpHeaders.getMediaType();
178+
if (mediaType == null) {
179+
mediaType = MediaType.valueOf("application/json");
180+
}
181+
Result<EfmFilingInterface, Response> checked = checkFilingInterfaces(courtId);
182+
if (checked.isErr()) {
183+
return checked.unwrapErrOrElseThrow();
184+
}
185+
EfmFilingInterface filer = checked.unwrapOrElseThrow();
186+
Optional<String> activeToken = getActiveToken(httpHeaders, filer.getHeaderKey());
187+
if (activeToken.isEmpty()) {
188+
return Response.status(401).entity("Not logged in to file with " + courtId).build();
189+
}
190+
if (!converterMap.containsKey(mediaType.toString())) {
191+
return Response.status(415).entity("We only support " + converterMap.keySet()).build();
192+
}
193+
InfoCollector collector = new NeverSubmitCollector();
194+
Result<FilingInformation, FilingError> res =
195+
converterMap.get(mediaType.toString()).traverseInterview(allVars, collector);
196+
if (res.isErr()) {
197+
log.error("Error on traverseInterview: {}", res.toString());
198+
return Response.status(400).entity(collector.jsonSummary()).build();
199+
}
200+
FilingInformation info = res.unwrapOrElseThrow();
201+
info.setCourtLocation(courtId);
202+
Result<NullValue, FilingError> resEfm = filer.checkFiling(info, activeToken.get(), collector);
203+
if (resEfm.isErr()) {
204+
log.error("Error on checkFiling: {}", resEfm.toString());
211205
return Response.ok(collector.jsonSummary()).build();
212-
} finally {
213-
MDCWrappers.removeAllMDCs();
214206
}
207+
return Response.ok(collector.jsonSummary()).build();
215208
}
216209

217210
@POST
@@ -241,13 +234,11 @@ public Response calculateFilingFees(
241234
converterMap.get(mediaType.toString()).traverseInterview(allVars, collector);
242235
if (res.isErr()) {
243236
log.error("Error when calculating filing fees: {}", res.toString());
244-
MDCWrappers.removeAllMDCs();
245237
return Response.status(400).entity(collector.jsonSummary()).build();
246238
}
247239
FilingInformation info = res.unwrapOrElseThrow();
248240
info.setCourtLocation(courtId);
249241
Result<Response, FilingError> fees = filer.getFilingFees(info, activeToken.get());
250-
MDCWrappers.removeAllMDCs();
251242
return fees.match(err -> Response.status(400).entity(err.toJson()).build(), respon -> respon);
252243
}
253244

@@ -271,20 +262,17 @@ public Response getServiceTypes(
271262
return Response.status(401).entity("Not logged in to file with " + courtId).build();
272263
}
273264
if (!converterMap.containsKey(mediaType.toString())) {
274-
MDCWrappers.removeAllMDCs();
275265
return Response.status(415).entity("We only support " + converterMap.keySet()).build();
276266
}
277267
InfoCollector collector = new FailFastCollector();
278268
Result<FilingInformation, FilingError> res =
279269
converterMap.get(mediaType.toString()).traverseInterview(allVars, collector);
280270
if (res.isErr()) {
281-
MDCWrappers.removeAllMDCs();
282271
return Response.status(400).entity(collector.jsonSummary()).build();
283272
}
284273
FilingInformation info = res.unwrapOrElseThrow();
285274
info.setCourtLocation(courtId);
286275
Result<Response, FilingError> fees = filer.getServiceTypes(info, activeToken.get());
287-
MDCWrappers.removeAllMDCs();
288276
return fees.match(err -> Response.status(400).entity(err.toJson()).build(), respon -> respon);
289277
}
290278

@@ -304,7 +292,6 @@ public Response getPolicy(
304292
}
305293

306294
var toRet = filer.getPolicy(courtId, activeToken.get());
307-
MDCWrappers.removeAllMDCs();
308295
return toRet;
309296
}
310297

@@ -319,7 +306,6 @@ public Response filingUpdateWebhook(
319306
return Response.status(404).entity("Court " + courtId + " doesn't exist").build();
320307
}
321308
var toRet = callbackInterfaces.get(courtId).statusCallback(httpHeaders, statusReport);
322-
MDCWrappers.removeAllMDCs();
323309
return toRet;
324310
}
325311

@@ -341,7 +327,6 @@ public Response submitFilingForReview(
341327
@Context HttpHeaders httpHeaders, @PathParam("court_id") String courtId, String allVars) {
342328
MDC.put(MDCWrappers.OPERATION, "FilingReviewService.submitFilingForReview");
343329
var toRet = fileOrServe(httpHeaders, courtId, allVars, EfmFilingInterface.ApiChoice.FileApi);
344-
MDCWrappers.removeAllMDCs();
345330
return toRet;
346331
}
347332

@@ -500,7 +485,6 @@ public Response getFilingDetails(
500485
}
501486
return filer.getFilingDetails(courtId, filingId, activeToken.get());
502487
} finally {
503-
MDCWrappers.removeAllMDCs();
504488
}
505489
}
506490

@@ -522,7 +506,6 @@ public Response getFilingService(
522506
return Response.status(401).entity("Not logged in to file with " + courtId).build();
523507
}
524508
var toRet = filer.getFilingService(courtId, filingId, contactId, activeToken.get());
525-
MDCWrappers.removeAllMDCs();
526509
return toRet;
527510
}
528511

@@ -543,7 +526,6 @@ public Response cancelFiling(
543526
return Response.status(401).entity("Not logged in to file with " + courtId).build();
544527
}
545528
var toRet = filer.cancelFiling(courtId, filingId, activeToken.get());
546-
MDCWrappers.removeAllMDCs();
547529
return toRet;
548530
}
549531

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/FirmAttorneyAndServiceService.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,14 +356,11 @@ public Response createServiceContact(@Context HttpHeaders httpHeaders, String st
356356
CreateServiceContactResponseType resp = firmPort.get().createServiceContact(req);
357357
log.info("Got response: {}", resp.getError().getErrorCode());
358358
log.info("Got response id: {}", resp.getServiceContactID());
359-
MDCWrappers.removeAllMDCs();
360359
return makeResponse(
361360
resp, () -> Response.ok("\"" + resp.getServiceContactID() + "\"").build());
362361
} catch (JsonProcessingException ex) {
363362
log.info("JsonProcessingException: ", ex);
364363
return Response.status(400).entity("\"Cannot read service contact input\"").build();
365-
} finally {
366-
MDCWrappers.removeAllMDCs();
367364
}
368365
}
369366

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/services/MessageSettingsService.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ public Response getMsgSettings(@Context HttpHeaders httpHeaders) {
6565
} catch (SQLException ex) {
6666
log.error("Couldn't get email settings for server: ", ex);
6767
return Response.status(500).build();
68-
} finally {
69-
MDCWrappers.removeAllMDCs();
7068
}
7169
}
7270

@@ -85,7 +83,6 @@ public Response setMsgSettings(@Context HttpHeaders httpHeaders, String newInfoS
8583
return Response.status(401).entity("\"Not logged in to efile\"").build();
8684
}
8785
if (newInfoStr == null || newInfoStr.isBlank()) {
88-
MDCWrappers.removeAllMDCs();
8986
return Response.status(200).build();
9087
}
9188
ObjectMapper mapper = new ObjectMapper();
@@ -111,8 +108,6 @@ public Response setMsgSettings(@Context HttpHeaders httpHeaders, String newInfoS
111108
} catch (SQLException ex) {
112109
log.error("Error when trying to update settings: ", ex);
113110
return Response.status(500).build();
114-
} finally {
115-
MDCWrappers.removeAllMDCs();
116111
}
117112
}
118113
}

‎proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/OasisEcfWsCallback.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ public MessageReceiptMessageType notifyFilingReviewComplete(
259259
Ecf4Helper.setupReplys(reply);
260260
if (msg == null) {
261261
log.error("Tyler sent a null message! Why??");
262-
MDCWrappers.removeAllMDCs();
263262
return error(reply, "705", "NotifyFilingReviewComplete message not found");
264263
}
265264

@@ -284,7 +283,6 @@ public MessageReceiptMessageType notifyFilingReviewComplete(
284283
// This shouldn't happen, but I don't trust this XML BS
285284
if (payment == null || revFiling == null) {
286285
log.error("Tyler sent a message w/o filing review or payment receipt? Full msg: {}", msg);
287-
MDCWrappers.removeAllMDCs();
288286
return error(reply, "705", "NotifyFilingReviewComplete message not found");
289287
}
290288

@@ -305,7 +303,6 @@ public MessageReceiptMessageType notifyFilingReviewComplete(
305303
}
306304
if (filingId.isBlank()) {
307305
log.error("Got back a review filing that has a blank / no FILINGID? {}", revFiling);
308-
MDCWrappers.removeAllMDCs();
309306
return error(reply, "720", "Filing code not found in message");
310307
}
311308
Optional<CaseAugmentationType> jAug =
@@ -331,7 +328,6 @@ public MessageReceiptMessageType notifyFilingReviewComplete(
331328
log.error("Couldn't connect to SQL DB to get transaction", e);
332329
return error(reply, "-1", "Server error");
333330
} finally {
334-
MDCWrappers.removeAllMDCs();
335331
}
336332
Transaction trans = maybeTrans.get();
337333

@@ -359,7 +355,6 @@ public MessageReceiptMessageType notifyFilingReviewComplete(
359355
courtId,
360356
courtIdFromMsg,
361357
trans.courtId);
362-
MDCWrappers.removeAllMDCs();
363358
return error(reply, "70", "Location " + courtId + " not found");
364359
}
365360
} catch (SQLException ex) {
@@ -385,7 +380,6 @@ public MessageReceiptMessageType notifyFilingReviewComplete(
385380
if (!success) {
386381
log.error("Couldn't properly send message for transaction ID {}!", trans.transactionId);
387382
}
388-
MDCWrappers.removeAllMDCs();
389383
return ok(reply);
390384
}
391385

0 commit comments

Comments
 (0)