Merge branch 'fix_json_mapping' into 'master'

Use object mapper

See merge request !639

legal-core/src/main/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobController.java

 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);

legal-core/src/test/java/org/opengroup/osdu/legal/controller/LegalTagStatusJobControllerTest.java

 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

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