Merge pull request #1879 from JanardhanBS-SyncByte/issue-1842-consolidate-services

[issue-1842-consolidate-services] Objectmapper removed from WebSubClientConfig.java cuasing issue in id-repo because it does not spring mapper first

Author: ckm007

kernel/kernel-core/src/main/java/io/mosip/kernel/websub/api/client/SubscriberClientImpl.java

@@ -70,8 +70,8 @@ public class SubscriberClientImpl
 	@Autowired
 	private RestTemplateHelper restTemplateHelper;
 
-	@Autowired
-	private ObjectMapper objectMapper;
+	/** Local mapper so this library does not register/steal the application {@link ObjectMapper}. */
+	private final ObjectMapper objectMapper = new ObjectMapper();
 
 	/**
 	 * When {@code true}, callback URLs include {@code intentMode} for hub verification

kernel/kernel-core/src/main/java/io/mosip/kernel/websub/api/config/WebSubClientConfig.java

@@ -3,14 +3,11 @@
 import jakarta.servlet.Filter;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import io.mosip.kernel.core.websub.spi.SubscriptionClient;
 import io.mosip.kernel.core.websub.spi.SubscriptionExtendedClient;
 import io.mosip.kernel.websub.api.aspects.WebSubClientAspect;
@@ -35,17 +32,6 @@
 @EnableAspectJAutoProxy
 public class WebSubClientConfig {
 
-	/**
-	 * Jackson mapper for failed-content JSON when no application {@link ObjectMapper} exists.
-	 *
-	 * @return new {@link ObjectMapper}
-	 */
-	@Bean
-	@ConditionalOnMissingBean(ObjectMapper.class)
-	public ObjectMapper objectMapper() {
-		return new ObjectMapper();
-	}
-
 	/**
 	 * Hub intent-verification helper (topic / mode match).
 	 *

kernel/kernel-core/src/test/java/io/mosip/kernel/websub/api/test/subscriber/SubscriberClientApiTest.java

@@ -66,8 +66,7 @@ public class SubscriberClientApiTest {
 
 	private String expectedFailedContentURL = "http://localhost:9191/hub?topic=demo&callback=aHR0cDovL2xvY2FsaG9zdDo4MDgwL2NhbGxiYWNr&timestamp=2021-08-30T12:39:23.511446100Z&pageindex=0&messageCount=10";
 
-	@Autowired
-	private ObjectMapper objectMapper;
+	private final ObjectMapper objectMapper = new ObjectMapper();
 
 	@Before
 	public void init() {