From 1f3e54def3fa83ebff5d0b160a4dae3fea106980 Mon Sep 17 00:00:00 2001
From: Alok Joshi <ajoshi19@slb.com>
Date: Mon, 13 Jan 2025 16:49:02 +0000
Subject: [PATCH] Use object mapper
---
.../osdu/legal/controller/LegalTagStatusJobController.java | 6 ++++--
.../legal/controller/LegalTagStatusJobControllerTest.java | 4 +++-
.../legal-azure/src/main/resources/application.properties | 3 +++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobController.java b/legal-core/src/main/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobController.java
index 75a7728bf..c6b6fc04c 100644
--- a/legal-core/src/main/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobController.java
+++ b/legal-core/src/main/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobController.java
@@ -1,9 +1,9 @@
package org.opengroup.osdu.legal.controller;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.common.model.http.RequestInfo;
-import org.opengroup.osdu.core.common.model.legal.StatusChangedTags;
import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory;
import org.opengroup.osdu.legal.api.LegalTagStatusJobApi;
@@ -36,6 +36,8 @@ public class LegalTagStatusJobController implements LegalTagStatusJobApi {
@Inject
private JaxRsDpsLog log;
+ private ObjectMapper objectMapper = new ObjectMapper();
+
@Override
public ResponseEntity<HttpStatus> checkLegalTagStatusChanges() {
tenantStorageFactory.flushCache();
@@ -51,7 +53,7 @@ public class LegalTagStatusJobController implements LegalTagStatusJobApi {
boolean success = true;
try {
LegalTagJobResult result = legalTagStatusJob.run(tenantInfo.getProjectId(), convertedHeaders, tenantInfo.getName());
- auditLogger.legalTagJobRanSuccess(singletonList(result.toString()));
+ auditLogger.legalTagJobRanSuccess(singletonList(this.objectMapper.writeValueAsString(result)));
} catch (Exception e) {
success = false;
log.error( "Error running check LegalTag compliance job on tenant " + convertedHeaders.getPartitionIdWithFallbackToAccountId(), e);
diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobControllerTest.java b/legal-core/src/test/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobControllerTest.java
index b6d7b6852..58c4014dc 100644
--- a/legal-core/src/test/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobControllerTest.java
+++ b/legal-core/src/test/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobControllerTest.java
@@ -1,5 +1,6 @@
package org.opengroup.osdu.legal.controller;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,6 +33,7 @@ import static org.mockito.Mockito.when;
public class LegalTagStatusJobControllerTest {
public static final DpsHeaders dpsHeaders = new DpsHeaders();
+ private ObjectMapper objectMapper = new ObjectMapper();
@Mock
private RequestInfo requestInfo;
@@ -74,7 +76,7 @@ public class LegalTagStatusJobControllerTest {
ResponseEntity<HttpStatus> result = sut.checkLegalTagStatusChanges();
assertEquals(HttpStatus.NO_CONTENT, result.getStatusCode());
- verify(auditLogger).legalTagJobRanSuccess(Collections.singletonList(legalTagJobResult.toString()));
+ verify(auditLogger).legalTagJobRanSuccess(Collections.singletonList(objectMapper.writeValueAsString(legalTagJobResult)));
}
@Test
diff --git a/provider/legal-azure/src/main/resources/application.properties b/provider/legal-azure/src/main/resources/application.properties
index e4e7c9a15..b85b68928 100644
--- a/provider/legal-azure/src/main/resources/application.properties
+++ b/provider/legal-azure/src/main/resources/application.properties
@@ -62,6 +62,9 @@ spring.application.name=legal-azure
#logging configuration
logging.transaction.enabled=true
logging.slf4jlogger.enabled=true
+log.sampling.enabled=${log_sampling_enabled:false}
+log.sampling.info=${log_sampling_info:100}
+log.sampling.dependency=${log_sampling_dependency:100}
logging.mdccontext.enabled=true
logging.ignore.servlet.paths=/swagger-ui.html
--
GitLab