From edd8942d2be22b1f1dde484b9ec8573b562b13b6 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 25 Jan 2024 01:59:54 +0530
Subject: [PATCH 1/2] Updated admin-services pom file
Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
admin/admin-service/pom.xml | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/admin/admin-service/pom.xml b/admin/admin-service/pom.xml
index 72c33550af4..03ccf1bbf1b 100644
--- a/admin/admin-service/pom.xml
+++ b/admin/admin-service/pom.xml
@@ -36,21 +36,6 @@
-
- com.fasterxml.jackson.core
- jackson-core
- 2.12.0
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.12.0
-
-
- com.fasterxml.jackson.core
- jackson-annotations
- 2.12.0
-
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
@@ -149,12 +134,6 @@
-
- javax.validation
- validation-api
- 2.0.1.Final
-
-
io.mosip.commons
commons-packet-manager
From b7fafcfbd43698d58e4070ac76236790b4b00dd3 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Tue, 13 Feb 2024 12:01:03 +0530
Subject: [PATCH 2/2] [MOSIP-31284] (#936)
Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
.../service/impl/AuditManagerProxyServiceImpl.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java b/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java
index 2d4e6850e95..485584dd675 100644
--- a/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java
+++ b/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java
@@ -112,18 +112,16 @@ public AuditManagerResponseDto logAdminAudit(AuditManagerRequestDto auditManager
auditManagerRequestDto.setSessionUserName(username);
auditManagerRequestDto.setCreatedBy(getHeaderValue(HttpHeaders.REFERER));
- HttpHeaders auditReqHeaders = new HttpHeaders();
- auditReqHeaders.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
RequestWrapper request = new RequestWrapper<>();
request.setId("mosip.admin.audit");
request.setVersion("0.1");
request.setRequesttime(LocalDateTime.now());
request.setRequest(auditManagerRequestDto);
- HttpEntity> entity = new HttpEntity<>(request, auditReqHeaders);
+ HttpEntity> entity = new HttpEntity<>(request);
try {
- restTemplate.postForEntity(auditmanagerapi, entity, Object.class);
+ restTemplate.postForEntity(auditmanagerapi, entity, String.class);
} catch (HttpClientErrorException | HttpServerErrorException ex) {
throw new MasterDataServiceException(AdminManagerProxyErrorCode.ADMIN_LOG_FAILED.getErrorCode(),
AdminManagerProxyErrorCode.ADMIN_LOG_FAILED.getErrorMessage(), ex);