[ES-425] added kernel-otpmanager module

kernel/kernel-otpmanager-service/pom.xml

@@ -231,58 +231,6 @@
 	<url>https://github.com/mosip/commons</url>
 
 	<dependencies>
-		<dependency>
-			<groupId>io.mosip.kernel</groupId>
-			<artifactId>kernel-core</artifactId>
-			<version>${kernel.core.version}</version>
-		</dependency>
-		<!-- <dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>${springfox.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>${springfox.version}</version>
-		</dependency> -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-			<version>${spring.boot.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-test</artifactId>
-			<version>${spring.security.test.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.mosip.kernel</groupId>
-			<artifactId>kernel-dataaccess-hibernate</artifactId>
-			<version>${kernel.dataaccess-hibernate.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-			<version>${postgresql.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.mosip.kernel</groupId>
-			<artifactId>kernel-logger-logback</artifactId>
-			<version>${kernel.logger.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
-			<version>${springdoc.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-			<version>${spring.boot.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
@@ -294,6 +242,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>io.mosip.kernel</groupId>
+			<artifactId>kernel-otpmanager</artifactId>
+			<version>1.2.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 
 	<distributionManagement>
@@ -497,7 +450,7 @@
 				<dependency>
 					<groupId>io.mosip.kernel</groupId>
 					<artifactId>kernel-auth-adapter</artifactId>
-					<version>${project.version}</version>
+					<version>${kernel.auth-adapter.version}</version>
 				</dependency>
 			</dependencies>
 			<build>

kernel/kernel-otpmanager-service/src/main/java/io/mosip/kernel/otpmanager/OtpmanagerBootApplication.java

@@ -2,6 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 
 /**
  * OTP Manager Application
@@ -13,6 +14,7 @@
  */
 @SpringBootApplication(scanBasePackages = { "io.mosip.kernel.otpmanager.*", "${mosip.auth.adapter.impl.basepackage}",
 		"io.mosip.kernel.core.logger.config" })
+@EnableCaching
 public class OtpmanagerBootApplication {
 
 	/**

kernel/kernel-otpmanager-service/src/main/resources/application-local.properties

@@ -25,6 +25,15 @@ auth.header.name=Authorization
 
 spring.h2.console.enabled=true
 
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
+mosip.kernel.auth.proxy-otp=false
+
+#set the datastore
+mosip.datastore.type=cache
+mosip.datastore.cache.name=otpEntity
+
+
 
 hibernate.dialect=org.hibernate.dialect.H2Dialect
 hibernate.jdbc.lob.non_contextual_creation=true

kernel/kernel-otpmanager-service/src/main/resources/bootstrap.properties

@@ -34,3 +34,5 @@ openapi.service.servers[0].description=OTP Manager Service
 springdoc.swagger-ui.disable-swagger-default-url=true
 spring.mvc.servlet.path=${server.servlet.path}
 
+server.servlet.context-path=/v1/otpmanager
+

kernel/kernel-otpmanager-service/src/test/java/io/mosip/kernel/otpmanager/test/controller/OtpGeneratorControllerTest.java

@@ -1,47 +1,39 @@
 package io.mosip.kernel.otpmanager.test.controller;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.mockito.BDDMockito.given;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
+import io.mosip.kernel.core.http.RequestWrapper;
+import io.mosip.kernel.core.http.ResponseWrapper;
+import io.mosip.kernel.otpmanager.controller.OtpGeneratorController;
+import io.mosip.kernel.otpmanager.dto.OtpGeneratorRequestDto;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.MediaType;
-import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.servlet.MockMvc;
-
 import io.mosip.kernel.otpmanager.dto.OtpGeneratorResponseDto;
 import io.mosip.kernel.otpmanager.service.impl.OtpGeneratorServiceImpl;
-import io.mosip.kernel.otpmanager.test.OtpmanagerTestBootApplication;
 
 @RunWith(SpringRunner.class)
-@AutoConfigureMockMvc
-@SpringBootTest(classes = OtpmanagerTestBootApplication.class)
 public class OtpGeneratorControllerTest {
-	@Autowired
-	private MockMvc mockMvc;
 
-	@MockBean
+	@Mock
 	private OtpGeneratorServiceImpl service;
 
-	@WithUserDetails("individual")
+	@InjectMocks
+	private OtpGeneratorController otpGeneratorController;
+
 	@Test
 	public void testOtpGenerationController() throws Exception {
-		String otp = "3214";
 		OtpGeneratorResponseDto dto = new OtpGeneratorResponseDto();
-		dto.setOtp(otp);
-		given(service.getOtp(Mockito.any())).willReturn(dto);
-		String json = "{\"key\":\"123456789\"}";
-		mockMvc.perform(post("/otp/generate").contentType(MediaType.APPLICATION_JSON).content(json))
-				.andExpect(status().isOk()).andExpect(jsonPath("$.response.otp", is("3214")));
-	}
+		dto.setOtp("3124");
+		Mockito.when(service.getOtp(Mockito.any())).thenReturn(dto);
+		OtpGeneratorRequestDto requestDto = new OtpGeneratorRequestDto();
+		RequestWrapper<OtpGeneratorRequestDto> requestWrapper = new RequestWrapper<OtpGeneratorRequestDto>();
+		requestWrapper.setRequest(requestDto);
+		OtpGeneratorResponseDto responseDto = new OtpGeneratorResponseDto();
+		responseDto.setOtp("3124");
+		ResponseWrapper<OtpGeneratorResponseDto> actualResponseWrapper = otpGeneratorController.generateOtp(requestWrapper);
+		Assert.assertEquals(responseDto, actualResponseWrapper.getResponse());	}
 
 }

kernel/kernel-otpmanager-service/src/test/java/io/mosip/kernel/otpmanager/test/controller/OtpValidatorControllerTest.java

@@ -19,9 +19,7 @@
 import io.mosip.kernel.otpmanager.service.impl.OtpValidatorServiceImpl;
 import io.mosip.kernel.otpmanager.test.OtpmanagerTestBootApplication;
 
-@SpringBootTest(classes = OtpmanagerTestBootApplication.class)
 @RunWith(SpringRunner.class)
-@AutoConfigureMockMvc
 public class OtpValidatorControllerTest {
 	@Mock
 	private OtpValidatorServiceImpl service;