Merge branch 'mosip:develop' into develop

yashmsonkusare · Feb 21, 2024 · b7cba9a · b7cba9a
2 parents 35e6f9d + b7fafcf
commit b7cba9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 25 deletions.
diff --git a/admin/admin-service/pom.xml b/admin/admin-service/pom.xml
@@ -36,21 +36,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-		    <groupId>com.fasterxml.jackson.core</groupId>
-		    <artifactId>jackson-core</artifactId>
-		    <version>2.12.0</version>
-		</dependency>
-		<dependency>
-		    <groupId>com.fasterxml.jackson.core</groupId>
-		    <artifactId>jackson-databind</artifactId>
-		    <version>2.12.0</version>
-		</dependency>
-		 <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.12.0</version>
-        </dependency>
 		<dependency>
 		    <groupId>com.fasterxml.jackson.dataformat</groupId>
 		    <artifactId>jackson-dataformat-xml</artifactId>
@@ -149,12 +134,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-		    <groupId>javax.validation</groupId>
-		    <artifactId>validation-api</artifactId>
-		    <version>2.0.1.Final</version>
-		</dependency>
-
 		<dependency>
 			<groupId>io.mosip.commons</groupId>
 			<artifactId>commons-packet-manager</artifactId>

diff --git a/...in/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java b/...in/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<AuditManagerRequestDto> request = new RequestWrapper<>();
 		request.setId("mosip.admin.audit");
 		request.setVersion("0.1");
 		request.setRequesttime(LocalDateTime.now());
 		request.setRequest(auditManagerRequestDto);
 
-		HttpEntity<RequestWrapper<AuditManagerRequestDto>> entity = new HttpEntity<>(request, auditReqHeaders);
+		HttpEntity<RequestWrapper<AuditManagerRequestDto>> 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);