From ed5a5f2b5c7b92b5f5605f70bc2169fbf86bd397 Mon Sep 17 00:00:00 2001 From: Kateryna_Senchenko Date: Tue, 3 Mar 2026 18:12:24 +0200 Subject: [PATCH] MODDATAIMP-1174 Clean up sensitive data --- src/main/java/org/folio/rest/impl/DataImportImpl.java | 9 ++++----- .../folio/service/file/SplitFileProcessingService.java | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/folio/rest/impl/DataImportImpl.java b/src/main/java/org/folio/rest/impl/DataImportImpl.java index 25072b17..7d4755f9 100644 --- a/src/main/java/org/folio/rest/impl/DataImportImpl.java +++ b/src/main/java/org/folio/rest/impl/DataImportImpl.java @@ -115,7 +115,7 @@ public void getDataImportUploadDefinitions(String query, String totalRecords, in Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(c -> { try { - LOGGER.debug("getDataImportUploadDefinitions:: query {}", query); + LOGGER.debug("getDataImportUploadDefinitions:: getting data import UploadDefinitions"); String preparedQuery = addCreatedByConditionToCqlQuery(query, okapiHeaders); uploadDefinitionService.getUploadDefinitions(preparedQuery, offset, limit, tenantId) .map(GetDataImportUploadDefinitionsResponse::respond200WithApplicationJson) @@ -123,7 +123,7 @@ public void getDataImportUploadDefinitions(String query, String totalRecords, in .otherwise(ExceptionHelper::mapExceptionToResponse) .onComplete(asyncResultHandler); } catch (Exception e) { - LOGGER.warn("getDataImportUploadDefinitions:: Cannot get upload definitions by query {}", query, e); + LOGGER.warn("getDataImportUploadDefinitions:: Cannot get upload definitions by query", e); asyncResultHandler.handle(Future.succeededFuture(ExceptionHelper.mapExceptionToResponse(e))); } }); @@ -316,7 +316,7 @@ public void getDataImportFileExtensions(String query, String totalRecords, int o Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { - LOGGER.debug("getDataImportFileExtensions:: query {}", query); + LOGGER.debug("getDataImportFileExtensions:: getting data import file extensions"); fileExtensionService.getFileExtensions(query, offset, limit, tenantId) .map(GetDataImportFileExtensionsResponse::respond200WithApplicationJson) .map(Response.class::cast) @@ -603,11 +603,10 @@ protected static String getUserIdFromToken(String token) { try { String[] split = token.split("\\."); String json = getJson(split[1]); - LOGGER.error(json); JsonObject tokenJson = new JsonObject(json); return tokenJson.getString("user_id"); } catch (Exception e) { - LOGGER.warn("getUserIdFromToken:: Invalid x-okapi-token: {}", token, e); + LOGGER.warn("getUserIdFromToken:: Invalid x-okapi-token", e); return null; } } diff --git a/src/main/java/org/folio/service/file/SplitFileProcessingService.java b/src/main/java/org/folio/service/file/SplitFileProcessingService.java index c706ee18..6dd780f5 100644 --- a/src/main/java/org/folio/service/file/SplitFileProcessingService.java +++ b/src/main/java/org/folio/service/file/SplitFileProcessingService.java @@ -145,7 +145,7 @@ public Future startJob( .onFailure(err -> { String jobExecutionId = entity.getUploadDefinition().getMetaJobExecutionId(); if (jobExecutionId != null) { - LOGGER.warn("startJob:: File was processed with errors by jobExecutionId {}. Cause: {}", jobExecutionId, err.getCause()); + LOGGER.warn("startJob:: File was processed with errors by jobExecutionId {}. Cause: {}", jobExecutionId, err.getMessage()); uploadDefinitionService.updateJobExecutionStatus(jobExecutionId, new StatusDto().withStatus(ERROR).withErrorStatus(FILE_PROCESSING_ERROR), params); uploadDefinitionService.updateUploadDefinitionStatus(entity.getUploadDefinition().getId(), UploadDefinition.Status.ERROR, params.getTenantId()) .onFailure(errMsg -> LOGGER.error("startJob::Unable to update UploadDefinitionStatus by jobExecutionId {}. Cause: {}", jobExecutionId, errMsg));