From 163df8cf0144345a81da7de9cfc0234dded34710 Mon Sep 17 00:00:00 2001
From: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Date: Mon, 5 Jun 2023 12:01:51 +0530
Subject: [PATCH 01/53] Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md
---
 README.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..8d86395f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,33 @@
+# Identity API Module 
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) 
+
+Identity API is a microservice which is used for the creation and management of beneficaries.
+
+### Primary Features
+* Beneficiary Creation
+* Beneficiary Search
+* Beneficiary Management
+
+
+## Building From Source
+This microservice is built on Java, Spring boot framework and MySQL DB.
+
+### Prerequisites 
+* JDK 1.8
+* Maven 
+
+$ ./mvn clean install
+
+## Installation
+This service has been tested on Wildfly as the application server.
+
+### Prerequisites 
+* Wildfly (or any compatible app server)
+* Redis
+* MySQL Database
+
+## Integrations
+* RMNCH (Reproductive, Maternal, Newborn, and Child Health)
+## Usage
+All features have been exposed as REST endpoints. Refer to the SWAGGER API specification for details.
+

From d5ca79df81f289f6a66bdfdc0c7955224012cb31 Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Wed, 7 Jun 2023 18:27:25 +0530
Subject: [PATCH 02/53] Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup
---
 .github/workflows/build-on-pull-request.yml   |  22 +
 ...deQL Analysis.yml => sast-and-package.yml} |  38 +-
 logs/app.log                                  | 999 ++++++++++++++++++
 pom.xml                                       | 145 +--
 src/main/environment/common_test.properties   |   4 +-
 .../iemr/common/identity/config/DBConfig.java |  28 +-
 .../common/identity/utils/CommonMain.java     |  49 +-
 .../common/identity/utils/CryptoUtil.java     |  55 +
 .../common/identity/utils/IEMRApplBeans.java  |  46 -
 .../common/identity/utils/km/KMService.java   |   8 -
 .../utils/km/openkm/OpenKMConnector.java      |  15 -
 .../utils/km/openkm/OpenKMServiceImpl.java    | 163 ---
 12 files changed, 1155 insertions(+), 417 deletions(-)
 create mode 100644 .github/workflows/build-on-pull-request.yml
 rename .github/workflows/{Maven Build and CodeQL Analysis.yml => sast-and-package.yml} (62%)
 create mode 100644 logs/app.log
 create mode 100644 src/main/java/com/iemr/common/identity/utils/CryptoUtil.java
 delete mode 100644 src/main/java/com/iemr/common/identity/utils/km/KMService.java
 delete mode 100644 src/main/java/com/iemr/common/identity/utils/km/openkm/OpenKMConnector.java
 delete mode 100644 src/main/java/com/iemr/common/identity/utils/km/openkm/OpenKMServiceImpl.java

diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
new file mode 100644
index 00000000..4c88df3e
--- /dev/null
+++ b/.github/workflows/build-on-pull-request.yml
@@ -0,0 +1,22 @@
+name: Build On Pull Request
+on:
+  pull_request:
+    branches: [ "master","develop" ]
+    
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Setup JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: 8
+          distribution: 'adopt'
+      - name: Build with Maven  
+        run: mvn clean install
\ No newline at end of file
diff --git a/.github/workflows/Maven Build and CodeQL Analysis.yml b/.github/workflows/sast-and-package.yml
similarity index 62%
rename from .github/workflows/Maven Build and CodeQL Analysis.yml
rename to .github/workflows/sast-and-package.yml
index 4d2a628e..179a33b3 100644
--- a/.github/workflows/Maven Build and CodeQL Analysis.yml	
+++ b/.github/workflows/sast-and-package.yml
@@ -1,46 +1,52 @@
-name: Build and Deploy
+name: Static Code Analysis and Packaging
 on:
   push:
     branches: [ "master","develop" ]
-  pull_request:
-    branches: [ "master","develop" ]
     
 jobs:
-  build:
+  CodeQL:
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
     steps:
     - name: Checkout code 
       uses: actions/checkout@v2
-      
-      
     - name: Setup JDK 8
       uses: actions/setup-java@v2
       with:
         java-version: 8
         distribution: 'adopt'
-        
-        
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: Java    
-        
-    
     - name: Build with Maven
       run: mvn clean install
-        
-      
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
+      with:
+        languages: Java   
     
-           
+  Packaging:
+    needs: codeql
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
     - name: Create WAR file 
       run: mvn -B package --file pom.xml
-      
-      
     - name: Upload WAR file as artifact
       uses: actions/upload-artifact@v2 
       with:
         name: Identity-API
         path: target/identity-0.0.1.war  
-        
diff --git a/logs/app.log b/logs/app.log
new file mode 100644
index 00000000..971e292d
--- /dev/null
+++ b/logs/app.log
@@ -0,0 +1,999 @@
+2023-06-07 15:50:52,831 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Starting IdentityApplication on APL-5CD0177D5K with PID 18544 (D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes started by SW40136016 in D:\AMRIT-Piramal\PROJECTS\Identity-API)
+2023-06-07 15:50:52,833 DEBUG com.iemr.common.identity.IdentityApplication [restartedMain] Running with Spring Boot v1.5.8.RELEASE, Spring v4.3.12.RELEASE
+2023-06-07 15:50:52,834 INFO com.iemr.common.identity.IdentityApplication [restartedMain] No active profile set, falling back to default profiles: default
+2023-06-07 15:50:52,880 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@46882443: startup date [Wed Jun 07 15:50:52 IST 2023]; root of context hierarchy
+2023-06-07 15:50:53,029 INFO org.hibernate.validator.internal.util.Version [background-preinit] HV000001: Hibernate Validator 5.3.5.Final
+2023-06-07 15:50:53,977 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-06-07 15:50:54,107 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'configProperties' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.config.ConfigProperties]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\config\ConfigProperties.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=configProperties; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 15:50:54,108 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'sessionObject' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.sessionobject.SessionObject]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\sessionobject\SessionObject.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=sessionObject; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 15:50:54,108 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'redisStorage' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.redis.RedisStorage]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\redis\RedisStorage.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=redisStorage; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 15:50:54,111 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-06-07 15:50:54,431 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'propertySourcesPlaceholderConfigurer' with a different definition: replacing [Root bean: class [org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.class]] with [Root bean: class [org.springframework.boot.autoconfigure.session.RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/session/RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration.class]]
+2023-06-07 15:50:54,623 INFO org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
+2023-06-07 15:50:54,729 INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker [restartedMain] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$98c72025] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-06-07 15:50:55,070 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat initialized with port(s): 7078 (http)
+2023-06-07 15:50:55,078 INFO org.apache.catalina.core.StandardService [restartedMain] Starting service [Tomcat]
+2023-06-07 15:50:55,080 INFO org.apache.catalina.core.StandardEngine [restartedMain] Starting Servlet Engine: Apache Tomcat/8.5.23
+2023-06-07 15:50:55,197 INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] [localhost-startStop-1] Initializing Spring embedded WebApplicationContext
+2023-06-07 15:50:55,197 INFO org.springframework.web.context.ContextLoader [localhost-startStop-1] Root WebApplicationContext: initialization completed in 2317 ms
+2023-06-07 15:50:55,558 INFO org.springframework.boot.web.servlet.ServletRegistrationBean [localhost-startStop-1] Mapping servlet: 'dispatcherServlet' to [/]
+2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'characterEncodingFilter' to: [/*]
+2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'springSessionRepositoryFilter' to: [/*]
+2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
+2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'httpPutFormContentFilter' to: [/*]
+2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'requestContextFilter' to: [/*]
+2023-06-07 15:50:56,325 ERROR com.iemr.common.identity.utils.CryptoUtil [restartedMain] Exception while decrypting string. Intentionally throwing null pointer
+javax.crypto.IllegalBlockSizeException: Input length must be multiple of 16 when decrypting with padded cipher
+	at com.sun.crypto.provider.CipherCore.prepareInputBuffer(CipherCore.java:1005)
+	at com.sun.crypto.provider.CipherCore.doFinal(CipherCore.java:848)
+	at com.sun.crypto.provider.AESCipher.engineDoFinal(AESCipher.java:446)
+	at javax.crypto.Cipher.doFinal(Cipher.java:2168)
+	at com.iemr.common.identity.utils.CryptoUtil.decrypt(CryptoUtil.java:34)
+	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89.CGLIB$dataSource$0(<generated>)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89$$FastClassBySpringCGLIB$$aaf85a5c.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89.dataSource(<generated>)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
+	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
+	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
+2023-06-07 15:50:56,327 WARN org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+2023-06-07 15:50:56,338 INFO org.apache.catalina.core.StandardService [restartedMain] Stopping service [Tomcat]
+2023-06-07 15:50:56,351 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-1] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 15:50:56,351 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-2] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 15:50:56,352 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-3] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 15:50:56,352 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-4] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 15:50:56,352 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-5] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 15:50:56,353 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-6] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 15:50:56,353 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-7] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 15:50:56,354 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-8] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 15:50:56,363 INFO org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer [restartedMain] 
+
+Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
+2023-06-07 15:50:56,369 ERROR org.springframework.boot.SpringApplication [restartedMain] Application startup failed
+org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
+	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
+	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
+Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
+	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	... 24 common frames omitted
+Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:599)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	... 47 common frames omitted
+Caused by: org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:189)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
+	... 60 common frames omitted
+Caused by: java.lang.NullPointerException: null
+	at java.util.Hashtable.put(Hashtable.java:461)
+	at java.util.Properties.setProperty(Properties.java:166)
+	at org.apache.tomcat.jdbc.pool.DataSourceProxy.setUsername(DataSourceProxy.java:449)
+	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89.CGLIB$dataSource$0(<generated>)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89$$FastClassBySpringCGLIB$$aaf85a5c.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89.dataSource(<generated>)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
+	... 61 common frames omitted
+2023-06-07 15:54:08,826 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Starting IdentityApplication on APL-5CD0177D5K with PID 14016 (D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes started by SW40136016 in D:\AMRIT-Piramal\PROJECTS\Identity-API)
+2023-06-07 15:54:08,828 DEBUG com.iemr.common.identity.IdentityApplication [restartedMain] Running with Spring Boot v1.5.8.RELEASE, Spring v4.3.12.RELEASE
+2023-06-07 15:54:08,828 INFO com.iemr.common.identity.IdentityApplication [restartedMain] No active profile set, falling back to default profiles: default
+2023-06-07 15:54:08,872 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@46882443: startup date [Wed Jun 07 15:54:08 IST 2023]; root of context hierarchy
+2023-06-07 15:54:09,031 INFO org.hibernate.validator.internal.util.Version [background-preinit] HV000001: Hibernate Validator 5.3.5.Final
+2023-06-07 15:54:09,976 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-06-07 15:54:10,216 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'configProperties' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.config.ConfigProperties]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\config\ConfigProperties.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=configProperties; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 15:54:10,217 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'sessionObject' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.sessionobject.SessionObject]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\sessionobject\SessionObject.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=sessionObject; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 15:54:10,217 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'redisStorage' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.redis.RedisStorage]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\redis\RedisStorage.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=redisStorage; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 15:54:10,221 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-06-07 15:54:10,538 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'propertySourcesPlaceholderConfigurer' with a different definition: replacing [Root bean: class [org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.class]] with [Root bean: class [org.springframework.boot.autoconfigure.session.RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/session/RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration.class]]
+2023-06-07 15:54:10,727 INFO org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
+2023-06-07 15:54:10,827 INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker [restartedMain] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$169f162b] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-06-07 15:54:11,164 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat initialized with port(s): 7078 (http)
+2023-06-07 15:54:11,174 INFO org.apache.catalina.core.StandardService [restartedMain] Starting service [Tomcat]
+2023-06-07 15:54:11,175 INFO org.apache.catalina.core.StandardEngine [restartedMain] Starting Servlet Engine: Apache Tomcat/8.5.23
+2023-06-07 15:54:11,291 INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] [localhost-startStop-1] Initializing Spring embedded WebApplicationContext
+2023-06-07 15:54:11,292 INFO org.springframework.web.context.ContextLoader [localhost-startStop-1] Root WebApplicationContext: initialization completed in 2420 ms
+2023-06-07 15:54:11,629 INFO org.springframework.boot.web.servlet.ServletRegistrationBean [localhost-startStop-1] Mapping servlet: 'dispatcherServlet' to [/]
+2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'characterEncodingFilter' to: [/*]
+2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'springSessionRepositoryFilter' to: [/*]
+2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
+2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'httpPutFormContentFilter' to: [/*]
+2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'requestContextFilter' to: [/*]
+2023-06-07 15:54:15,007 INFO org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean [restartedMain] Building JPA container EntityManagerFactory for persistence unit 'db_identity'
+2023-06-07 15:54:15,017 INFO org.hibernate.jpa.internal.util.LogHelper [restartedMain] HHH000204: Processing PersistenceUnitInfo [
+	name: db_identity
+	...]
+2023-06-07 15:54:15,069 INFO org.hibernate.Version [restartedMain] HHH000412: Hibernate Core {5.0.12.Final}
+2023-06-07 15:54:15,070 INFO org.hibernate.cfg.Environment [restartedMain] HHH000206: hibernate.properties not found
+2023-06-07 15:54:15,070 INFO org.hibernate.cfg.Environment [restartedMain] HHH000021: Bytecode provider name : javassist
+2023-06-07 15:54:15,104 INFO org.hibernate.annotations.common.Version [restartedMain] HCANN000001: Hibernate Commons Annotations {5.0.1.Final}
+2023-06-07 15:54:15,232 INFO org.hibernate.dialect.Dialect [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL5Dialect
+2023-06-07 15:54:16,032 INFO org.hibernate.hql.internal.QueryTranslatorFactoryInitiator [restartedMain] HHH000397: Using ASTQueryTranslatorFactory
+2023-06-07 15:54:16,133 INFO org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'db_identity'
+2023-06-07 15:54:17,192 WARN org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] Autowired annotation is not supported on static fields: private static java.lang.Boolean com.iemr.common.identity.utils.config.ConfigProperties.extendExpiryTime
+2023-06-07 15:54:17,192 WARN org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] Autowired annotation is not supported on static fields: private static java.lang.Integer com.iemr.common.identity.utils.config.ConfigProperties.sessionExpiryTime
+2023-06-07 15:54:17,192 WARN org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] Autowired annotation is not supported on static fields: private static java.lang.String com.iemr.common.identity.utils.config.ConfigProperties.redisurl
+2023-06-07 15:54:17,192 WARN org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] Autowired annotation is not supported on static fields: private static java.lang.Integer com.iemr.common.identity.utils.config.ConfigProperties.redisport
+2023-06-07 15:54:17,527 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/editFamilyTagging],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.editFamilyDetails(java.lang.String)
+2023-06-07 15:54:17,529 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/addTag],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.saveFamilyTagging(java.lang.String)
+2023-06-07 15:54:17,529 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/createFamily],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.createFamily(java.lang.String)
+2023-06-07 15:54:17,529 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/searchFamily],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.searchFamily(java.lang.String)
+2023-06-07 15:54:17,529 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/untag],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.untagFamily(java.lang.String)
+2023-06-07 15:54:17,530 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/getFamilyDetails],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.getFamilyDatails(java.lang.String)
+2023-06-07 15:54:17,536 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/unreserve],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.unreserveIdentity(java.lang.String)
+2023-06-07 15:54:17,536 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/searhByGovIdentity],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.searhBeneficiaryByGovIdentity(java.lang.String)
+2023-06-07 15:54:17,537 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/finiteSearch],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getFiniteBeneficiaries(java.lang.String)
+2023-06-07 15:54:17,537 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/benImageByBenRegID],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiaryImageByBenRegID(java.lang.String)
+2023-06-07 15:54:17,537 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByAbhaIdNo],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.searhBeneficiaryByABHAIdNo(java.lang.String)
+2023-06-07 15:54:17,538 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByBenRegIdList],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiariesByBenRegIds(java.lang.String)
+2023-06-07 15:54:17,538 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/saveGeneratedBenIDToLocalServer],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.saveGeneratedBenIDToLocalServer(java.lang.String)
+2023-06-07 15:54:17,538 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/searchByFamilyId],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.searhBeneficiaryByFamilyId(java.lang.String)
+2023-06-07 15:54:17,540 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/editEducationOrCommunity],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.editIdentityEducationOrCommunity(java.lang.String)
+2023-06-07 15:54:17,540 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/checkAvailablBenIDLocalServer],methods=[GET],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.checkAvailablBenIDLocalServer()
+2023-06-07 15:54:17,541 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByAbhaAddress],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.searhBeneficiaryByABHAAddress(java.lang.String)
+2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByBenId],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiariesByBeneficiaryId(java.lang.String)
+2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByPhoneNum],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiariesByPhoneNum(java.lang.String)
+2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByPartialBenRegIdList],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getPartialBeneficiariesByBenRegIds(java.lang.String)
+2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByBenRegId],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiariesByBeneficiaryRegId(java.lang.String)
+2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/advanceSearch],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiaries(java.lang.String)
+2023-06-07 15:54:17,543 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/reserve],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.reserveIdentity(java.lang.String)
+2023-06-07 15:54:17,543 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/edit],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.editIdentity(java.lang.String)
+2023-06-07 15:54:17,543 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/create],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.createIdentity(java.lang.String)
+2023-06-07 15:54:17,544 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/rmnch/syncDataToAmrit],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.rmnch.RmnchMobileAppController.syncDataToAmrit(java.lang.String)
+2023-06-07 15:54:17,544 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/rmnch/getBeneficiaryDataForVillage],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.rmnch.RmnchMobileAppController.getBeneficiaryData(java.lang.String,java.lang.String)
+2023-06-07 15:54:17,544 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/rmnch/getBeneficiaryDataForAsha],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.rmnch.RmnchMobileAppController.getBeneficiaryDataByAsha(java.lang.String,java.lang.String)
+2023-06-07 15:54:17,544 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/version],methods=[GET]}" onto public java.lang.String com.iemr.common.identity.controller.version.VersionController.versionInformation()
+2023-06-07 15:54:17,548 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/swagger-resources/configuration/security]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.SecurityConfiguration> springfox.documentation.swagger.web.ApiResourceController.securityConfiguration()
+2023-06-07 15:54:17,549 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/swagger-resources/configuration/ui]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.UiConfiguration> springfox.documentation.swagger.web.ApiResourceController.uiConfiguration()
+2023-06-07 15:54:17,549 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/swagger-resources]}" onto public org.springframework.http.ResponseEntity<java.util.List<springfox.documentation.swagger.web.SwaggerResource>> springfox.documentation.swagger.web.ApiResourceController.swaggerResources()
+2023-06-07 15:54:17,551 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/error]}" onto public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)
+2023-06-07 15:54:17,551 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/error],produces=[text/html]}" onto public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)
+2023-06-07 15:54:17,674 INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping [restartedMain] Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
+2023-06-07 15:54:17,889 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter [restartedMain] Looking for @ControllerAdvice: org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@46882443: startup date [Wed Jun 07 15:54:08 IST 2023]; root of context hierarchy
+2023-06-07 15:54:17,937 INFO org.springframework.web.servlet.handler.SimpleUrlHandlerMapping [restartedMain] Mapped URL path [/webjars/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
+2023-06-07 15:54:17,937 INFO org.springframework.web.servlet.handler.SimpleUrlHandlerMapping [restartedMain] Mapped URL path [/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
+2023-06-07 15:54:17,970 INFO org.springframework.web.servlet.handler.SimpleUrlHandlerMapping [restartedMain] Mapped URL path [/**/favicon.ico] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
+2023-06-07 15:54:18,374 INFO org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer [restartedMain] LiveReload server is running on port 35729
+2023-06-07 15:54:18,420 INFO org.springframework.jmx.export.annotation.AnnotationMBeanExporter [restartedMain] Registering beans for JMX exposure on startup
+2023-06-07 15:54:18,429 INFO org.springframework.context.support.DefaultLifecycleProcessor [restartedMain] Starting beans in phase 2147483647
+2023-06-07 15:54:18,429 INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper [restartedMain] Context refreshed
+2023-06-07 15:54:18,448 INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper [restartedMain] Found 1 custom documentation plugin(s)
+2023-06-07 15:54:18,473 INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner [restartedMain] Scanning for api listing references
+2023-06-07 15:54:18,653 INFO org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor [restartedMain] No TaskScheduler/ScheduledExecutorService bean found for scheduled processing
+2023-06-07 15:54:18,664 INFO org.apache.coyote.http11.Http11NioProtocol [restartedMain] Initializing ProtocolHandler ["http-nio-7078"]
+2023-06-07 15:54:18,672 INFO org.apache.coyote.http11.Http11NioProtocol [restartedMain] Starting ProtocolHandler ["http-nio-7078"]
+2023-06-07 15:54:18,674 INFO org.apache.tomcat.util.net.NioSelectorPool [restartedMain] Using a shared selector for servlet write/read
+2023-06-07 15:54:18,690 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat started on port(s): 7078 (http)
+2023-06-07 15:54:18,696 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Started IdentityApplication in 10.056 seconds (JVM running for 11.587)
+2023-06-07 15:55:21,166 INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] [http-nio-7078-exec-1] Initializing Spring FrameworkServlet 'dispatcherServlet'
+2023-06-07 15:55:21,166 INFO org.springframework.web.servlet.DispatcherServlet [http-nio-7078-exec-1] FrameworkServlet 'dispatcherServlet': initialization started
+2023-06-07 15:55:21,191 INFO org.springframework.web.servlet.DispatcherServlet [http-nio-7078-exec-1] FrameworkServlet 'dispatcherServlet': initialization completed in 24 ms
+2023-06-07 16:02:41,065 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [Thread-7] Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@46882443: startup date [Wed Jun 07 15:54:08 IST 2023]; root of context hierarchy
+2023-06-07 16:02:41,066 INFO org.springframework.context.support.DefaultLifecycleProcessor [Thread-7] Stopping beans in phase 2147483647
+2023-06-07 16:02:41,069 WARN org.springframework.beans.factory.support.DisposableBeanAdapter [Thread-7] Invocation of destroy method failed on bean with name 'classPathFileSystemWatcher': java.lang.NullPointerException
+2023-06-07 16:02:41,070 INFO org.springframework.jmx.export.annotation.AnnotationMBeanExporter [Thread-7] Unregistering JMX-exposed beans on shutdown
+2023-06-07 16:02:41,077 INFO org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean [Thread-7] Closing JPA EntityManagerFactory for persistence unit 'db_identity'
+2023-06-07 16:02:42,182 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Starting IdentityApplication on APL-5CD0177D5K with PID 14016 (D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes started by SW40136016 in D:\AMRIT-Piramal\PROJECTS\Identity-API)
+2023-06-07 16:02:42,182 DEBUG com.iemr.common.identity.IdentityApplication [restartedMain] Running with Spring Boot v1.5.8.RELEASE, Spring v4.3.12.RELEASE
+2023-06-07 16:02:42,182 INFO com.iemr.common.identity.IdentityApplication [restartedMain] No active profile set, falling back to default profiles: default
+2023-06-07 16:02:42,183 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@5a2f436f: startup date [Wed Jun 07 16:02:42 IST 2023]; root of context hierarchy
+2023-06-07 16:02:42,906 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-06-07 16:02:43,118 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'configProperties' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.config.ConfigProperties]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\config\ConfigProperties.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=configProperties; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 16:02:43,118 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'sessionObject' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.sessionobject.SessionObject]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\sessionobject\SessionObject.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=sessionObject; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 16:02:43,118 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'redisStorage' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.redis.RedisStorage]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\redis\RedisStorage.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=redisStorage; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 16:02:43,121 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-06-07 16:02:43,347 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'propertySourcesPlaceholderConfigurer' with a different definition: replacing [Root bean: class [org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.class]] with [Root bean: class [org.springframework.boot.autoconfigure.session.RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/session/RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration.class]]
+2023-06-07 16:02:43,385 INFO org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
+2023-06-07 16:02:43,400 INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker [restartedMain] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$169f162b] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-06-07 16:02:43,569 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat initialized with port(s): 8080 (http)
+2023-06-07 16:02:43,570 INFO org.apache.catalina.core.StandardService [restartedMain] Starting service [Tomcat]
+2023-06-07 16:02:43,570 INFO org.apache.catalina.core.StandardEngine [restartedMain] Starting Servlet Engine: Apache Tomcat/8.5.23
+2023-06-07 16:02:43,592 INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] [localhost-startStop-1] Initializing Spring embedded WebApplicationContext
+2023-06-07 16:02:43,593 INFO org.springframework.web.context.ContextLoader [localhost-startStop-1] Root WebApplicationContext: initialization completed in 1410 ms
+2023-06-07 16:02:43,684 INFO org.springframework.boot.web.servlet.ServletRegistrationBean [localhost-startStop-1] Mapping servlet: 'dispatcherServlet' to [/]
+2023-06-07 16:02:43,684 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'characterEncodingFilter' to: [/*]
+2023-06-07 16:02:43,684 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'springSessionRepositoryFilter' to: [/*]
+2023-06-07 16:02:43,684 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
+2023-06-07 16:02:43,685 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'httpPutFormContentFilter' to: [/*]
+2023-06-07 16:02:43,685 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'requestContextFilter' to: [/*]
+2023-06-07 16:02:43,703 ERROR com.iemr.common.identity.utils.config.ConfigProperties [restartedMain] encDbUserName retrival failed.
+java.lang.NullPointerException: null
+	at com.iemr.common.identity.utils.config.ConfigProperties.getPropertyByName(ConfigProperties.java:105)
+	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
+	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
+	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
+2023-06-07 16:02:43,705 ERROR com.iemr.common.identity.utils.CryptoUtil [restartedMain] Exception while decrypting string. Intentionally throwing null pointer
+java.lang.NullPointerException: null
+	at java.util.Base64$Decoder.decode(Base64.java:549)
+	at com.iemr.common.identity.utils.CryptoUtil.decrypt(CryptoUtil.java:34)
+	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
+	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
+	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
+2023-06-07 16:02:43,707 WARN org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+2023-06-07 16:02:43,710 INFO org.apache.catalina.core.StandardService [restartedMain] Stopping service [Tomcat]
+2023-06-07 16:02:43,712 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-1] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 16:02:43,713 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-2] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 16:02:43,713 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-3] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 16:02:43,714 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-4] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 16:02:43,715 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-5] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 16:02:43,715 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-6] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 16:02:43,716 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-7] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 16:02:43,717 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-8] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 16:02:43,723 INFO org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer [restartedMain] 
+
+Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
+2023-06-07 16:02:43,729 ERROR org.springframework.boot.SpringApplication [restartedMain] Application startup failed
+org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
+	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
+	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
+Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
+	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	... 24 common frames omitted
+Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:599)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	... 47 common frames omitted
+Caused by: org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:189)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
+	... 60 common frames omitted
+Caused by: java.lang.NullPointerException: null
+	at java.util.Hashtable.put(Hashtable.java:461)
+	at java.util.Properties.setProperty(Properties.java:166)
+	at org.apache.tomcat.jdbc.pool.DataSourceProxy.setUsername(DataSourceProxy.java:449)
+	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
+	... 61 common frames omitted
+2023-06-07 18:15:56,489 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Starting IdentityApplication on APL-5CD0177D5K with PID 14016 (D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes started by SW40136016 in D:\AMRIT-Piramal\PROJECTS\Identity-API)
+2023-06-07 18:15:56,489 DEBUG com.iemr.common.identity.IdentityApplication [restartedMain] Running with Spring Boot v1.5.8.RELEASE, Spring v4.3.12.RELEASE
+2023-06-07 18:15:56,489 INFO com.iemr.common.identity.IdentityApplication [restartedMain] No active profile set, falling back to default profiles: default
+2023-06-07 18:15:56,492 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@39ff0aad: startup date [Wed Jun 07 18:15:56 IST 2023]; root of context hierarchy
+2023-06-07 18:15:57,529 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-06-07 18:15:57,854 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'configProperties' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.config.ConfigProperties]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\config\ConfigProperties.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=configProperties; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 18:15:57,854 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'sessionObject' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.sessionobject.SessionObject]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\sessionobject\SessionObject.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=sessionObject; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 18:15:57,855 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'redisStorage' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.redis.RedisStorage]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\redis\RedisStorage.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=redisStorage; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
+2023-06-07 18:15:57,859 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-06-07 18:15:58,115 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'propertySourcesPlaceholderConfigurer' with a different definition: replacing [Root bean: class [org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.class]] with [Root bean: class [org.springframework.boot.autoconfigure.session.RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/session/RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration.class]]
+2023-06-07 18:15:58,150 INFO org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
+2023-06-07 18:15:58,167 INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker [restartedMain] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$169f162b] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-06-07 18:15:58,376 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat initialized with port(s): 8080 (http)
+2023-06-07 18:15:58,378 INFO org.apache.catalina.core.StandardService [restartedMain] Starting service [Tomcat]
+2023-06-07 18:15:58,379 INFO org.apache.catalina.core.StandardEngine [restartedMain] Starting Servlet Engine: Apache Tomcat/8.5.23
+2023-06-07 18:15:58,423 INFO org.apache.catalina.core.ContainerBase.[Tomcat-1].[localhost].[/] [localhost-startStop-1] Initializing Spring embedded WebApplicationContext
+2023-06-07 18:15:58,424 INFO org.springframework.web.context.ContextLoader [localhost-startStop-1] Root WebApplicationContext: initialization completed in 1932 ms
+2023-06-07 18:15:58,521 INFO org.springframework.boot.web.servlet.ServletRegistrationBean [localhost-startStop-1] Mapping servlet: 'dispatcherServlet' to [/]
+2023-06-07 18:15:58,522 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'characterEncodingFilter' to: [/*]
+2023-06-07 18:15:58,522 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'springSessionRepositoryFilter' to: [/*]
+2023-06-07 18:15:58,523 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
+2023-06-07 18:15:58,523 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'httpPutFormContentFilter' to: [/*]
+2023-06-07 18:15:58,523 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'requestContextFilter' to: [/*]
+2023-06-07 18:15:58,539 ERROR com.iemr.common.identity.utils.config.ConfigProperties [restartedMain] encDbUserName retrival failed.
+java.lang.NullPointerException: null
+	at com.iemr.common.identity.utils.config.ConfigProperties.getPropertyByName(ConfigProperties.java:105)
+	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
+	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
+	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
+2023-06-07 18:15:58,541 ERROR com.iemr.common.identity.utils.CryptoUtil [restartedMain] Exception while decrypting string. Intentionally throwing null pointer
+java.lang.NullPointerException: null
+	at java.util.Base64$Decoder.decode(Base64.java:549)
+	at com.iemr.common.identity.utils.CryptoUtil.decrypt(CryptoUtil.java:34)
+	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
+	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
+	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
+2023-06-07 18:15:58,542 WARN org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+2023-06-07 18:15:58,545 INFO org.apache.catalina.core.StandardService [restartedMain] Stopping service [Tomcat]
+2023-06-07 18:15:58,548 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-1] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 18:15:58,548 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-2] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 18:15:58,549 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-3] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 18:15:58,549 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-4] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 18:15:58,549 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-5] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 18:15:58,550 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-6] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 18:15:58,550 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-7] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 18:15:58,550 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-8] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.lang.Thread.sleep(Native Method)
+ io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
+ io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
+ io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
+ io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
+ java.lang.Thread.run(Thread.java:750)
+2023-06-07 18:15:58,556 INFO org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer [restartedMain] 
+
+Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
+2023-06-07 18:15:58,559 ERROR org.springframework.boot.SpringApplication [restartedMain] Application startup failed
+org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
+	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
+	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
+Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
+	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	... 24 common frames omitted
+Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:599)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
+	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
+	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
+	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
+	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
+	... 47 common frames omitted
+Caused by: org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:189)
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
+	... 60 common frames omitted
+Caused by: java.lang.NullPointerException: null
+	at java.util.Hashtable.put(Hashtable.java:461)
+	at java.util.Properties.setProperty(Properties.java:166)
+	at org.apache.tomcat.jdbc.pool.DataSourceProxy.setUsername(DataSourceProxy.java:449)
+	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
+	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
+	... 61 common frames omitted
diff --git a/pom.xml b/pom.xml
index e6e36529..e9b67a15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -15,13 +16,13 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>1.5.8.RELEASE</version>
-		<relativePath /> <!-- lookup parent from repository -->
+		<relativePath />
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<build.timestamp>${maven.build.timestamp}</build.timestamp>
-        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
 		<java.version>1.8</java.version>
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
@@ -29,16 +30,6 @@
 		<environment>dev</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
-		<hostname-dev>10.208.122.32</hostname-dev>
-		<port-dev>9990</port-dev>
-		<hostname-test>10.208.122.38</hostname-test>
-		<port-test>9990</port-test>
-		<hostname-uat>deviemr.piramalswasthya.org</hostname-uat>
-		<port-uat>9990</port-uat>
-		<server-id>wildfly-${environment}</server-id>
-		<server-hostname>{hostname-${environment}}</server-hostname>
-		<server-port>{port-${environment}}</server-port>
-
 		<maven.test.skip>true</maven.test.skip>
 	</properties>
 	<dependencies>
@@ -83,9 +74,6 @@
 			<version>${org.mapstruct.version}</version>
 			<scope>provided</scope>
 		</dependency>
-
-		<!-- <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-data-rest</artifactId> 
-			<version>2.6.1</version> </dependency> -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
@@ -124,31 +112,27 @@
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
-			<!-- <version>2.6.1</version> -->
 			<version>2.8.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger-ui</artifactId>
-			<!-- <version>2.6.1</version> -->
 			<version>2.8.0</version>
 		</dependency>
-
-		<!-- dependencies for session integration -->
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20160212</version><!--$NO-MVN-MAN-VER$-->
+			<version>20160212</version><!--$NO-MVN-MAN-VER$ -->
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-joda</artifactId>
-			<version>2.4.0</version><!--$NO-MVN-MAN-VER$-->
+			<version>2.4.0</version><!--$NO-MVN-MAN-VER$ -->
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.7.1</version><!--$NO-MVN-MAN-VER$-->
+			<version>2.7.1</version><!--$NO-MVN-MAN-VER$ -->
 		</dependency>
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
@@ -169,11 +153,6 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.openkm</groupId>
-			<artifactId>sdk4j</artifactId>
-			<version>1.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-mail</artifactId>
@@ -181,7 +160,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-redis</artifactId>
-			<version>1.7.11.RELEASE</version><!--$NO-MVN-MAN-VER$-->
+			<version>1.7.11.RELEASE</version><!--$NO-MVN-MAN-VER$ -->
 		</dependency>
 		<dependency>
 			<groupId>biz.paluch.redis</groupId>
@@ -192,7 +171,6 @@
 			<groupId>org.springframework.session</groupId>
 			<artifactId>spring-session</artifactId>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
@@ -205,20 +183,26 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.ulisesbocchio</groupId>
-			<artifactId>jasypt-spring-boot-starter</artifactId>
-			<version>2.0.0</version>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>1.19</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.jersey.contribs</groupId>
+			<artifactId>jersey-multipart</artifactId>
+			<version>1.18</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-multipart</artifactId>
+			<version>2.0-m11</version>
 		</dependency>
-		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-cassandra</artifactId> 
-			</dependency> -->
 	</dependencies>
-	<repositories>
-		<repository>
-			<id>openkm.com</id>
-			<name>OpenKM Maven Repository</name>
-			<url>https://maven.openkm.com</url>
-		</repository>
-	</repositories>
 
 	<profiles>
 		<profile>
@@ -234,44 +218,17 @@
 		</profile>
 	</profiles>
 
-	
+
 
 	<build>
 		<finalName>identity-0.0.1</finalName>
 		<plugins>
-		
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.0.2</version>
 			</plugin>
-		<!--	<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.2.4</version>
-				<executions>
-					<execution>
-						<id>get-the-git-infos</id>
-						<goals>
-							<goal>revision</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-					<prefix>git</prefix>
-					<verbose>false</verbose>
-					<generateGitPropertiesFile>true</generateGitPropertiesFile>
-					<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-					<format>json</format>
-					<gitDescribe>
-						<skip>false</skip>
-						<always>false</always>
-						<dirty>-dirty</dirty>
-					</gitDescribe>
-				</configuration>
-			</plugin> -->
-		
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -279,7 +236,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version><!--$NO-MVN-MAN-VER$-->
+				<version>3.7.0</version><!--$NO-MVN-MAN-VER$ -->
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
@@ -300,7 +257,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version><!--$NO-MVN-MAN-VER$-->
+				<version>1.8</version><!--$NO-MVN-MAN-VER$ -->
 				<executions>
 					<execution>
 						<phase>process-resources</phase>
@@ -313,8 +270,6 @@
 								<echo>
 									concatinating properties file ${target-properties} and
 									${source-properties}
-									<!-- $${server-hostname} $${server-port} ${server-id} $${server-username} 
-										$${server-password} -->
 								</echo>
 								<concat destfile="${target-properties}" append="yes"
 									force="yes">
@@ -333,38 +288,18 @@
 					<testFailureIgnore>true</testFailureIgnore>
 				</configuration>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.wildfly.plugins</groupId>
-				<artifactId>wildfly-maven-plugin</artifactId>
-				<version>1.2.1.Final</version>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.6</version>
 				<configuration>
-					<id>${server-id}</id>
-					<hostname>$${server-hostname}</hostname>
-					<port>$${server-port}</port>
-					<username>admin</username>
-					<password>ad@min123</password>
+					<webResources>
+						<resource>
+							<filtering>true</filtering>
+							<directory>src/packaging/</directory>
+						</resource>
+					</webResources>
 				</configuration>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>deploy</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin> -->
-			<plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <filtering>true</filtering>
-                            <directory>src/packaging/</directory>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
+			</plugin>
 		</plugins>
 	</build>
 	<reporting>
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index c6f3eb61..1bfacc2c 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
 spring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+encDbUserName=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
+encDbPass=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/java/com/iemr/common/identity/config/DBConfig.java b/src/main/java/com/iemr/common/identity/config/DBConfig.java
index a07266af..6a959e3e 100644
--- a/src/main/java/com/iemr/common/identity/config/DBConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/DBConfig.java
@@ -5,9 +5,9 @@
 
 import org.apache.tomcat.jdbc.pool.PoolConfiguration;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
@@ -20,18 +20,19 @@
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import com.iemr.common.identity.utils.CryptoUtil;
 import com.iemr.common.identity.utils.config.ConfigProperties;
 
-
-
-
-
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.common.identity.repo","com.iemr.common.identity.repo.familyTag","com.iemr.common.identity.repo.rmnch" })
+@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {
+		"com.iemr.common.identity.repo", "com.iemr.common.identity.repo.familyTag",
+		"com.iemr.common.identity.repo.rmnch" ,"com.iemr.common.identity.*"})
 
 public class DBConfig {
 	Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+	@Autowired
+	private CryptoUtil cryptoUtil;
 
 	@Primary
 	@Bean(name = "dataSource")
@@ -52,16 +53,8 @@ public DataSource dataSource() {
 		org.apache.tomcat.jdbc.pool.DataSource datasource = new org.apache.tomcat.jdbc.pool.DataSource();
 		datasource.setPoolProperties(p);
 
-		StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
-		encryptor.setAlgorithm("PBEWithMD5AndDES");
-
-		encryptor.setPassword("dev-env-secret");
-
-//		logger.info(encryptor.decrypt(ConfigProperties.getPropertyByName("encDbUserName")));
-//		logger.info(encryptor.decrypt(ConfigProperties.getPropertyByName("encDbPass")));
-
-		datasource.setUsername(encryptor.decrypt(ConfigProperties.getPropertyByName("encDbUserName")));
-		datasource.setPassword(encryptor.decrypt(ConfigProperties.getPropertyByName("encDbPass")));
+		datasource.setUsername(cryptoUtil.decrypt(ConfigProperties.getPropertyByName("encDbUserName")));
+		datasource.setPassword(cryptoUtil.decrypt(ConfigProperties.getPropertyByName("encDbPass")));
 
 		return datasource;
 	}
@@ -70,7 +63,8 @@ public DataSource dataSource() {
 	@Bean(name = "entityManagerFactory")
 	public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder,
 			@Qualifier("dataSource") DataSource dataSource) {
-		return builder.dataSource(dataSource).packages("com.iemr.common.identity.*","com.iemr.common.identity.data.*","com.iemr.common.identity.domain.*").persistenceUnit("db_identity").build();
+		return builder.dataSource(dataSource).packages("com.iemr.common.identity.*", "com.iemr.common.identity.data.*",
+				"com.iemr.common.identity.domain.*").persistenceUnit("db_identity").build();
 	}
 
 	@Primary
diff --git a/src/main/java/com/iemr/common/identity/utils/CommonMain.java b/src/main/java/com/iemr/common/identity/utils/CommonMain.java
index 17efa6fd..00d77712 100644
--- a/src/main/java/com/iemr/common/identity/utils/CommonMain.java
+++ b/src/main/java/com/iemr/common/identity/utils/CommonMain.java
@@ -2,66 +2,25 @@
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration;
 
 import com.iemr.common.identity.utils.config.ConfigProperties;
-import com.iemr.common.identity.utils.km.KMService;
-import com.iemr.common.identity.utils.km.openkm.OpenKMServiceImpl;
 import com.iemr.common.identity.utils.redis.RedisStorage;
 
-
 @EnableAutoConfiguration
-public class CommonMain
-{
+public class CommonMain {
 	@Bean
-	public ConfigProperties configProperties()
-	{
+	public ConfigProperties configProperties() {
 		return new ConfigProperties();
 	}
 
-//	@Bean
-//	public SessionObject sessionObject()
-//	{
-//		return new SessionObject();
-//	}
-
-	// @Beanss
-	// public RedisConnection redisConnection()
-	// {
-	// return new RedisConnection();
-	// }
-
-	// @Configuration
-	// @EnableRedisHttpSession
-	// public class Config {
-
-//	@Bean
-//	public LettuceConnectionFactory connectionFactory()
-//	{
-//		return new LettuceConnectionFactory();
-//	}
-	// }
-
 	@Bean
-	public RedisHttpSessionConfiguration redisSession()
-	{
+	public RedisHttpSessionConfiguration redisSession() {
 		return new RedisHttpSessionConfiguration();
 	}
 
 	@Bean
-	public KMService getOpenKMService()
-	{
-		KMService kmService = new OpenKMServiceImpl();
-		return kmService;
-	}
-
-	@Bean
-	public RedisStorage redisStorage()
-	{
+	public RedisStorage redisStorage() {
 		return new RedisStorage();
 	}
-	// public static void main(String[] args) {
-	// SpringApplication.run(CommonMain.class, args);
-	// }
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java b/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java
new file mode 100644
index 00000000..02d012d8
--- /dev/null
+++ b/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java
@@ -0,0 +1,55 @@
+package com.iemr.common.identity.utils;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CryptoUtil {
+
+	private static final Logger logger = LoggerFactory.getLogger(CryptoUtil.class);
+	private static final String ALGORITHM = "AES";
+	private static final String SECRET_KEY = "dev-envro-secret";
+
+	public String encrypt(String value) throws Exception {
+		SecretKey secretKey = new SecretKeySpec(SECRET_KEY.getBytes(StandardCharsets.UTF_8), ALGORITHM);
+		Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+		cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+		byte[] encryptedBytes = cipher.doFinal(addPadding(value).getBytes(StandardCharsets.UTF_8));
+		return Base64.getEncoder().encodeToString(encryptedBytes);
+	}
+
+	public String decrypt(String encryptedValue) {
+		try {
+			SecretKey secretKey = new SecretKeySpec(SECRET_KEY.getBytes(StandardCharsets.UTF_8), ALGORITHM);
+			Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+			cipher.init(Cipher.DECRYPT_MODE, secretKey);
+			byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedValue));
+			return removePadding(new String(decryptedBytes, StandardCharsets.UTF_8));
+		} catch (Exception e) {
+			logger.error("Exception while decrypting string. Intentionally throwing null pointer", e);
+			return null;
+		}
+	}
+
+	private String addPadding(String value) {
+		int paddingLength = 16 - (value.length() % 16);
+		StringBuilder paddedValue = new StringBuilder(value);
+		for (int i = 0; i < paddingLength; i++) {
+			paddedValue.append((char) paddingLength);
+		}
+		return paddedValue.toString();
+	}
+
+	private String removePadding(String value) {
+		int paddingLength = value.charAt(value.length() - 1);
+		return value.substring(0, value.length() - paddingLength);
+	}
+}
diff --git a/src/main/java/com/iemr/common/identity/utils/IEMRApplBeans.java b/src/main/java/com/iemr/common/identity/utils/IEMRApplBeans.java
index 031d65be..61959f46 100644
--- a/src/main/java/com/iemr/common/identity/utils/IEMRApplBeans.java
+++ b/src/main/java/com/iemr/common/identity/utils/IEMRApplBeans.java
@@ -10,19 +10,12 @@
 import com.iemr.common.identity.utils.config.ConfigProperties;
 import com.iemr.common.identity.utils.gateway.email.EmailService;
 import com.iemr.common.identity.utils.gateway.email.GenericEmailServiceImpl;
-import com.iemr.common.identity.utils.km.KMService;
-import com.iemr.common.identity.utils.km.openkm.OpenKMServiceImpl;
 import com.iemr.common.identity.utils.redis.RedisStorage;
 import com.iemr.common.identity.utils.sessionobject.SessionObject;
 import com.iemr.common.identity.utils.validator.Validator;
 
 @Configuration
 public class IEMRApplBeans {
-	@Bean
-	public KMService getOpenKMService() {
-		KMService kmService = new OpenKMServiceImpl();
-		return kmService;
-	}
 
 	@Bean
 	public Validator getVaidator() {
@@ -57,30 +50,6 @@ public RedisStorage redisStorage() {
 		return new RedisStorage();
 	}
 
-	// @Beanss
-	// public RedisConnection redisConnection()
-	// {
-	// return new RedisConnection();
-	// }
-
-	// @Configuration
-	// @EnableRedisHttpSession
-	// public class Config
-	// {
-
-//	@Bean
-//	public LettuceConnectionFactory connectionFactory()
-//	{
-//		return new LettuceConnectionFactory();
-//	}
-	// }
-
-//	@Bean
-//	public RedisHttpSessionConfiguration redisSession()
-//	{
-//		return new RedisHttpSessionConfiguration();
-//	}
-
 	private @Value("${spring.redis.host}") String redisHost;
 	private @Value("${spring.redis.port}") int redisPort;
 
@@ -91,19 +60,4 @@ public LettuceConnectionFactory connectionFactory() {
 		return new LettuceConnectionFactory(redisHost, redisPort);
 	}
 
-	// @Bean
-	// public HTTPRequestInterceptor myInterceptor()
-	// {
-	// return new HTTPRequestInterceptor();
-	// }
-	// @Bean
-	// public KMService getOpenKMService()
-	// {
-	// KMService kmService = new OpenKMServiceImpl();
-	// return kmService;
-	// }
-
-	// public static void main(String[] args) {
-	// SpringApplication.run(CommonMain.class, args);
-	// }
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/km/KMService.java b/src/main/java/com/iemr/common/identity/utils/km/KMService.java
deleted file mode 100644
index 99b3c350..00000000
--- a/src/main/java/com/iemr/common/identity/utils/km/KMService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.iemr.common.identity.utils.km;
-
-public interface KMService
-{
-	String getDocumentRoot();
-	
-	String createDocument(String documentPath, String filepath);
-}
diff --git a/src/main/java/com/iemr/common/identity/utils/km/openkm/OpenKMConnector.java b/src/main/java/com/iemr/common/identity/utils/km/openkm/OpenKMConnector.java
deleted file mode 100644
index d83819b7..00000000
--- a/src/main/java/com/iemr/common/identity/utils/km/openkm/OpenKMConnector.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.iemr.common.identity.utils.km.openkm;
-
-import com.openkm.sdk4j.OKMWebservices;
-import com.openkm.sdk4j.OKMWebservicesFactory;
-
-public class OpenKMConnector {
-	private static OKMWebservices openKMService = null;
-	
-	public static OKMWebservices initialize(String url, String username, String password) {
-		if (openKMService==null) {
-			openKMService = OKMWebservicesFactory.newInstance(url, username, password);
-		}		
-		return openKMService;
-	}
-}
diff --git a/src/main/java/com/iemr/common/identity/utils/km/openkm/OpenKMServiceImpl.java b/src/main/java/com/iemr/common/identity/utils/km/openkm/OpenKMServiceImpl.java
deleted file mode 100644
index 9cf07713..00000000
--- a/src/main/java/com/iemr/common/identity/utils/km/openkm/OpenKMServiceImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.iemr.common.identity.utils.km.openkm;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.iemr.common.identity.controller.IdentityController;
-import com.iemr.common.identity.utils.config.ConfigProperties;
-import com.iemr.common.identity.utils.km.KMService;
-import com.openkm.sdk4j.OKMWebservices;
-import com.openkm.sdk4j.bean.Document;
-import com.openkm.sdk4j.bean.Folder;
-import com.openkm.sdk4j.exception.AccessDeniedException;
-import com.openkm.sdk4j.exception.AutomationException;
-import com.openkm.sdk4j.exception.DatabaseException;
-import com.openkm.sdk4j.exception.ExtensionException;
-import com.openkm.sdk4j.exception.FileSizeExceededException;
-import com.openkm.sdk4j.exception.ItemExistsException;
-import com.openkm.sdk4j.exception.LockException;
-import com.openkm.sdk4j.exception.PathNotFoundException;
-import com.openkm.sdk4j.exception.RepositoryException;
-import com.openkm.sdk4j.exception.UnknowException;
-import com.openkm.sdk4j.exception.UnsupportedMimeTypeException;
-import com.openkm.sdk4j.exception.UserQuotaExceededException;
-import com.openkm.sdk4j.exception.VersionException;
-import com.openkm.sdk4j.exception.VirusDetectedException;
-import com.openkm.sdk4j.exception.WebserviceException;
-
-public class OpenKMServiceImpl implements KMService {
-	// private ConfigProperties configProperties;
-	//
-	// @Autowired
-	// public void setConfigProperties(ConfigProperties configProperties)
-	// {
-	// this.configProperties = configProperties;
-	// }
-
-	private static String url;
-	private static String username;
-	private static String password;
-	private static String kmRootPath;
-	private static String guestUser;
-	private static String guestPassword;
-
-	public OpenKMServiceImpl() {
-	}
-	private Logger logger = LoggerFactory.getLogger(IdentityController.class);
-	private static OKMWebservices connector = null;
-
-	public void init() {
-		if (connector == null) {
-			url = ConfigProperties.getPropertyByName("km-base-url");
-			username = ConfigProperties.getPropertyByName("km-username");
-			password = ConfigProperties.getPropertyByName("km-password");
-			kmRootPath = ConfigProperties.getPropertyByName("km-root-path");
-			guestUser = ConfigProperties.getPropertyByName("km-guest-user");
-			guestPassword = ConfigProperties.getPropertyByName("km-guest-password");
-			connector = OpenKMConnector.initialize(url, username, password);
-		}
-	}
-
-	@Override
-	public String getDocumentRoot() {
-		String response = null;
-		this.init();
-		try {
-			Folder rootFolder = connector.getRootFolder();
-			response = rootFolder.getPath();
-		} catch (PathNotFoundException | RepositoryException | DatabaseException | UnknowException
-				| WebserviceException e) {
-			logger.error(e.getMessage());
-		} catch (Exception e) {
-			logger.error(e.getMessage());
-		}
-		return response;
-	}
-
-	public String uploadFile() {
-		String response = null;
-		this.init();
-		try {
-			response = connector.checkin("", new FileInputStream(""), "").toString();
-		} catch (FileSizeExceededException | UserQuotaExceededException | VirusDetectedException | LockException
-				| VersionException | PathNotFoundException | AccessDeniedException | RepositoryException | IOException
-				| DatabaseException | ExtensionException | AutomationException | UnknowException
-				| WebserviceException e) {
-			logger.error(e.getMessage());
-		}
-		return response;
-	}
-
-	@Override
-	public String createDocument(String documentPath, String filepath) {
-		String response = null;
-		this.init();
-		try {
-			FileInputStream file = new FileInputStream(filepath);
-			Document doc = connector.createDocumentSimple(kmRootPath + documentPath, file);
-			response = doc.getUuid();
-		} catch (PathNotFoundException e) {
-			createFolder(e.getMessage());
-			response = createDocument(documentPath, filepath);
-		} catch (IOException | UnsupportedMimeTypeException | FileSizeExceededException | UserQuotaExceededException
-				| VirusDetectedException | ItemExistsException | AccessDeniedException | RepositoryException
-				| DatabaseException | ExtensionException | AutomationException | UnknowException
-				| WebserviceException e) {
-			logger.error(e.getMessage());
-		}
-		return response;
-	}
-
-	public String createFolder(String path) {
-		String response = null;
-		this.init();
-		String[] folders = path.split("/");
-		String basePath = "";
-		try {
-			for (int index = 1; index < folders.length - 1; index++) {
-				basePath += "/" + folders[index];
-				Folder folder = new Folder();
-				folder.setPath(basePath + "/" + folders[index + 1]);
-				List<Folder> childrens = connector.getFolderChildren(basePath);
-				boolean exists = false;
-				for (Folder folder2 : childrens) {
-					if (folder2.getPath().toString().equals(folder.getPath().toString())) {
-						exists = true;
-						break;
-					}
-				}
-				createFolder(folder.getPath(), exists);
-			}
-		} catch (PathNotFoundException | AccessDeniedException | RepositoryException | ItemExistsException
-				| DatabaseException | ExtensionException | AutomationException | UnknowException
-				| WebserviceException e) {
-			logger.error(e.getMessage());
-		}
-		return response;
-	}
-
-	private void createFolder(String path, boolean exists)
-			throws AccessDeniedException, RepositoryException, PathNotFoundException, ItemExistsException,
-			DatabaseException, ExtensionException, AutomationException, UnknowException, WebserviceException {
-		if (!exists) {
-			Folder folder = connector.createFolderSimple(path);
-		}
-	}
-
-	public String deleteDocument(String documentID) {
-		String response = "failure";
-		this.init();
-		try {
-			connector.deleteDocument(documentID);
-			response = "success";
-		} catch (AccessDeniedException | RepositoryException | PathNotFoundException | LockException | DatabaseException
-				| ExtensionException | UnknowException | WebserviceException e) {
-			logger.error(e.getMessage());
-		}
-		return response;
-	}
-}

From 03bf370fbf0a83f52995dfc085deec36b223ef42 Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Thu, 8 Jun 2023 15:46:39 +0530
Subject: [PATCH 03/53] updated code-of-conduct, copying, contributing, readme
 (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md
---
 CODE_OF_CONDUCT.md | 132 +++++++++
 CONTRIBUTING.md    |  32 +++
 COPYING            | 674 +++++++++++++++++++++++++++++++++++++++++++++
 README.md          |   2 +-
 4 files changed, 839 insertions(+), 1 deletion(-)
 create mode 100644 CODE_OF_CONDUCT.md
 create mode 100644 CONTRIBUTING.md
 create mode 100644 COPYING

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..06f0dc78
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,132 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at amrit@piramalswasthya.org.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by 
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..dc34fb92
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,32 @@
+# Contributing to AMRIT
+
+AMRIT is released under the GPLv3 license. If you would like to contribute something, or want to hack on the code this document should help you get started.
+
+# Code of Conduct
+This project adheres to the [Contributor Covenant](CODE_OF_CONDUCT.md).
+By participating, you are expected to uphold this code. Please report unacceptable behavior to amrit@piramalswasthya.org.
+
+# Using GitHub Issues
+We use GitHub issues to track bugs and enhancements reported by the community.
+If you have a general usage question please ask on amrit@piramalswasthya.org.
+
+If you are reporting a bug, please help to speed up problem diagnosis by providing as much information as possible.
+Ideally, that would include a small sample project that reproduces the problem.
+
+# Reporting Security Vulnerabilities
+If you think you have found a security vulnerability in AMRIT please *DO NOT* disclose it publicly until we've had a chance to fix it.
+Please don't report security vulnerabilities using GitHub issues, instead drop an email to amrit@piramalswasthya.org by providing as much as information as possible.
+
+# Code Conventions and Housekeeping
+None of these are essential for a pull request, but they will all help.  They can also be added after the original pull request but before a merge.
+
+* Make sure all new `.java` files have a Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for.
+* Add the GPLv3 boilerplate notice (license header comment) to all new `.java` files (copy from existing files in the project).
+* Add yourself as an `@author` to the `.java` files that you modify substantially (more than cosmetic changes).
+* Add some Javadocs.
+* A few unit tests would help a lot as well -- someone has to do it.
+* If no-one else is using your branch, please rebase it against the current main branch (or other target branch in the project).
+* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+# Working with the Code
+For information on editing, building, and testing the code, see the [developer guide](https://psmri.github.io/PSMRI) page on the project wiki.
diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index 8d86395f..fb30a78d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Identity API Module 
+# AMRIT - Identity Service 
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) 
 
 Identity API is a microservice which is used for the creation and management of beneficaries.

From eccad20ace35eb2de70f4a7c233e8365a13e6dac Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Fri, 9 Jun 2023 14:38:22 +0530
Subject: [PATCH 04/53] modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory
---
 .gitignore                            |  11 +-
 .mvn/wrapper/maven-wrapper.jar        | Bin 47610 -> 0 bytes
 .mvn/wrapper/maven-wrapper.properties |   1 -
 .sts4-cache/classpath-data.json       |   1 -
 deployidentity.bat                    |   5 -
 logs/app.log                          | 999 --------------------------
 mvnw                                  | 225 ------
 mvnw.cmd                              | 143 ----
 8 files changed, 9 insertions(+), 1376 deletions(-)
 delete mode 100644 .mvn/wrapper/maven-wrapper.jar
 delete mode 100644 .mvn/wrapper/maven-wrapper.properties
 delete mode 100644 .sts4-cache/classpath-data.json
 delete mode 100644 deployidentity.bat
 delete mode 100644 logs/app.log
 delete mode 100644 mvnw
 delete mode 100644 mvnw.cmd

diff --git a/.gitignore b/.gitignore
index 2af7cefb..7a81f181 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
+#Ignore target and logs
 target/
-!.mvn/wrapper/maven-wrapper.jar
+logs/
 
 ### STS ###
 .apt_generated
@@ -8,6 +9,7 @@ target/
 .project
 .settings
 .springBeans
+.sts4-cache
 
 ### IntelliJ IDEA ###
 .idea
@@ -21,4 +23,9 @@ build/
 nbbuild/
 dist/
 nbdist/
-.nb-gradle/
\ No newline at end of file
+.nb-gradle/
+
+### Other Entries ###
+mvnw
+mvnw.cmd
+.mvn
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 9cc84ea9b4d95453115d0c26488d6a78694e0bc6..0000000000000000000000000000000000000000
GIT binary patch
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index 9dda3b65..00000000
--- a/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
diff --git a/.sts4-cache/classpath-data.json b/.sts4-cache/classpath-data.json
deleted file mode 100644
index fc964630..00000000
--- a/.sts4-cache/classpath-data.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"identity","classpathEntries":[{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_241\\jre\\lib\\resources.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_241\\jre\\lib\\rt.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_241\\jre\\lib\\jsse.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_241\\jre\\lib\\jce.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_241\\jre\\lib\\charsets.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_241\\jre\\lib\\jfr.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-data-jpa\\1.5.8.RELEASE\\spring-boot-starter-data-jpa-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-data-jpa/1.5.8.RELEASE/spring-boot-starter-data-jpa-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter\\1.5.8.RELEASE\\spring-boot-starter-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter/1.5.8.RELEASE/spring-boot-starter-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-logging\\1.5.8.RELEASE\\spring-boot-starter-logging-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-logging/1.5.8.RELEASE/spring-boot-starter-logging-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\ch\\qos\\logback\\logback-classic\\1.1.11\\logback-classic-1.1.11.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/ch/qos/logback/logback-classic/1.1.11/logback-classic-1.1.11-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/ch/qos/logback/logback-classic/1.1.11/logback-classic-1.1.11-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\ch\\qos\\logback\\logback-core\\1.1.11\\logback-core-1.1.11.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/ch/qos/logback/logback-core/1.1.11/logback-core-1.1.11-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/ch/qos/logback/logback-core/1.1.11/logback-core-1.1.11-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\slf4j\\jul-to-slf4j\\1.7.25\\jul-to-slf4j-1.7.25.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\slf4j\\log4j-over-slf4j\\1.7.25\\log4j-over-slf4j-1.7.25.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/log4j-over-slf4j/1.7.25/log4j-over-slf4j-1.7.25-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/log4j-over-slf4j/1.7.25/log4j-over-slf4j-1.7.25-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\yaml\\snakeyaml\\1.17\\snakeyaml-1.17.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/yaml/snakeyaml/1.17/snakeyaml-1.17-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/yaml/snakeyaml/1.17/snakeyaml-1.17-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-aop\\1.5.8.RELEASE\\spring-boot-starter-aop-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-aop/1.5.8.RELEASE/spring-boot-starter-aop-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\aspectj\\aspectjweaver\\1.8.11\\aspectjweaver-1.8.11.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/aspectj/aspectjweaver/1.8.11/aspectjweaver-1.8.11-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/aspectj/aspectjweaver/1.8.11/aspectjweaver-1.8.11-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-jdbc\\1.5.8.RELEASE\\spring-boot-starter-jdbc-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-jdbc/1.5.8.RELEASE/spring-boot-starter-jdbc-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\apache\\tomcat\\tomcat-jdbc\\8.5.23\\tomcat-jdbc-8.5.23.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/apache/tomcat/tomcat-jdbc/8.5.23/tomcat-jdbc-8.5.23-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\apache\\tomcat\\tomcat-juli\\8.5.23\\tomcat-juli-8.5.23.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/apache/tomcat/tomcat-juli/8.5.23/tomcat-juli-8.5.23-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-jdbc\\4.3.12.RELEASE\\spring-jdbc-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-jdbc/4.3.12.RELEASE/spring-jdbc-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-jdbc/4.3.12.RELEASE/spring-jdbc-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\hibernate\\hibernate-core\\5.0.12.Final\\hibernate-core-5.0.12.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hibernate/hibernate-core/5.0.12.Final/hibernate-core-5.0.12.Final-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\jboss\\logging\\jboss-logging\\3.3.1.Final\\jboss-logging-3.3.1.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/jboss/logging/jboss-logging/3.3.1.Final/jboss-logging-3.3.1.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/jboss/logging/jboss-logging/3.3.1.Final/jboss-logging-3.3.1.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\hibernate\\javax\\persistence\\hibernate-jpa-2.1-api\\1.0.0.Final\\hibernate-jpa-2.1-api-1.0.0.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\javassist\\javassist\\3.21.0-GA\\javassist-3.21.0-GA.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\antlr\\antlr\\2.7.7\\antlr-2.7.7.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\jboss\\jandex\\2.0.0.Final\\jandex-2.0.0.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/jboss/jandex/2.0.0.Final/jandex-2.0.0.Final-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\dom4j\\dom4j\\1.6.1\\dom4j-1.6.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\hibernate\\common\\hibernate-commons-annotations\\5.0.1.Final\\hibernate-commons-annotations-5.0.1.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\hibernate\\hibernate-entitymanager\\5.0.12.Final\\hibernate-entitymanager-5.0.12.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hibernate/hibernate-entitymanager/5.0.12.Final/hibernate-entitymanager-5.0.12.Final-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\javax\\transaction\\javax.transaction-api\\1.2\\javax.transaction-api-1.2.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/javax/transaction/javax.transaction-api/1.2/javax.transaction-api-1.2-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/javax/transaction/javax.transaction-api/1.2/javax.transaction-api-1.2-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\data\\spring-data-jpa\\1.11.8.RELEASE\\spring-data-jpa-1.11.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/data/spring-data-jpa/1.11.8.RELEASE/spring-data-jpa-1.11.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/data/spring-data-jpa/1.11.8.RELEASE/spring-data-jpa-1.11.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\data\\spring-data-commons\\1.13.8.RELEASE\\spring-data-commons-1.13.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/data/spring-data-commons/1.13.8.RELEASE/spring-data-commons-1.13.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/data/spring-data-commons/1.13.8.RELEASE/spring-data-commons-1.13.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-orm\\4.3.12.RELEASE\\spring-orm-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-orm/4.3.12.RELEASE/spring-orm-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-orm/4.3.12.RELEASE/spring-orm-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-beans\\4.3.12.RELEASE\\spring-beans-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-beans/4.3.12.RELEASE/spring-beans-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-beans/4.3.12.RELEASE/spring-beans-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-aspects\\4.3.12.RELEASE\\spring-aspects-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-aspects/4.3.12.RELEASE/spring-aspects-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-aspects/4.3.12.RELEASE/spring-aspects-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-validation\\1.5.8.RELEASE\\spring-boot-starter-validation-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-validation/1.5.8.RELEASE/spring-boot-starter-validation-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\apache\\tomcat\\embed\\tomcat-embed-el\\8.5.23\\tomcat-embed-el-8.5.23.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/apache/tomcat/embed/tomcat-embed-el/8.5.23/tomcat-embed-el-8.5.23-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\hibernate\\hibernate-validator\\5.3.5.Final\\hibernate-validator-5.3.5.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hibernate/hibernate-validator/5.3.5.Final/hibernate-validator-5.3.5.Final-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\javax\\validation\\validation-api\\1.1.0.Final\\validation-api-1.1.0.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-web\\1.5.8.RELEASE\\spring-boot-starter-web-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-web/1.5.8.RELEASE/spring-boot-starter-web-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-tomcat\\1.5.8.RELEASE\\spring-boot-starter-tomcat-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-tomcat/1.5.8.RELEASE/spring-boot-starter-tomcat-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\apache\\tomcat\\embed\\tomcat-embed-core\\8.5.23\\tomcat-embed-core-8.5.23.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\apache\\tomcat\\tomcat-annotations-api\\8.5.23\\tomcat-annotations-api-8.5.23.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-web\\4.3.12.RELEASE\\spring-web-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-web/4.3.12.RELEASE/spring-web-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-web/4.3.12.RELEASE/spring-web-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-webmvc\\4.3.12.RELEASE\\spring-webmvc-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-webmvc/4.3.12.RELEASE/spring-webmvc-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-webmvc/4.3.12.RELEASE/spring-webmvc-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-expression\\4.3.12.RELEASE\\spring-expression-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-expression/4.3.12.RELEASE/spring-expression-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-expression/4.3.12.RELEASE/spring-expression-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-devtools\\1.5.8.RELEASE\\spring-boot-devtools-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-devtools/1.5.8.RELEASE/spring-boot-devtools-1.5.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-devtools/1.5.8.RELEASE/spring-boot-devtools-1.5.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot\\1.5.8.RELEASE\\spring-boot-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot/1.5.8.RELEASE/spring-boot-1.5.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot/1.5.8.RELEASE/spring-boot-1.5.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-autoconfigure\\1.5.8.RELEASE\\spring-boot-autoconfigure-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-autoconfigure/1.5.8.RELEASE/spring-boot-autoconfigure-1.5.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-autoconfigure/1.5.8.RELEASE/spring-boot-autoconfigure-1.5.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\mysql\\mysql-connector-java\\5.1.44\\mysql-connector-java-5.1.44.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/mysql/mysql-connector-java/5.1.44/mysql-connector-java-5.1.44-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\projectlombok\\lombok\\1.16.18\\lombok-1.16.18.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/projectlombok/lombok/1.16.18/lombok-1.16.18-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/projectlombok/lombok/1.16.18/lombok-1.16.18-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\mapstruct\\mapstruct-jdk8\\1.2.0.Final\\mapstruct-jdk8-1.2.0.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mapstruct/mapstruct-jdk8/1.2.0.Final/mapstruct-jdk8-1.2.0.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mapstruct/mapstruct-jdk8/1.2.0.Final/mapstruct-jdk8-1.2.0.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\mapstruct\\mapstruct-processor\\1.2.0.Final\\mapstruct-processor-1.2.0.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mapstruct/mapstruct-processor/1.2.0.Final/mapstruct-processor-1.2.0.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mapstruct/mapstruct-processor/1.2.0.Final/mapstruct-processor-1.2.0.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\google\\code\\gson\\gson\\2.8.2\\gson-2.8.2.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/google/code/gson/gson/2.8.2/gson-2.8.2-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/google/code/gson/gson/2.8.2/gson-2.8.2-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-test\\1.5.8.RELEASE\\spring-boot-starter-test-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-test/1.5.8.RELEASE/spring-boot-starter-test-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-test\\1.5.8.RELEASE\\spring-boot-test-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-test/1.5.8.RELEASE/spring-boot-test-1.5.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-test/1.5.8.RELEASE/spring-boot-test-1.5.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-test-autoconfigure\\1.5.8.RELEASE\\spring-boot-test-autoconfigure-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-test-autoconfigure/1.5.8.RELEASE/spring-boot-test-autoconfigure-1.5.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-test-autoconfigure/1.5.8.RELEASE/spring-boot-test-autoconfigure-1.5.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\jayway\\jsonpath\\json-path\\2.2.0\\json-path-2.2.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/jayway/jsonpath/json-path/2.2.0/json-path-2.2.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/jayway/jsonpath/json-path/2.2.0/json-path-2.2.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\net\\minidev\\json-smart\\2.2.1\\json-smart-2.2.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/net/minidev/json-smart/2.2.1/json-smart-2.2.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/net/minidev/json-smart/2.2.1/json-smart-2.2.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\net\\minidev\\accessors-smart\\1.1\\accessors-smart-1.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/net/minidev/accessors-smart/1.1/accessors-smart-1.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/net/minidev/accessors-smart/1.1/accessors-smart-1.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\ow2\\asm\\asm\\5.0.3\\asm-5.0.3.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\assertj\\assertj-core\\2.6.0\\assertj-core-2.6.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/assertj/assertj-core/2.6.0/assertj-core-2.6.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/assertj/assertj-core/2.6.0/assertj-core-2.6.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\mockito\\mockito-core\\1.10.19\\mockito-core-1.10.19.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\objenesis\\objenesis\\2.1\\objenesis-2.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/objenesis/objenesis/2.1/objenesis-2.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/objenesis/objenesis/2.1/objenesis-2.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\hamcrest\\hamcrest-core\\1.3\\hamcrest-core-1.3.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\hamcrest\\hamcrest-library\\1.3\\hamcrest-library-1.3.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\skyscreamer\\jsonassert\\1.4.0\\jsonassert-1.4.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/skyscreamer/jsonassert/1.4.0/jsonassert-1.4.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/skyscreamer/jsonassert/1.4.0/jsonassert-1.4.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-core\\4.3.12.RELEASE\\spring-core-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-core/4.3.12.RELEASE/spring-core-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-core/4.3.12.RELEASE/spring-core-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-test\\4.3.12.RELEASE\\spring-test-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-test/4.3.12.RELEASE/spring-test-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-test/4.3.12.RELEASE/spring-test-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\security\\spring-security-test\\4.2.3.RELEASE\\spring-security-test-4.2.3.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/security/spring-security-test/4.2.3.RELEASE/spring-security-test-4.2.3.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/security/spring-security-test/4.2.3.RELEASE/spring-security-test-4.2.3.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\security\\spring-security-core\\4.2.3.RELEASE\\spring-security-core-4.2.3.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/security/spring-security-core/4.2.3.RELEASE/spring-security-core-4.2.3.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/security/spring-security-core/4.2.3.RELEASE/spring-security-core-4.2.3.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\aopalliance\\aopalliance\\1.0\\aopalliance-1.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\security\\spring-security-web\\4.2.3.RELEASE\\spring-security-web-4.2.3.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/security/spring-security-web/4.2.3.RELEASE/spring-security-web-4.2.3.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/security/spring-security-web/4.2.3.RELEASE/spring-security-web-4.2.3.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\javax\\servlet\\servlet-api\\2.5\\servlet-api-2.5.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\javax\\servlet\\jstl\\1.2\\jstl-1.2.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/javax/servlet/jstl/1.2/jstl-1.2-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\springfox\\springfox-swagger2\\2.8.0\\springfox-swagger2-2.8.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-swagger2/2.8.0/springfox-swagger2-2.8.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-swagger2/2.8.0/springfox-swagger2-2.8.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\swagger\\swagger-annotations\\1.5.14\\swagger-annotations-1.5.14.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/swagger/swagger-annotations/1.5.14/swagger-annotations-1.5.14-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/swagger/swagger-annotations/1.5.14/swagger-annotations-1.5.14-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\swagger\\swagger-models\\1.5.14\\swagger-models-1.5.14.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/swagger/swagger-models/1.5.14/swagger-models-1.5.14-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/swagger/swagger-models/1.5.14/swagger-models-1.5.14-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\springfox\\springfox-spi\\2.8.0\\springfox-spi-2.8.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-spi/2.8.0/springfox-spi-2.8.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-spi/2.8.0/springfox-spi-2.8.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\springfox\\springfox-core\\2.8.0\\springfox-core-2.8.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-core/2.8.0/springfox-core-2.8.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-core/2.8.0/springfox-core-2.8.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\net\\bytebuddy\\byte-buddy\\1.7.9\\byte-buddy-1.7.9.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/net/bytebuddy/byte-buddy/1.7.9/byte-buddy-1.7.9-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/net/bytebuddy/byte-buddy/1.7.9/byte-buddy-1.7.9-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\springfox\\springfox-schema\\2.8.0\\springfox-schema-2.8.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-schema/2.8.0/springfox-schema-2.8.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-schema/2.8.0/springfox-schema-2.8.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\springfox\\springfox-swagger-common\\2.8.0\\springfox-swagger-common-2.8.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-swagger-common/2.8.0/springfox-swagger-common-2.8.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-swagger-common/2.8.0/springfox-swagger-common-2.8.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\springfox\\springfox-spring-web\\2.8.0\\springfox-spring-web-2.8.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-spring-web/2.8.0/springfox-spring-web-2.8.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-spring-web/2.8.0/springfox-spring-web-2.8.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\reflections\\reflections\\0.9.11\\reflections-0.9.11.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/reflections/reflections/0.9.11/reflections-0.9.11-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/reflections/reflections/0.9.11/reflections-0.9.11-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\google\\guava\\guava\\20.0\\guava-20.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/google/guava/guava/20.0/guava-20.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/google/guava/guava/20.0/guava-20.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\fasterxml\\classmate\\1.3.4\\classmate-1.3.4.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/classmate/1.3.4/classmate-1.3.4-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/classmate/1.3.4/classmate-1.3.4-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\slf4j\\slf4j-api\\1.7.25\\slf4j-api-1.7.25.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\plugin\\spring-plugin-core\\1.2.0.RELEASE\\spring-plugin-core-1.2.0.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\plugin\\spring-plugin-metadata\\1.2.0.RELEASE\\spring-plugin-metadata-1.2.0.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\mapstruct\\mapstruct\\1.2.0.Final\\mapstruct-1.2.0.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\springfox\\springfox-swagger-ui\\2.8.0\\springfox-swagger-ui-2.8.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-swagger-ui/2.8.0/springfox-swagger-ui-2.8.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/springfox/springfox-swagger-ui/2.8.0/springfox-swagger-ui-2.8.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\json\\json\\20160212\\json-20160212.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/json/json/20160212/json-20160212-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/json/json/20160212/json-20160212-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\fasterxml\\jackson\\datatype\\jackson-datatype-joda\\2.4.0\\jackson-datatype-joda-2.4.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.4.0/jackson-datatype-joda-2.4.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.4.0/jackson-datatype-joda-2.4.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\fasterxml\\jackson\\core\\jackson-annotations\\2.8.0\\jackson-annotations-2.8.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\fasterxml\\jackson\\core\\jackson-core\\2.8.10\\jackson-core-2.8.10.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\joda-time\\joda-time\\2.9.9\\joda-time-2.9.9.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/joda-time/joda-time/2.9.9/joda-time-2.9.9-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/joda-time/joda-time/2.9.9/joda-time-2.9.9-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\fasterxml\\jackson\\core\\jackson-databind\\2.7.1\\jackson-databind-2.7.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.7.1/jackson-databind-2.7.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.7.1/jackson-databind-2.7.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\quartz-scheduler\\quartz\\2.2.1\\quartz-2.2.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/quartz-scheduler/quartz/2.2.1/quartz-2.2.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/quartz-scheduler/quartz/2.2.1/quartz-2.2.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\c3p0\\c3p0\\0.9.1.1\\c3p0-0.9.1.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/c3p0/c3p0/0.9.1.1/c3p0-0.9.1.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/c3p0/c3p0/0.9.1.1/c3p0-0.9.1.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\quartz-scheduler\\quartz-jobs\\2.2.1\\quartz-jobs-2.2.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/quartz-scheduler/quartz-jobs/2.2.1/quartz-jobs-2.2.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/quartz-scheduler/quartz-jobs/2.2.1/quartz-jobs-2.2.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-cache\\1.5.8.RELEASE\\spring-boot-starter-cache-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-cache/1.5.8.RELEASE/spring-boot-starter-cache-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-context\\4.3.12.RELEASE\\spring-context-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-context/4.3.12.RELEASE/spring-context-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-context/4.3.12.RELEASE/spring-context-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-context-support\\4.3.12.RELEASE\\spring-context-support-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-context-support/4.3.12.RELEASE/spring-context-support-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-context-support/4.3.12.RELEASE/spring-context-support-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-configuration-processor\\1.5.8.RELEASE\\spring-boot-configuration-processor-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-configuration-processor/1.5.8.RELEASE/spring-boot-configuration-processor-1.5.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-configuration-processor/1.5.8.RELEASE/spring-boot-configuration-processor-1.5.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\vaadin\\external\\google\\android-json\\0.0.20131108.vaadin1\\android-json-0.0.20131108.vaadin1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\openkm\\sdk4j\\1.0\\sdk4j-1.0.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/openkm/sdk4j/1.0/sdk4j-1.0-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\slf4j\\slf4j-log4j12\\1.7.25\\slf4j-log4j12-1.7.25.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/slf4j-log4j12/1.7.25/slf4j-log4j12-1.7.25-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/slf4j-log4j12/1.7.25/slf4j-log4j12-1.7.25-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\log4j\\log4j\\1.2.17\\log4j-1.2.17.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/log4j/log4j/1.2.17/log4j-1.2.17-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/log4j/log4j/1.2.17/log4j-1.2.17-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\commons-io\\commons-io\\1.3.2\\commons-io-1.3.2.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\sun\\jersey\\jersey-client\\1.17.1\\jersey-client-1.17.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/sun/jersey/jersey-client/1.17.1/jersey-client-1.17.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/sun/jersey/jersey-client/1.17.1/jersey-client-1.17.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\sun\\jersey\\jersey-core\\1.17.1\\jersey-core-1.17.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/sun/jersey/jersey-core/1.17.1/jersey-core-1.17.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/sun/jersey/jersey-core/1.17.1/jersey-core-1.17.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\sun\\jersey\\contribs\\jersey-multipart\\1.17.1\\jersey-multipart-1.17.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/sun/jersey/contribs/jersey-multipart/1.17.1/jersey-multipart-1.17.1-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/sun/jersey/contribs/jersey-multipart/1.17.1/jersey-multipart-1.17.1-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\jvnet\\mimepull\\1.6\\mimepull-1.6.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/jvnet/mimepull/1.6/mimepull-1.6-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/jvnet/mimepull/1.6/mimepull-1.6-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\net\\sf\\dozer\\dozer\\5.3.2\\dozer-5.3.2.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/net/sf/dozer/dozer/5.3.2/dozer-5.3.2-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/net/sf/dozer/dozer/5.3.2/dozer-5.3.2-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\commons-beanutils\\commons-beanutils\\1.9.3\\commons-beanutils-1.9.3.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\commons-collections\\commons-collections\\3.2.2\\commons-collections-3.2.2.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\commons-lang\\commons-lang\\2.5\\commons-lang-2.5.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/commons-lang/commons-lang/2.5/commons-lang-2.5-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\boot\\spring-boot-starter-mail\\1.5.8.RELEASE\\spring-boot-starter-mail-1.5.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/boot/spring-boot-starter-mail/1.5.8.RELEASE/spring-boot-starter-mail-1.5.8.RELEASE-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\com\\sun\\mail\\javax.mail\\1.5.6\\javax.mail-1.5.6.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/sun/mail/javax.mail/1.5.6/javax.mail-1.5.6-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/com/sun/mail/javax.mail/1.5.6/javax.mail-1.5.6-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\javax\\activation\\activation\\1.1\\activation-1.1.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\data\\spring-data-redis\\1.7.11.RELEASE\\spring-data-redis-1.7.11.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/data/spring-data-redis/1.7.11.RELEASE/spring-data-redis-1.7.11.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/data/spring-data-redis/1.7.11.RELEASE/spring-data-redis-1.7.11.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\data\\spring-data-keyvalue\\1.2.8.RELEASE\\spring-data-keyvalue-1.2.8.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/data/spring-data-keyvalue/1.2.8.RELEASE/spring-data-keyvalue-1.2.8.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/data/spring-data-keyvalue/1.2.8.RELEASE/spring-data-keyvalue-1.2.8.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-tx\\4.3.12.RELEASE\\spring-tx-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-tx/4.3.12.RELEASE/spring-tx-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-tx/4.3.12.RELEASE/spring-tx-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-oxm\\4.3.12.RELEASE\\spring-oxm-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-oxm/4.3.12.RELEASE/spring-oxm-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-oxm/4.3.12.RELEASE/spring-oxm-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\spring-aop\\4.3.12.RELEASE\\spring-aop-4.3.12.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-aop/4.3.12.RELEASE/spring-aop-4.3.12.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/spring-aop/4.3.12.RELEASE/spring-aop-4.3.12.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\slf4j\\jcl-over-slf4j\\1.7.25\\jcl-over-slf4j-1.7.25.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\biz\\paluch\\redis\\lettuce\\3.5.0.Final\\lettuce-3.5.0.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/biz/paluch/redis/lettuce/3.5.0.Final/lettuce-3.5.0.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/biz/paluch/redis/lettuce/3.5.0.Final/lettuce-3.5.0.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\reactivex\\rxjava\\1.1.6\\rxjava-1.1.6.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/reactivex/rxjava/1.1.6/rxjava-1.1.6-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/reactivex/rxjava/1.1.6/rxjava-1.1.6-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\netty\\netty-common\\4.0.37.Final\\netty-common-4.0.37.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-common/4.0.37.Final/netty-common-4.0.37.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-common/4.0.37.Final/netty-common-4.0.37.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\netty\\netty-transport\\4.0.37.Final\\netty-transport-4.0.37.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-transport/4.0.37.Final/netty-transport-4.0.37.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-transport/4.0.37.Final/netty-transport-4.0.37.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\netty\\netty-buffer\\4.0.37.Final\\netty-buffer-4.0.37.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-buffer/4.0.37.Final/netty-buffer-4.0.37.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-buffer/4.0.37.Final/netty-buffer-4.0.37.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\netty\\netty-handler\\4.0.37.Final\\netty-handler-4.0.37.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-handler/4.0.37.Final/netty-handler-4.0.37.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-handler/4.0.37.Final/netty-handler-4.0.37.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\io\\netty\\netty-codec\\4.0.37.Final\\netty-codec-4.0.37.Final.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-codec/4.0.37.Final/netty-codec-4.0.37.Final-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/io/netty/netty-codec/4.0.37.Final/netty-codec-4.0.37.Final-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\springframework\\session\\spring-session\\1.3.1.RELEASE\\spring-session-1.3.1.RELEASE.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/session/spring-session/1.3.1.RELEASE/spring-session-1.3.1.RELEASE-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/springframework/session/spring-session/1.3.1.RELEASE/spring-session-1.3.1.RELEASE-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\org\\mockito\\mockito-all\\1.9.5\\mockito-all-1.9.5.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\sh20094090\\.m2\\repository\\junit\\junit\\4.12\\junit-4.12.jar","sourceContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/junit/junit/4.12/junit-4.12-sources.jar","javadocContainerUrl":"file:/C:/Users/sh20094090/.m2/repository/junit/junit/4.12/junit-4.12-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"source","path":"D:\\identity api\\identity\\src\\main\\java","outputFolder":"D:\\identity api\\identity\\target\\classes","javadocContainerUrl":"file:/D:/identity%20api/identity/target/site/apidocs","isSystem":false,"isOwn":true,"isTest":false,"isJavaContent":true},{"kind":"source","path":"D:\\identity api\\identity\\src\\test\\java","outputFolder":"D:\\identity api\\identity\\target\\test-classes","javadocContainerUrl":"file:/D:/identity%20api/identity/target/site/apidocs","isSystem":false,"isOwn":true,"isTest":true,"isJavaContent":true},{"kind":"source","path":"D:\\identity api\\identity\\src\\main\\resources","outputFolder":"D:\\identity api\\identity\\target\\classes","isSystem":false,"isOwn":true,"isTest":false,"isJavaContent":false},{"kind":"source","path":"D:\\identity api\\identity\\src\\test\\resources","outputFolder":"D:\\identity api\\identity\\target\\test-classes","isSystem":false,"isOwn":true,"isTest":true,"isJavaContent":false},{"kind":"source","path":"D:\\identity api\\identity\\src\\test\\java","outputFolder":"D:\\identity api\\identity\\target\\test-classes","javadocContainerUrl":"file:/D:/identity%20api/identity/target/site/apidocs","isSystem":false,"isOwn":true,"isTest":false,"isJavaContent":false}]}
\ No newline at end of file
diff --git a/deployidentity.bat b/deployidentity.bat
deleted file mode 100644
index 40c4b116..00000000
--- a/deployidentity.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-del C:\AppServer\Server\wildfly-10.1.0.Final\standalone\deployments\identity-0.0.1.war
-timeout 7
-del C:\AppServer\Server\wildfly-10.1.0.Final\standalone\deployments\identity-0.0.1.war.undeployed
-timeout 7
-copy C:\Users\WA875423\.m2\repository\com\iemr\common\identity\identity\0.0.1\identity-0.0.1.war C:\AppServer\Server\wildfly-10.1.0.Final\standalone\deployments\identity-0.0.1.war
\ No newline at end of file
diff --git a/logs/app.log b/logs/app.log
deleted file mode 100644
index 971e292d..00000000
--- a/logs/app.log
+++ /dev/null
@@ -1,999 +0,0 @@
-2023-06-07 15:50:52,831 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Starting IdentityApplication on APL-5CD0177D5K with PID 18544 (D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes started by SW40136016 in D:\AMRIT-Piramal\PROJECTS\Identity-API)
-2023-06-07 15:50:52,833 DEBUG com.iemr.common.identity.IdentityApplication [restartedMain] Running with Spring Boot v1.5.8.RELEASE, Spring v4.3.12.RELEASE
-2023-06-07 15:50:52,834 INFO com.iemr.common.identity.IdentityApplication [restartedMain] No active profile set, falling back to default profiles: default
-2023-06-07 15:50:52,880 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@46882443: startup date [Wed Jun 07 15:50:52 IST 2023]; root of context hierarchy
-2023-06-07 15:50:53,029 INFO org.hibernate.validator.internal.util.Version [background-preinit] HV000001: Hibernate Validator 5.3.5.Final
-2023-06-07 15:50:53,977 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-06-07 15:50:54,107 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'configProperties' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.config.ConfigProperties]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\config\ConfigProperties.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=configProperties; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 15:50:54,108 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'sessionObject' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.sessionobject.SessionObject]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\sessionobject\SessionObject.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=sessionObject; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 15:50:54,108 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'redisStorage' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.redis.RedisStorage]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\redis\RedisStorage.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=redisStorage; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 15:50:54,111 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-06-07 15:50:54,431 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'propertySourcesPlaceholderConfigurer' with a different definition: replacing [Root bean: class [org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.class]] with [Root bean: class [org.springframework.boot.autoconfigure.session.RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/session/RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration.class]]
-2023-06-07 15:50:54,623 INFO org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
-2023-06-07 15:50:54,729 INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker [restartedMain] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$98c72025] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-06-07 15:50:55,070 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat initialized with port(s): 7078 (http)
-2023-06-07 15:50:55,078 INFO org.apache.catalina.core.StandardService [restartedMain] Starting service [Tomcat]
-2023-06-07 15:50:55,080 INFO org.apache.catalina.core.StandardEngine [restartedMain] Starting Servlet Engine: Apache Tomcat/8.5.23
-2023-06-07 15:50:55,197 INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] [localhost-startStop-1] Initializing Spring embedded WebApplicationContext
-2023-06-07 15:50:55,197 INFO org.springframework.web.context.ContextLoader [localhost-startStop-1] Root WebApplicationContext: initialization completed in 2317 ms
-2023-06-07 15:50:55,558 INFO org.springframework.boot.web.servlet.ServletRegistrationBean [localhost-startStop-1] Mapping servlet: 'dispatcherServlet' to [/]
-2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'characterEncodingFilter' to: [/*]
-2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'springSessionRepositoryFilter' to: [/*]
-2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
-2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'httpPutFormContentFilter' to: [/*]
-2023-06-07 15:50:55,562 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'requestContextFilter' to: [/*]
-2023-06-07 15:50:56,325 ERROR com.iemr.common.identity.utils.CryptoUtil [restartedMain] Exception while decrypting string. Intentionally throwing null pointer
-javax.crypto.IllegalBlockSizeException: Input length must be multiple of 16 when decrypting with padded cipher
-	at com.sun.crypto.provider.CipherCore.prepareInputBuffer(CipherCore.java:1005)
-	at com.sun.crypto.provider.CipherCore.doFinal(CipherCore.java:848)
-	at com.sun.crypto.provider.AESCipher.engineDoFinal(AESCipher.java:446)
-	at javax.crypto.Cipher.doFinal(Cipher.java:2168)
-	at com.iemr.common.identity.utils.CryptoUtil.decrypt(CryptoUtil.java:34)
-	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89.CGLIB$dataSource$0(<generated>)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89$$FastClassBySpringCGLIB$$aaf85a5c.invoke(<generated>)
-	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
-	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89.dataSource(<generated>)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
-	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
-2023-06-07 15:50:56,327 WARN org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-2023-06-07 15:50:56,338 INFO org.apache.catalina.core.StandardService [restartedMain] Stopping service [Tomcat]
-2023-06-07 15:50:56,351 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-1] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 15:50:56,351 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-2] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 15:50:56,352 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-3] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 15:50:56,352 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-4] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 15:50:56,352 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-5] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 15:50:56,353 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-6] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 15:50:56,353 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-7] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 15:50:56,354 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-1-8] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 15:50:56,363 INFO org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer [restartedMain] 
-
-Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
-2023-06-07 15:50:56,369 ERROR org.springframework.boot.SpringApplication [restartedMain] Application startup failed
-org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
-	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
-	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	... 24 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:599)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	... 47 common frames omitted
-Caused by: org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:189)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
-	... 60 common frames omitted
-Caused by: java.lang.NullPointerException: null
-	at java.util.Hashtable.put(Hashtable.java:461)
-	at java.util.Properties.setProperty(Properties.java:166)
-	at org.apache.tomcat.jdbc.pool.DataSourceProxy.setUsername(DataSourceProxy.java:449)
-	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89.CGLIB$dataSource$0(<generated>)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89$$FastClassBySpringCGLIB$$aaf85a5c.invoke(<generated>)
-	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
-	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$d1d9fe89.dataSource(<generated>)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
-	... 61 common frames omitted
-2023-06-07 15:54:08,826 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Starting IdentityApplication on APL-5CD0177D5K with PID 14016 (D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes started by SW40136016 in D:\AMRIT-Piramal\PROJECTS\Identity-API)
-2023-06-07 15:54:08,828 DEBUG com.iemr.common.identity.IdentityApplication [restartedMain] Running with Spring Boot v1.5.8.RELEASE, Spring v4.3.12.RELEASE
-2023-06-07 15:54:08,828 INFO com.iemr.common.identity.IdentityApplication [restartedMain] No active profile set, falling back to default profiles: default
-2023-06-07 15:54:08,872 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@46882443: startup date [Wed Jun 07 15:54:08 IST 2023]; root of context hierarchy
-2023-06-07 15:54:09,031 INFO org.hibernate.validator.internal.util.Version [background-preinit] HV000001: Hibernate Validator 5.3.5.Final
-2023-06-07 15:54:09,976 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-06-07 15:54:10,216 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'configProperties' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.config.ConfigProperties]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\config\ConfigProperties.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=configProperties; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 15:54:10,217 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'sessionObject' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.sessionobject.SessionObject]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\sessionobject\SessionObject.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=sessionObject; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 15:54:10,217 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'redisStorage' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.redis.RedisStorage]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\redis\RedisStorage.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=redisStorage; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 15:54:10,221 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-06-07 15:54:10,538 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'propertySourcesPlaceholderConfigurer' with a different definition: replacing [Root bean: class [org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.class]] with [Root bean: class [org.springframework.boot.autoconfigure.session.RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/session/RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration.class]]
-2023-06-07 15:54:10,727 INFO org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
-2023-06-07 15:54:10,827 INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker [restartedMain] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$169f162b] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-06-07 15:54:11,164 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat initialized with port(s): 7078 (http)
-2023-06-07 15:54:11,174 INFO org.apache.catalina.core.StandardService [restartedMain] Starting service [Tomcat]
-2023-06-07 15:54:11,175 INFO org.apache.catalina.core.StandardEngine [restartedMain] Starting Servlet Engine: Apache Tomcat/8.5.23
-2023-06-07 15:54:11,291 INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] [localhost-startStop-1] Initializing Spring embedded WebApplicationContext
-2023-06-07 15:54:11,292 INFO org.springframework.web.context.ContextLoader [localhost-startStop-1] Root WebApplicationContext: initialization completed in 2420 ms
-2023-06-07 15:54:11,629 INFO org.springframework.boot.web.servlet.ServletRegistrationBean [localhost-startStop-1] Mapping servlet: 'dispatcherServlet' to [/]
-2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'characterEncodingFilter' to: [/*]
-2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'springSessionRepositoryFilter' to: [/*]
-2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
-2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'httpPutFormContentFilter' to: [/*]
-2023-06-07 15:54:11,632 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'requestContextFilter' to: [/*]
-2023-06-07 15:54:15,007 INFO org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean [restartedMain] Building JPA container EntityManagerFactory for persistence unit 'db_identity'
-2023-06-07 15:54:15,017 INFO org.hibernate.jpa.internal.util.LogHelper [restartedMain] HHH000204: Processing PersistenceUnitInfo [
-	name: db_identity
-	...]
-2023-06-07 15:54:15,069 INFO org.hibernate.Version [restartedMain] HHH000412: Hibernate Core {5.0.12.Final}
-2023-06-07 15:54:15,070 INFO org.hibernate.cfg.Environment [restartedMain] HHH000206: hibernate.properties not found
-2023-06-07 15:54:15,070 INFO org.hibernate.cfg.Environment [restartedMain] HHH000021: Bytecode provider name : javassist
-2023-06-07 15:54:15,104 INFO org.hibernate.annotations.common.Version [restartedMain] HCANN000001: Hibernate Commons Annotations {5.0.1.Final}
-2023-06-07 15:54:15,232 INFO org.hibernate.dialect.Dialect [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL5Dialect
-2023-06-07 15:54:16,032 INFO org.hibernate.hql.internal.QueryTranslatorFactoryInitiator [restartedMain] HHH000397: Using ASTQueryTranslatorFactory
-2023-06-07 15:54:16,133 INFO org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'db_identity'
-2023-06-07 15:54:17,192 WARN org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] Autowired annotation is not supported on static fields: private static java.lang.Boolean com.iemr.common.identity.utils.config.ConfigProperties.extendExpiryTime
-2023-06-07 15:54:17,192 WARN org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] Autowired annotation is not supported on static fields: private static java.lang.Integer com.iemr.common.identity.utils.config.ConfigProperties.sessionExpiryTime
-2023-06-07 15:54:17,192 WARN org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] Autowired annotation is not supported on static fields: private static java.lang.String com.iemr.common.identity.utils.config.ConfigProperties.redisurl
-2023-06-07 15:54:17,192 WARN org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] Autowired annotation is not supported on static fields: private static java.lang.Integer com.iemr.common.identity.utils.config.ConfigProperties.redisport
-2023-06-07 15:54:17,527 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/editFamilyTagging],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.editFamilyDetails(java.lang.String)
-2023-06-07 15:54:17,529 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/addTag],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.saveFamilyTagging(java.lang.String)
-2023-06-07 15:54:17,529 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/createFamily],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.createFamily(java.lang.String)
-2023-06-07 15:54:17,529 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/searchFamily],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.searchFamily(java.lang.String)
-2023-06-07 15:54:17,529 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/untag],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.untagFamily(java.lang.String)
-2023-06-07 15:54:17,530 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/family/getFamilyDetails],methods=[POST]}" onto public java.lang.String com.iemr.common.identity.controller.familyTagging.FamilyTaggingController.getFamilyDatails(java.lang.String)
-2023-06-07 15:54:17,536 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/unreserve],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.unreserveIdentity(java.lang.String)
-2023-06-07 15:54:17,536 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/searhByGovIdentity],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.searhBeneficiaryByGovIdentity(java.lang.String)
-2023-06-07 15:54:17,537 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/finiteSearch],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getFiniteBeneficiaries(java.lang.String)
-2023-06-07 15:54:17,537 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/benImageByBenRegID],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiaryImageByBenRegID(java.lang.String)
-2023-06-07 15:54:17,537 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByAbhaIdNo],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.searhBeneficiaryByABHAIdNo(java.lang.String)
-2023-06-07 15:54:17,538 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByBenRegIdList],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiariesByBenRegIds(java.lang.String)
-2023-06-07 15:54:17,538 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/saveGeneratedBenIDToLocalServer],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.saveGeneratedBenIDToLocalServer(java.lang.String)
-2023-06-07 15:54:17,538 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/searchByFamilyId],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.searhBeneficiaryByFamilyId(java.lang.String)
-2023-06-07 15:54:17,540 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/editEducationOrCommunity],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.editIdentityEducationOrCommunity(java.lang.String)
-2023-06-07 15:54:17,540 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/checkAvailablBenIDLocalServer],methods=[GET],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.checkAvailablBenIDLocalServer()
-2023-06-07 15:54:17,541 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByAbhaAddress],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.searhBeneficiaryByABHAAddress(java.lang.String)
-2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByBenId],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiariesByBeneficiaryId(java.lang.String)
-2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByPhoneNum],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiariesByPhoneNum(java.lang.String)
-2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByPartialBenRegIdList],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getPartialBeneficiariesByBenRegIds(java.lang.String)
-2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/getByBenRegId],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiariesByBeneficiaryRegId(java.lang.String)
-2023-06-07 15:54:17,542 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/advanceSearch],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.getBeneficiaries(java.lang.String)
-2023-06-07 15:54:17,543 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/reserve],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.reserveIdentity(java.lang.String)
-2023-06-07 15:54:17,543 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/edit],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.editIdentity(java.lang.String)
-2023-06-07 15:54:17,543 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/id/create],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.IdentityController.createIdentity(java.lang.String)
-2023-06-07 15:54:17,544 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/rmnch/syncDataToAmrit],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.rmnch.RmnchMobileAppController.syncDataToAmrit(java.lang.String)
-2023-06-07 15:54:17,544 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/rmnch/getBeneficiaryDataForVillage],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.rmnch.RmnchMobileAppController.getBeneficiaryData(java.lang.String,java.lang.String)
-2023-06-07 15:54:17,544 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/rmnch/getBeneficiaryDataForAsha],methods=[POST],headers=[Authorization]}" onto public java.lang.String com.iemr.common.identity.controller.rmnch.RmnchMobileAppController.getBeneficiaryDataByAsha(java.lang.String,java.lang.String)
-2023-06-07 15:54:17,544 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/version],methods=[GET]}" onto public java.lang.String com.iemr.common.identity.controller.version.VersionController.versionInformation()
-2023-06-07 15:54:17,548 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/swagger-resources/configuration/security]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.SecurityConfiguration> springfox.documentation.swagger.web.ApiResourceController.securityConfiguration()
-2023-06-07 15:54:17,549 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/swagger-resources/configuration/ui]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.UiConfiguration> springfox.documentation.swagger.web.ApiResourceController.uiConfiguration()
-2023-06-07 15:54:17,549 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/swagger-resources]}" onto public org.springframework.http.ResponseEntity<java.util.List<springfox.documentation.swagger.web.SwaggerResource>> springfox.documentation.swagger.web.ApiResourceController.swaggerResources()
-2023-06-07 15:54:17,551 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/error]}" onto public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)
-2023-06-07 15:54:17,551 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping [restartedMain] Mapped "{[/error],produces=[text/html]}" onto public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)
-2023-06-07 15:54:17,674 INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping [restartedMain] Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
-2023-06-07 15:54:17,889 INFO org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter [restartedMain] Looking for @ControllerAdvice: org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@46882443: startup date [Wed Jun 07 15:54:08 IST 2023]; root of context hierarchy
-2023-06-07 15:54:17,937 INFO org.springframework.web.servlet.handler.SimpleUrlHandlerMapping [restartedMain] Mapped URL path [/webjars/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2023-06-07 15:54:17,937 INFO org.springframework.web.servlet.handler.SimpleUrlHandlerMapping [restartedMain] Mapped URL path [/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2023-06-07 15:54:17,970 INFO org.springframework.web.servlet.handler.SimpleUrlHandlerMapping [restartedMain] Mapped URL path [/**/favicon.ico] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2023-06-07 15:54:18,374 INFO org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer [restartedMain] LiveReload server is running on port 35729
-2023-06-07 15:54:18,420 INFO org.springframework.jmx.export.annotation.AnnotationMBeanExporter [restartedMain] Registering beans for JMX exposure on startup
-2023-06-07 15:54:18,429 INFO org.springframework.context.support.DefaultLifecycleProcessor [restartedMain] Starting beans in phase 2147483647
-2023-06-07 15:54:18,429 INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper [restartedMain] Context refreshed
-2023-06-07 15:54:18,448 INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper [restartedMain] Found 1 custom documentation plugin(s)
-2023-06-07 15:54:18,473 INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner [restartedMain] Scanning for api listing references
-2023-06-07 15:54:18,653 INFO org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor [restartedMain] No TaskScheduler/ScheduledExecutorService bean found for scheduled processing
-2023-06-07 15:54:18,664 INFO org.apache.coyote.http11.Http11NioProtocol [restartedMain] Initializing ProtocolHandler ["http-nio-7078"]
-2023-06-07 15:54:18,672 INFO org.apache.coyote.http11.Http11NioProtocol [restartedMain] Starting ProtocolHandler ["http-nio-7078"]
-2023-06-07 15:54:18,674 INFO org.apache.tomcat.util.net.NioSelectorPool [restartedMain] Using a shared selector for servlet write/read
-2023-06-07 15:54:18,690 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat started on port(s): 7078 (http)
-2023-06-07 15:54:18,696 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Started IdentityApplication in 10.056 seconds (JVM running for 11.587)
-2023-06-07 15:55:21,166 INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] [http-nio-7078-exec-1] Initializing Spring FrameworkServlet 'dispatcherServlet'
-2023-06-07 15:55:21,166 INFO org.springframework.web.servlet.DispatcherServlet [http-nio-7078-exec-1] FrameworkServlet 'dispatcherServlet': initialization started
-2023-06-07 15:55:21,191 INFO org.springframework.web.servlet.DispatcherServlet [http-nio-7078-exec-1] FrameworkServlet 'dispatcherServlet': initialization completed in 24 ms
-2023-06-07 16:02:41,065 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [Thread-7] Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@46882443: startup date [Wed Jun 07 15:54:08 IST 2023]; root of context hierarchy
-2023-06-07 16:02:41,066 INFO org.springframework.context.support.DefaultLifecycleProcessor [Thread-7] Stopping beans in phase 2147483647
-2023-06-07 16:02:41,069 WARN org.springframework.beans.factory.support.DisposableBeanAdapter [Thread-7] Invocation of destroy method failed on bean with name 'classPathFileSystemWatcher': java.lang.NullPointerException
-2023-06-07 16:02:41,070 INFO org.springframework.jmx.export.annotation.AnnotationMBeanExporter [Thread-7] Unregistering JMX-exposed beans on shutdown
-2023-06-07 16:02:41,077 INFO org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean [Thread-7] Closing JPA EntityManagerFactory for persistence unit 'db_identity'
-2023-06-07 16:02:42,182 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Starting IdentityApplication on APL-5CD0177D5K with PID 14016 (D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes started by SW40136016 in D:\AMRIT-Piramal\PROJECTS\Identity-API)
-2023-06-07 16:02:42,182 DEBUG com.iemr.common.identity.IdentityApplication [restartedMain] Running with Spring Boot v1.5.8.RELEASE, Spring v4.3.12.RELEASE
-2023-06-07 16:02:42,182 INFO com.iemr.common.identity.IdentityApplication [restartedMain] No active profile set, falling back to default profiles: default
-2023-06-07 16:02:42,183 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@5a2f436f: startup date [Wed Jun 07 16:02:42 IST 2023]; root of context hierarchy
-2023-06-07 16:02:42,906 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-06-07 16:02:43,118 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'configProperties' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.config.ConfigProperties]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\config\ConfigProperties.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=configProperties; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 16:02:43,118 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'sessionObject' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.sessionobject.SessionObject]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\sessionobject\SessionObject.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=sessionObject; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 16:02:43,118 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'redisStorage' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.redis.RedisStorage]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\redis\RedisStorage.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=redisStorage; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 16:02:43,121 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-06-07 16:02:43,347 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'propertySourcesPlaceholderConfigurer' with a different definition: replacing [Root bean: class [org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.class]] with [Root bean: class [org.springframework.boot.autoconfigure.session.RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/session/RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration.class]]
-2023-06-07 16:02:43,385 INFO org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
-2023-06-07 16:02:43,400 INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker [restartedMain] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$169f162b] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-06-07 16:02:43,569 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat initialized with port(s): 8080 (http)
-2023-06-07 16:02:43,570 INFO org.apache.catalina.core.StandardService [restartedMain] Starting service [Tomcat]
-2023-06-07 16:02:43,570 INFO org.apache.catalina.core.StandardEngine [restartedMain] Starting Servlet Engine: Apache Tomcat/8.5.23
-2023-06-07 16:02:43,592 INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] [localhost-startStop-1] Initializing Spring embedded WebApplicationContext
-2023-06-07 16:02:43,593 INFO org.springframework.web.context.ContextLoader [localhost-startStop-1] Root WebApplicationContext: initialization completed in 1410 ms
-2023-06-07 16:02:43,684 INFO org.springframework.boot.web.servlet.ServletRegistrationBean [localhost-startStop-1] Mapping servlet: 'dispatcherServlet' to [/]
-2023-06-07 16:02:43,684 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'characterEncodingFilter' to: [/*]
-2023-06-07 16:02:43,684 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'springSessionRepositoryFilter' to: [/*]
-2023-06-07 16:02:43,684 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
-2023-06-07 16:02:43,685 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'httpPutFormContentFilter' to: [/*]
-2023-06-07 16:02:43,685 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'requestContextFilter' to: [/*]
-2023-06-07 16:02:43,703 ERROR com.iemr.common.identity.utils.config.ConfigProperties [restartedMain] encDbUserName retrival failed.
-java.lang.NullPointerException: null
-	at com.iemr.common.identity.utils.config.ConfigProperties.getPropertyByName(ConfigProperties.java:105)
-	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
-	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
-	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
-	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
-2023-06-07 16:02:43,705 ERROR com.iemr.common.identity.utils.CryptoUtil [restartedMain] Exception while decrypting string. Intentionally throwing null pointer
-java.lang.NullPointerException: null
-	at java.util.Base64$Decoder.decode(Base64.java:549)
-	at com.iemr.common.identity.utils.CryptoUtil.decrypt(CryptoUtil.java:34)
-	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
-	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
-	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
-	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
-2023-06-07 16:02:43,707 WARN org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-2023-06-07 16:02:43,710 INFO org.apache.catalina.core.StandardService [restartedMain] Stopping service [Tomcat]
-2023-06-07 16:02:43,712 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-1] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 16:02:43,713 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-2] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 16:02:43,713 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-3] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 16:02:43,714 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-4] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 16:02:43,715 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-5] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 16:02:43,715 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-6] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 16:02:43,716 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-7] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 16:02:43,717 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-5-8] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 16:02:43,723 INFO org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer [restartedMain] 
-
-Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
-2023-06-07 16:02:43,729 ERROR org.springframework.boot.SpringApplication [restartedMain] Application startup failed
-org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
-	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
-	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	... 24 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:599)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	... 47 common frames omitted
-Caused by: org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:189)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
-	... 60 common frames omitted
-Caused by: java.lang.NullPointerException: null
-	at java.util.Hashtable.put(Hashtable.java:461)
-	at java.util.Properties.setProperty(Properties.java:166)
-	at org.apache.tomcat.jdbc.pool.DataSourceProxy.setUsername(DataSourceProxy.java:449)
-	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
-	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
-	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
-	... 61 common frames omitted
-2023-06-07 18:15:56,489 INFO com.iemr.common.identity.IdentityApplication [restartedMain] Starting IdentityApplication on APL-5CD0177D5K with PID 14016 (D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes started by SW40136016 in D:\AMRIT-Piramal\PROJECTS\Identity-API)
-2023-06-07 18:15:56,489 DEBUG com.iemr.common.identity.IdentityApplication [restartedMain] Running with Spring Boot v1.5.8.RELEASE, Spring v4.3.12.RELEASE
-2023-06-07 18:15:56,489 INFO com.iemr.common.identity.IdentityApplication [restartedMain] No active profile set, falling back to default profiles: default
-2023-06-07 18:15:56,492 INFO org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@39ff0aad: startup date [Wed Jun 07 18:15:56 IST 2023]; root of context hierarchy
-2023-06-07 18:15:57,529 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-06-07 18:15:57,854 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'configProperties' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.config.ConfigProperties]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\config\ConfigProperties.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=configProperties; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 18:15:57,854 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'sessionObject' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.sessionobject.SessionObject]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\sessionobject\SessionObject.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=sessionObject; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 18:15:57,855 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'redisStorage' with a different definition: replacing [Generic bean: class [com.iemr.common.identity.utils.redis.RedisStorage]; scope=singleton; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null; defined in file [D:\AMRIT-Piramal\PROJECTS\Identity-API\target\classes\com\iemr\common\identity\utils\redis\RedisStorage.class]] with [Root bean: class [null]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=IEMRApplBeans; factoryMethodName=redisStorage; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [com/iemr/common/identity/utils/IEMRApplBeans.class]]
-2023-06-07 18:15:57,859 INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate [restartedMain] Multiple Spring Data modules found, entering strict repository configuration mode!
-2023-06-07 18:15:58,115 INFO org.springframework.beans.factory.support.DefaultListableBeanFactory [restartedMain] Overriding bean definition for bean 'propertySourcesPlaceholderConfigurer' with a different definition: replacing [Root bean: class [org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.class]] with [Root bean: class [org.springframework.boot.autoconfigure.session.RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration]; scope=; abstract=false; lazyInit=false; autowireMode=3; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=propertySourcesPlaceholderConfigurer; initMethodName=null; destroyMethodName=(inferred); defined in class path resource [org/springframework/boot/autoconfigure/session/RedisSessionConfiguration$SpringBootRedisHttpSessionConfiguration.class]]
-2023-06-07 18:15:58,150 INFO org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor [restartedMain] JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
-2023-06-07 18:15:58,167 INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker [restartedMain] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$169f162b] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2023-06-07 18:15:58,376 INFO org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer [restartedMain] Tomcat initialized with port(s): 8080 (http)
-2023-06-07 18:15:58,378 INFO org.apache.catalina.core.StandardService [restartedMain] Starting service [Tomcat]
-2023-06-07 18:15:58,379 INFO org.apache.catalina.core.StandardEngine [restartedMain] Starting Servlet Engine: Apache Tomcat/8.5.23
-2023-06-07 18:15:58,423 INFO org.apache.catalina.core.ContainerBase.[Tomcat-1].[localhost].[/] [localhost-startStop-1] Initializing Spring embedded WebApplicationContext
-2023-06-07 18:15:58,424 INFO org.springframework.web.context.ContextLoader [localhost-startStop-1] Root WebApplicationContext: initialization completed in 1932 ms
-2023-06-07 18:15:58,521 INFO org.springframework.boot.web.servlet.ServletRegistrationBean [localhost-startStop-1] Mapping servlet: 'dispatcherServlet' to [/]
-2023-06-07 18:15:58,522 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'characterEncodingFilter' to: [/*]
-2023-06-07 18:15:58,522 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'springSessionRepositoryFilter' to: [/*]
-2023-06-07 18:15:58,523 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
-2023-06-07 18:15:58,523 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'httpPutFormContentFilter' to: [/*]
-2023-06-07 18:15:58,523 INFO org.springframework.boot.web.servlet.FilterRegistrationBean [localhost-startStop-1] Mapping filter: 'requestContextFilter' to: [/*]
-2023-06-07 18:15:58,539 ERROR com.iemr.common.identity.utils.config.ConfigProperties [restartedMain] encDbUserName retrival failed.
-java.lang.NullPointerException: null
-	at com.iemr.common.identity.utils.config.ConfigProperties.getPropertyByName(ConfigProperties.java:105)
-	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
-	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
-	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
-	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
-2023-06-07 18:15:58,541 ERROR com.iemr.common.identity.utils.CryptoUtil [restartedMain] Exception while decrypting string. Intentionally throwing null pointer
-java.lang.NullPointerException: null
-	at java.util.Base64$Decoder.decode(Base64.java:549)
-	at com.iemr.common.identity.utils.CryptoUtil.decrypt(CryptoUtil.java:34)
-	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
-	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
-	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
-	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
-2023-06-07 18:15:58,542 WARN org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext [restartedMain] Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-2023-06-07 18:15:58,545 INFO org.apache.catalina.core.StandardService [restartedMain] Stopping service [Tomcat]
-2023-06-07 18:15:58,548 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-1] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 18:15:58,548 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-2] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 18:15:58,549 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-3] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 18:15:58,549 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-4] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 18:15:58,549 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-5] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 18:15:58,550 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-6] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 18:15:58,550 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-7] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 18:15:58,550 WARN org.apache.catalina.loader.WebappClassLoaderBase [localhost-startStop-1] The web application [ROOT] appears to have started a thread named [lettuce-eventExecutorLoop-6-8] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- io.netty.util.concurrent.SingleThreadEventExecutor.confirmShutdown(SingleThreadEventExecutor.java:650)
- io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:40)
- io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)
- io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:145)
- java.lang.Thread.run(Thread.java:750)
-2023-06-07 18:15:58,556 INFO org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer [restartedMain] 
-
-Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
-2023-06-07 18:15:58,559 ERROR org.springframework.boot.SpringApplication [restartedMain] Application startup failed
-org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'entityManagerFactory' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Unsatisfied dependency expressed through method 'entityManagerFactory' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:467)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1078)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:857)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:543)
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122)
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693)
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118)
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107)
-	at com.iemr.common.identity.IdentityApplication.main(IdentityApplication.java:99)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49)
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration': Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:749)
-	at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:189)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1193)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1095)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:372)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	... 24 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/iemr/common/identity/config/DBConfig.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:599)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1173)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1067)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:513)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:483)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:208)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1138)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1066)
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:835)
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:741)
-	... 47 common frames omitted
-Caused by: org.springframework.beans.BeanInstantiationException: Failed to instantiate [javax.sql.DataSource]: Factory method 'dataSource' threw exception; nested exception is java.lang.NullPointerException
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:189)
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
-	... 60 common frames omitted
-Caused by: java.lang.NullPointerException: null
-	at java.util.Hashtable.put(Hashtable.java:461)
-	at java.util.Properties.setProperty(Properties.java:166)
-	at org.apache.tomcat.jdbc.pool.DataSourceProxy.setUsername(DataSourceProxy.java:449)
-	at com.iemr.common.identity.config.DBConfig.dataSource(DBConfig.java:56)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.CGLIB$dataSource$0(<generated>)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f$$FastClassBySpringCGLIB$$208f0ff7.invoke(<generated>)
-	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
-	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:358)
-	at com.iemr.common.identity.config.DBConfig$$EnhancerBySpringCGLIB$$4fb1f48f.dataSource(<generated>)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.lang.reflect.Method.invoke(Method.java:498)
-	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
-	... 61 common frames omitted
diff --git a/mvnw b/mvnw
deleted file mode 100644
index 5bf251c0..00000000
--- a/mvnw
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Migwn, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-  # TODO classpath?
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="`which java`"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
-    fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
-  fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-echo $MAVEN_PROJECTBASEDIR
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
deleted file mode 100644
index 019bd74d..00000000
--- a/mvnw.cmd
+++ /dev/null
@@ -1,143 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%

From 814fa93fba27ddc2b6ea624f43252ca46455adc4 Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:35:17 +0530
Subject: [PATCH 05/53] code smell fixes (#6)

---
 pom.xml                                       |  1 +
 .../common/identity/IdentityApplication.java  | 80 -------------------
 .../identity/config/ApplicationConfig.java    | 50 ------------
 .../identity/config/HttpSessionConfig.java    | 23 ------
 .../identity/config/SecurityConfig.java       | 44 ----------
 .../config/StringtoSQLDateConverter.java      |  1 -
 .../common/identity/config/SwaggerConfig.java |  2 -
 .../controller/IdentityController.java        | 19 -----
 8 files changed, 1 insertion(+), 219 deletions(-)
 delete mode 100644 src/main/java/com/iemr/common/identity/config/ApplicationConfig.java
 delete mode 100644 src/main/java/com/iemr/common/identity/config/HttpSessionConfig.java
 delete mode 100644 src/main/java/com/iemr/common/identity/config/SecurityConfig.java

diff --git a/pom.xml b/pom.xml
index e9b67a15..019dca58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>
+		<sonar.java.binaries>target</sonar.java.binaries>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/src/main/java/com/iemr/common/identity/IdentityApplication.java b/src/main/java/com/iemr/common/identity/IdentityApplication.java
index bbc4d5f2..56e36a8d 100644
--- a/src/main/java/com/iemr/common/identity/IdentityApplication.java
+++ b/src/main/java/com/iemr/common/identity/IdentityApplication.java
@@ -10,86 +10,6 @@
 
 import com.iemr.common.identity.utils.IEMRApplBeans;
 
-/*@SpringBootApplication
-@EnableJpaRepositories
-@EnableTransactionManagement
-public class IdentityApplication implements CommandLineRunner {
-	private static final Logger logger = LoggerFactory.getLogger(IdentityApplication.class);
-
-	public static void main(String[] args) {
-		SpringApplication.run(IdentityApplication.class, args);
-	}
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		logger.info("displaying all jsons: ");
-		
-		List<Identity> list = new ArrayList<Identity>();
-		Identity ee1 = new Identity();
-		Identity ee2 = new Identity();
-		list.add(ee1);
-		list.add(ee2);
-		
-		IdentityDTO i = new IdentityDTO();
-		i.setCurrentAddress(new Address());
-		i.setPermanentAddress(new Address());
-		i.setEmergencyAddress(new Address());
-		i.setIdentities(list);
-		
-		IdentityEditDTO ie = new IdentityEditDTO();
-		ie.setCurrentAddress(new Address());
-		ie.setPermanentAddress(new Address());
-		ie.setEmergencyAddress(new Address());
-		ie.setIdentities(list);
-		
-		BenFamilyDTO bfm1 = new BenFamilyDTO();
-		BenFamilyDTO bfm2 = new BenFamilyDTO();
-		List<BenFamilyDTO> bfmList = new ArrayList<BenFamilyDTO>();
-		bfmList.add(bfm1);
-		bfmList.add(bfm2);
-		BenIdentityDTO bid1 = new BenIdentityDTO();
-		BenIdentityDTO bid2 = new BenIdentityDTO();
-		List<BenIdentityDTO> bidList = new ArrayList<BenIdentityDTO>();
-		bidList.add(bid1);
-		bidList.add(bid2);
-		BenServiceDTO bsv1 = new BenServiceDTO();
-		BenServiceDTO bsv2 = new BenServiceDTO();
-		List<BenServiceDTO> bsvList = new ArrayList<BenServiceDTO>();
-		bsvList.add(bsv1);
-		bsvList.add(bsv2);
-		Phone ph1 = new Phone();
-		Phone ph2 = new Phone();
-		List<Phone> phList = new ArrayList<Phone>();
-		phList.add(ph1);
-		phList.add(ph2);
-		
-		BeneficiariesDTO b1 = new BeneficiariesDTO();
-		b1.setBeneficiaryDetails(new BenDetailDTO());
-		b1.setBeneficiaryFamilyTags(bfmList);
-		b1.setBeneficiaryIdentites(bidList);
-		b1.setBeneficiaryServiceMap(bsvList);
-		b1.setContacts(phList);
-		
-		BeneficiariesDTO b2 = new BeneficiariesDTO();
-		b2.setBeneficiaryDetails(new BenDetailDTO());
-		b2.setBeneficiaryFamilyTags(bfmList);
-		b2.setBeneficiaryIdentites(bidList);
-		b2.setBeneficiaryServiceMap(bsvList);
-		b2.setContacts(phList);
-		
-		List<BeneficiariesDTO> benList = new ArrayList<BeneficiariesDTO>();
-		benList.add(b1);
-		benList.add(b2);
-		
-		logger.info("IdentityDTO: " + OutputMapper.getInstance().gson().toJson(i));		
-		logger.info("IdentityEditDTO: " + OutputMapper.getInstance().gson().toJson(ie));
-		//logger.info("IdentityFilterDTO: " + OutputMapper.getInstance().gson().toJson(new IdentityFilterDTO()));
-		logger.info("IdentitySearchDTO: " + OutputMapper.getInstance().gson().toJson(new IdentitySearchDTO()));
-		logger.info("List<BeneficiariesDTO>: " + OutputMapper.getInstance().gson().toJson(benList));
-		
-	}
-}*/
-
 @SpringBootApplication
 @EnableJpaRepositories
 @EnableTransactionManagement
diff --git a/src/main/java/com/iemr/common/identity/config/ApplicationConfig.java b/src/main/java/com/iemr/common/identity/config/ApplicationConfig.java
deleted file mode 100644
index 94031840..00000000
--- a/src/main/java/com/iemr/common/identity/config/ApplicationConfig.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.iemr.common.identity.config;
-
-//import javax.activation.DataSource;
-//import javax.persistence.EntityManagerFactory;
-
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-//import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
-//import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
-//import org.springframework.orm.jpa.JpaTransactionManager;
-//import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-//import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-//import org.springframework.transaction.PlatformTransactionManager;
-//import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-//@Configuration
-//@EnableJpaRepositories
-//@EnableTransactionManagement
-public class ApplicationConfig {
-//	 @Bean
-//	  public DataSource dataSource() {
-//
-//	    EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-//	    return builder.setType(EmbeddedDatabaseType.HSQL).build();
-//	  }
-//
-//	  @Bean
-//	  public EntityManagerFactory entityManagerFactory() {
-//
-//	    HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-//	    vendorAdapter.setGenerateDdl(true);
-//
-//	    LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
-//	    factory.setJpaVendorAdapter(vendorAdapter);
-//	    factory.setPackagesToScan("com.acme.domain");
-//	    factory.setDataSource(dataSource());
-//	    factory.afterPropertiesSet();
-//
-//	    return factory.getObject();
-//	  }
-//
-//	  @Bean
-//	  public PlatformTransactionManager transactionManager() {
-//
-//	    JpaTransactionManager txManager = new JpaTransactionManager();
-//	    txManager.setEntityManagerFactory(entityManagerFactory());
-//	    return txManager;
-//	  }
-}
diff --git a/src/main/java/com/iemr/common/identity/config/HttpSessionConfig.java b/src/main/java/com/iemr/common/identity/config/HttpSessionConfig.java
deleted file mode 100644
index e3803801..00000000
--- a/src/main/java/com/iemr/common/identity/config/HttpSessionConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iemr.common.identity.config;
-
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-//import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-//import org.springframework.session.web.http.HeaderHttpSessionStrategy;
-//import org.springframework.session.web.http.HttpSessionStrategy;
-//
-//@Configuration
-//@EnableRedisHttpSession 
-public class HttpSessionConfig {
-
-//	@Bean
-//	public LettuceConnectionFactory connectionFactory() {
-//		return new LettuceConnectionFactory(); 
-//	}
-//
-//	@Bean
-//	public HttpSessionStrategy httpSessionStrategy() {
-//		return new HeaderHttpSessionStrategy(); 
-//	}
-}
diff --git a/src/main/java/com/iemr/common/identity/config/SecurityConfig.java b/src/main/java/com/iemr/common/identity/config/SecurityConfig.java
deleted file mode 100644
index fdc88c13..00000000
--- a/src/main/java/com/iemr/common/identity/config/SecurityConfig.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.iemr.common.identity.config;
-
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-//import org.springframework.security.web.authentication.RememberMeServices;
-//import org.springframework.session.security.web.authentication.SpringSessionRememberMeServices;
-
-//@Configuration
-public class SecurityConfig /*extends WebSecurityConfigurerAdapter*/ {
-
-//    private static final String[] AUTH_WHITELIST = {
-//
-//            // -- swagger ui
-//            "/swagger-resources/**",
-//            "/swagger-ui.html",
-//            "/v2/api-docs",
-//            "/webjars/**"
-//    };
-//    
-//    @Override
-//    protected void configure(HttpSecurity http) throws Exception {
-//        http
-//        	.authorizeRequests()
-//            	.antMatchers(AUTH_WHITELIST).permitAll()
-//            	.antMatchers("/**/*").denyAll();
-//        http
-//        	.rememberMe().rememberMeServices(rememberMeServices());
-//        
-//        http
-//        	.sessionManagement().init(getHttp());
-//        
-//    }
-//    
-//    @Bean
-//    RememberMeServices rememberMeServices() {
-//        SpringSessionRememberMeServices rememberMeServices =
-//                new SpringSessionRememberMeServices();
-//        // optionally customize
-//        rememberMeServices.setAlwaysRemember(true);
-//        return rememberMeServices;
-//    }
-}
diff --git a/src/main/java/com/iemr/common/identity/config/StringtoSQLDateConverter.java b/src/main/java/com/iemr/common/identity/config/StringtoSQLDateConverter.java
index 6d44b716..e70af2f9 100644
--- a/src/main/java/com/iemr/common/identity/config/StringtoSQLDateConverter.java
+++ b/src/main/java/com/iemr/common/identity/config/StringtoSQLDateConverter.java
@@ -27,7 +27,6 @@ public Timestamp convert(String arg0) {
 				}
 			}
 		} catch (ParseException e) {
-			// TODO Auto-generated catch block
 			logger.error(e.getMessage());
 		}
 		return timestamp;
diff --git a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
index a0388725..4ab42756 100644
--- a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
@@ -2,8 +2,6 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-// import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 6861554d..0749c95a 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -75,8 +75,6 @@ public class IdentityController {
 			JsonElement json = new JsonParser().parse(searchFilter);
 			IdentitySearchDTO searchParams = InputMapper.getInstance().gson().fromJson(json, IdentitySearchDTO.class);
 
-			// SUNIL TODO: advance search here
-			// getResponseString(list)
 			List<BeneficiariesDTO> list = svc.getBeneficiaries(searchParams);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
@@ -181,7 +179,6 @@ public class IdentityController {
 			phoneNumValue = phoneNum;
 
 			List<BeneficiariesDTO> list = svc.getBeneficiariesByPhoneNum(phoneNumValue);
-			// list.removeAll(null);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -214,7 +211,6 @@ public class IdentityController {
 			healthIDValue = healthID;
 
 			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthID_AbhaAddress(healthIDValue);
-			// list.removeAll(null);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -248,7 +244,6 @@ public class IdentityController {
 			healthIDNoValue = healthIDNo;
 
 			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthIDNo_AbhaIdNo(healthIDNoValue);
-			// list.removeAll(null);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -280,7 +275,6 @@ public class IdentityController {
 			}
 
 			List<BeneficiariesDTO> list = svc.searhBeneficiaryByFamilyId(familyId);
-			// list.removeAll(null);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -311,7 +305,6 @@ public class IdentityController {
 			}
 
 			List<BeneficiariesDTO> list = svc.searhBeneficiaryByGovIdentity(identity);
-			// list.removeAll(null);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -649,7 +642,6 @@ public class IdentityController {
 		String data = InputMapper.getInstance().gson().toJson(list).toString();
 		String response = getSuccessResponseString(data, 200, "success", "getBeneficiariesByBenRegIds");
 
-//		logger.info("IdentityController.getBeneficiariesByBenRegIds - end response: " + response);
 		logger.info("IdentityController.getBeneficiariesByBenRegIds - end ");
 		return response;
 	}
@@ -680,7 +672,6 @@ public class IdentityController {
 		Collections.sort(list);
 		String response = getSuccessResponseString(list, 200, "success", "getBeneficiariesByBenRegIds");
 
-//		logger.info("IdentityController.getBeneficiariesByBenRegIds - end response: " + response);
 		logger.info("IdentityController.getBeneficiariesByBenRegIds - end : ");
 		return response;
 	}
@@ -697,7 +688,6 @@ private String getSuccessResponseString(MBeneficiarymapping map, Integer statusC
 			String methodName) {
 		logger.info("IdentityController.getResponseString of map parameter - start");
 		BeneficiariesDTO bdto = mapper.MBeneficiarymappingToBeneficiariesDTO(map);
-		// bdto.setBeneficiaryDetails(mapper.MBeneficiarydetailToBenDetailDTO(map.getMBeneficiarydetail()));
 		bdto.setBeneficiaryFamilyTags(
 				mapper.mBeneficiaryfamilymappingListToBenFamilyDTOList(map.getMBeneficiaryfamilymappings()));
 		bdto.setBeneficiaryIdentites(
@@ -729,9 +719,6 @@ private String getSuccessResponseString(MBeneficiarymapping map, Integer statusC
 	private String getSuccessResponseString(String data, Integer statusCode, String statusMsg, String methodName) {
 		logger.info("IdentityController.getResponseString of string parameter - start");
 
-		// String data =
-		// InputMapper.getInstance().gson().toJson(bdto).toString();
-//		logger.info("data: " + data);
 
 		OutputResponse response = new OutputResponse.Builder().setDataJsonType("JsonObject.class")
 				.setStatusCode(statusCode).setStatusMessage(statusMsg)
@@ -749,8 +736,6 @@ private String getSuccessResponseString(List<BeneficiariesDTO> list, Integer sta
 		}.getType();
 		String data = OutputMapper.getInstance().gson().toJson(list, typeOfSrc);
 		logger.info("data response size:" + (list != null ? list.size() : "No Beneficiary Found"));
-//		logger.info("data: " + data);
-//		logger.info("data.toStr: " + data.toString());
 		OutputResponse response = new OutputResponse.Builder().setDataJsonType("JsonObject.class")
 				.setStatusCode(statusCode).setStatusMessage(statusMsg)
 				.setDataObjectType(this.getClass().getSimpleName()).setMethodName(methodName).setData(data).build();
@@ -822,15 +807,12 @@ public String getJsonAsString(Object obj) {
 			response = getSuccessResponseString(list, 200, "success", "getFiniteBeneficiaries");
 			logger.info("IdentityController.getFiniteBeneficiaries - end");
 		} catch (NoResultException e) {
-			// TODO Auto-generated catch block
 			logger.error(e.getMessage());
 			response = getErrorResponseString(e.getLocalizedMessage(), 5000, "failure", "");
 		} catch (QueryTimeoutException e) {
-			// TODO Auto-generated catch block
 			logger.error(e.getMessage());
 			response = getErrorResponseString(e.getLocalizedMessage(), 5000, "failure", "");
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			logger.error(e.getMessage());
 			response = getErrorResponseString(e.getLocalizedMessage(), 5000, "failure", "");
 		}
@@ -967,7 +949,6 @@ public String getJsonAsString(Object obj) {
 		}
 
 		IdentityEditDTO identity = InputMapper.getInstance().gson().fromJson(json, IdentityEditDTO.class);
-		// MBeneficiarymapping map;
 		try {
 			svc.editIdentityEducationOrCommunity(identity);
 			String response = getSuccessResponseString("Updated successfully", 200, "success", "editIdentityByAgent");

From d7828f6528dc6b276d3dd9e2a127e7b07378270a Mon Sep 17 00:00:00 2001
From: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Date: Thu, 15 Jun 2023 09:45:29 +0530
Subject: [PATCH 06/53] Added copyright text (#7)

Co-authored-by: Anjana K J <an356996@wipro.com>
---
 .../common/identity/IdentityApplication.java  | 21 +++++++++++++++++++
 .../iemr/common/identity/config/DBConfig.java | 21 +++++++++++++++++++
 .../identity/config/InterceptorConfig.java    | 21 +++++++++++++++++++
 .../config/SQLDateToStringConverter.java      | 21 +++++++++++++++++++
 .../config/StringtoSQLDateConverter.java      | 21 +++++++++++++++++++
 .../common/identity/config/SwaggerConfig.java | 21 +++++++++++++++++++
 .../controller/IdentityController.java        | 21 +++++++++++++++++++
 .../FamilyTaggingController.java              | 21 +++++++++++++++++++
 .../rmnch/RmnchMobileAppController.java       | 21 +++++++++++++++++++
 .../controller/version/VersionController.java | 21 +++++++++++++++++++
 .../data/familyTagging/BenFamilyMapping.java  | 21 +++++++++++++++++++
 .../data/familyTagging/FamilyMembers.java     | 21 +++++++++++++++++++
 .../familyTagging/FamilySearchResponse.java   | 21 +++++++++++++++++++
 .../data/rmnch/BenHealthIDDetails.java        | 21 +++++++++++++++++++
 .../data/rmnch/GetBenRequestHandler.java      | 21 +++++++++++++++++++
 .../identity/data/rmnch/NCD_TB_HRP_data.java  | 21 +++++++++++++++++++
 .../rmnch/RMNCHBeneficiaryDetailsRmnch.java   | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHBornBirthDetails.java     | 21 +++++++++++++++++++
 .../identity/data/rmnch/RMNCHCBACdetails.java | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHHouseHoldDetails.java     | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHMBeneficiaryAccount.java  | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHMBeneficiaryImage.java    | 21 +++++++++++++++++++
 .../rmnch/RMNCHMBeneficiaryServiceMap.java    | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHMBeneficiaryaddress.java  | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHMBeneficiaryconsent.java  | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHMBeneficiarycontact.java  | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHMBeneficiarydetail.java   | 21 +++++++++++++++++++
 .../rmnch/RMNCHMBeneficiaryfamilymapping.java | 21 +++++++++++++++++++
 .../data/rmnch/RMNCHMBeneficiarymapping.java  | 21 +++++++++++++++++++
 .../rmnch/RMNCHMBeneficiaryregidmapping.java  | 21 +++++++++++++++++++
 .../iemr/common/identity/domain/Address.java  | 21 +++++++++++++++++++
 .../iemr/common/identity/domain/Contact.java  | 21 +++++++++++++++++++
 .../iemr/common/identity/domain/Identity.java | 21 +++++++++++++++++++
 .../identity/domain/MBeneficiaryAccount.java  | 21 +++++++++++++++++++
 .../identity/domain/MBeneficiaryImage.java    | 21 +++++++++++++++++++
 .../identity/domain/MBeneficiaryaddress.java  | 21 +++++++++++++++++++
 .../identity/domain/MBeneficiaryconsent.java  | 21 +++++++++++++++++++
 .../identity/domain/MBeneficiarycontact.java  | 21 +++++++++++++++++++
 .../identity/domain/MBeneficiarydetail.java   | 21 +++++++++++++++++++
 .../domain/MBeneficiaryfamilymapping.java     | 21 +++++++++++++++++++
 .../identity/domain/MBeneficiaryidentity.java | 21 +++++++++++++++++++
 .../identity/domain/MBeneficiarymapping.java  | 21 +++++++++++++++++++
 .../domain/MBeneficiaryregidmapping.java      | 21 +++++++++++++++++++
 .../domain/MBeneficiaryservicemapping.java    | 21 +++++++++++++++++++
 .../identity/domain/MBensecurestack.java      | 21 +++++++++++++++++++
 .../iemr/common/identity/domain/Phone.java    | 21 +++++++++++++++++++
 .../identity/domain/TBendataaccess.java       | 21 +++++++++++++++++++
 .../identity/domain/V_BenAdvanceSearch.java   | 21 +++++++++++++++++++
 .../common/identity/dto/AbhaAddressDTO.java   | 21 +++++++++++++++++++
 .../common/identity/dto/BenDetailDTO.java     | 21 +++++++++++++++++++
 .../common/identity/dto/BenFamilyDTO.java     | 21 +++++++++++++++++++
 .../common/identity/dto/BenIdImportDTO.java   | 21 +++++++++++++++++++
 .../common/identity/dto/BenIdentityDTO.java   | 21 +++++++++++++++++++
 .../common/identity/dto/BenServiceDTO.java    | 21 +++++++++++++++++++
 .../common/identity/dto/BeneficiariesDTO.java | 21 +++++++++++++++++++
 .../identity/dto/BeneficiariesPartialDTO.java | 21 +++++++++++++++++++
 .../identity/dto/BeneficiaryCreateResp.java   | 21 +++++++++++++++++++
 .../iemr/common/identity/dto/IdentityDTO.java | 21 +++++++++++++++++++
 .../common/identity/dto/IdentityEditDTO.java  | 21 +++++++++++++++++++
 .../identity/dto/IdentityFilterDTO.java       | 21 +++++++++++++++++++
 .../identity/dto/IdentitySearchDTO.java       | 21 +++++++++++++++++++
 .../identity/dto/ReserveIdentityDTO.java      | 21 +++++++++++++++++++
 .../identity/exception/IEMRException.java     | 21 +++++++++++++++++++
 .../exception/IllegalActionException.java     | 21 +++++++++++++++++++
 .../MissingMandatoryFieldsException.java      | 21 +++++++++++++++++++
 .../exception/SearchCriteriaException.java    | 21 +++++++++++++++++++
 .../common/identity/filter/QuerySelector.java | 21 +++++++++++++++++++
 .../identity/mapper/BenIdImportMapper.java    | 21 +++++++++++++++++++
 .../identity/mapper/IdentityEditMapper.java   | 21 +++++++++++++++++++
 .../identity/mapper/IdentityMapper.java       | 21 +++++++++++++++++++
 .../mapper/IdentityPartialMapper.java         | 21 +++++++++++++++++++
 .../identity/mapper/IdentitySearchMapper.java | 21 +++++++++++++++++++
 .../common/identity/mapper/InputMapper.java   | 21 +++++++++++++++++++
 .../common/identity/mapper/OutputMapper.java  | 21 +++++++++++++++++++
 .../common/identity/repo/BenAddressRepo.java  | 21 +++++++++++++++++++
 .../common/identity/repo/BenConsentRepo.java  | 21 +++++++++++++++++++
 .../common/identity/repo/BenContactRepo.java  | 21 +++++++++++++++++++
 .../identity/repo/BenDataAccessRepo.java      | 21 +++++++++++++++++++
 .../common/identity/repo/BenDetailRepo.java   | 21 +++++++++++++++++++
 .../identity/repo/BenDetailRepoCustom.java    | 21 +++++++++++++++++++
 .../identity/repo/BenDetailRepoImpl.java      | 21 +++++++++++++++++++
 .../identity/repo/BenFamilyMappingRepo.java   | 21 +++++++++++++++++++
 .../common/identity/repo/BenIdentityRepo.java | 21 +++++++++++++++++++
 .../common/identity/repo/BenMappingRepo.java  | 21 +++++++++++++++++++
 .../identity/repo/BenMappingRepoCustom.java   | 21 +++++++++++++++++++
 .../identity/repo/BenMappingRepoImpl.java     | 21 +++++++++++++++++++
 .../identity/repo/BenRegIdMappingRepo.java    | 21 +++++++++++++++++++
 .../identity/repo/BenSecureStackRepo.java     | 21 +++++++++++++++++++
 .../identity/repo/BenServiceMappingRepo.java  | 21 +++++++++++++++++++
 .../repo/MBeneficiaryAccountRepo.java         | 21 +++++++++++++++++++
 .../identity/repo/MBeneficiaryImageRepo.java  | 21 +++++++++++++++++++
 .../identity/repo/V_BenAdvanceSearchRepo.java | 21 +++++++++++++++++++
 .../repo/familyTag/FamilyTagRepo.java         | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHBenAccountRepo.java       | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHBenAddressRepo.java       | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHBenConsentRepo.java       | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHBenContactRepo.java       | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHBenDetailsRepo.java       | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHBenImageRepo.java         | 21 +++++++++++++++++++
 .../RMNCHBeneficiaryDetailsRmnchRepo.java     | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHBornBirthDetailsRepo.java | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHCBACDetailsRepo.java      | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHHouseHoldDetailsRepo.java | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHMBenFamilyMapRepo.java    | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHMBenMappingRepo.java      | 21 +++++++++++++++++++
 .../repo/rmnch/RMNCHMBenRegIdMapRepo.java     | 21 +++++++++++++++++++
 .../RMNCHMBeneficiaryServiceMapRepo.java      | 21 +++++++++++++++++++
 .../common/identity/security/Encryption.java  | 21 +++++++++++++++++++
 .../iemr/common/identity/security/Hash.java   | 21 +++++++++++++++++++
 .../common/identity/security/Security.java    | 21 +++++++++++++++++++
 .../identity/service/IdentityService.java     | 21 +++++++++++++++++++
 .../familyTagging/FamilyTagService.java       | 21 +++++++++++++++++++
 .../familyTagging/FamilyTagServiceImpl.java   | 21 +++++++++++++++++++
 .../service/rmnch/RmnchDataSyncService.java   | 21 +++++++++++++++++++
 .../rmnch/RmnchDataSyncServiceImpl.java       | 21 +++++++++++++++++++
 .../common/identity/utils/CommonMain.java     | 21 +++++++++++++++++++
 .../common/identity/utils/CryptoUtil.java     | 21 +++++++++++++++++++
 .../common/identity/utils/IEMRApplBeans.java  | 21 +++++++++++++++++++
 .../common/identity/utils/JsonUtilities.java  | 21 +++++++++++++++++++
 .../common/identity/utils/OutputResponse.java | 21 +++++++++++++++++++
 .../iemr/common/identity/utils/Utilities.java | 21 +++++++++++++++++++
 .../utils/config/ConfigProperties.java        | 21 +++++++++++++++++++
 .../utils/exception/IEMRException.java        | 21 +++++++++++++++++++
 .../utils/gateway/email/EmailService.java     | 21 +++++++++++++++++++
 .../email/GenericEmailServiceImpl.java        | 21 +++++++++++++++++++
 .../utils/http/HTTPRequestInterceptor.java    | 21 +++++++++++++++++++
 .../common/identity/utils/http/HttpUtils.java | 21 +++++++++++++++++++
 .../identity/utils/mapper/InputMapper.java    | 21 +++++++++++++++++++
 .../identity/utils/mapper/OutputMapper.java   | 21 +++++++++++++++++++
 .../identity/utils/redis/RedisConnection.java | 21 +++++++++++++++++++
 .../utils/redis/RedisSessionException.java    | 21 +++++++++++++++++++
 .../identity/utils/redis/RedisStorage.java    | 21 +++++++++++++++++++
 .../utils/response/OutputResponse.java        | 21 +++++++++++++++++++
 .../utils/sessionobject/SessionObject.java    | 21 +++++++++++++++++++
 .../identity/utils/validator/Validator.java   | 21 +++++++++++++++++++
 .../identity/IdentityApplicationTests.java    | 21 +++++++++++++++++++
 .../controller/IdentityControllerTest.java    | 21 +++++++++++++++++++
 .../identity/service/IdentityServiceTest.java | 21 +++++++++++++++++++
 138 files changed, 2898 insertions(+)

diff --git a/src/main/java/com/iemr/common/identity/IdentityApplication.java b/src/main/java/com/iemr/common/identity/IdentityApplication.java
index 56e36a8d..2b25a834 100644
--- a/src/main/java/com/iemr/common/identity/IdentityApplication.java
+++ b/src/main/java/com/iemr/common/identity/IdentityApplication.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity;
 
 import org.springframework.boot.SpringApplication;
diff --git a/src/main/java/com/iemr/common/identity/config/DBConfig.java b/src/main/java/com/iemr/common/identity/config/DBConfig.java
index 6a959e3e..b61791c6 100644
--- a/src/main/java/com/iemr/common/identity/config/DBConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/DBConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.config;
 
 import javax.persistence.EntityManagerFactory;
diff --git a/src/main/java/com/iemr/common/identity/config/InterceptorConfig.java b/src/main/java/com/iemr/common/identity/config/InterceptorConfig.java
index 76376b27..f94c2dd1 100644
--- a/src/main/java/com/iemr/common/identity/config/InterceptorConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/InterceptorConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/identity/config/SQLDateToStringConverter.java b/src/main/java/com/iemr/common/identity/config/SQLDateToStringConverter.java
index 61f584eb..de473158 100644
--- a/src/main/java/com/iemr/common/identity/config/SQLDateToStringConverter.java
+++ b/src/main/java/com/iemr/common/identity/config/SQLDateToStringConverter.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.config;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/config/StringtoSQLDateConverter.java b/src/main/java/com/iemr/common/identity/config/StringtoSQLDateConverter.java
index e70af2f9..8656e455 100644
--- a/src/main/java/com/iemr/common/identity/config/StringtoSQLDateConverter.java
+++ b/src/main/java/com/iemr/common/identity/config/StringtoSQLDateConverter.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.config;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
index 4ab42756..9b7d9568 100644
--- a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.config;
 
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 0749c95a..782b7586 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.controller;
 
 import java.lang.reflect.Type;
diff --git a/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java b/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
index 04636d24..702bc992 100644
--- a/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
+++ b/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.controller.familyTagging;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java b/src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java
index 6f24b882..0d98327e 100644
--- a/src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java
+++ b/src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.controller.rmnch;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/controller/version/VersionController.java b/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
index fa4974b0..afe82114 100644
--- a/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
+++ b/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.controller.version;
 
 import java.io.BufferedReader;
diff --git a/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java b/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
index 21ca3dde..e10ea131 100644
--- a/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
+++ b/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.familyTagging;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/data/familyTagging/FamilyMembers.java b/src/main/java/com/iemr/common/identity/data/familyTagging/FamilyMembers.java
index 673b57d5..2f9b70a5 100644
--- a/src/main/java/com/iemr/common/identity/data/familyTagging/FamilyMembers.java
+++ b/src/main/java/com/iemr/common/identity/data/familyTagging/FamilyMembers.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.familyTagging;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/identity/data/familyTagging/FamilySearchResponse.java b/src/main/java/com/iemr/common/identity/data/familyTagging/FamilySearchResponse.java
index d79de909..a627f97f 100644
--- a/src/main/java/com/iemr/common/identity/data/familyTagging/FamilySearchResponse.java
+++ b/src/main/java/com/iemr/common/identity/data/familyTagging/FamilySearchResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.familyTagging;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
index 391d5903..a22339d6 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import javax.persistence.Column;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/GetBenRequestHandler.java b/src/main/java/com/iemr/common/identity/data/rmnch/GetBenRequestHandler.java
index 7b61747d..f28ddd36 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/GetBenRequestHandler.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/GetBenRequestHandler.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java b/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
index 5ead5153..18ec46da 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
index 4193b039..944e2b70 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.math.BigDecimal;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java
index 2743b0a1..44232d12 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.math.BigDecimal;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java
index f56b38e8..6f9bdf38 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java
index 6c674e3d..75e5fd61 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
index d902c494..78e0da58 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryImage.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryImage.java
index e42152ed..ae6bfc6a 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryImage.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryImage.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryServiceMap.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryServiceMap.java
index ceb7f728..fbcf2c0f 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryServiceMap.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryServiceMap.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryaddress.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryaddress.java
index d154f1ae..9b44bb5f 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryaddress.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryaddress.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryconsent.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryconsent.java
index 62795d06..fcdd97f7 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryconsent.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryconsent.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarycontact.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarycontact.java
index 4c2e51fa..2fbd859f 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarycontact.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarycontact.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarydetail.java
index 1d09aa3e..e38f60e0 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarydetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
index de1ef231..6ba6ff7d 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarymapping.java
index 9f1c63ff..f5b94011 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarymapping.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarymapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryregidmapping.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryregidmapping.java
index db2d71a5..faaa13e9 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryregidmapping.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryregidmapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.data.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/domain/Address.java b/src/main/java/com/iemr/common/identity/domain/Address.java
index a7cd50df..d37059de 100644
--- a/src/main/java/com/iemr/common/identity/domain/Address.java
+++ b/src/main/java/com/iemr/common/identity/domain/Address.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/identity/domain/Contact.java b/src/main/java/com/iemr/common/identity/domain/Contact.java
index 563c06df..79010bcf 100644
--- a/src/main/java/com/iemr/common/identity/domain/Contact.java
+++ b/src/main/java/com/iemr/common/identity/domain/Contact.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/identity/domain/Identity.java b/src/main/java/com/iemr/common/identity/domain/Identity.java
index b2f70f14..31c6e66e 100644
--- a/src/main/java/com/iemr/common/identity/domain/Identity.java
+++ b/src/main/java/com/iemr/common/identity/domain/Identity.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
index 1e64102f..ebdc65fa 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
index 8ab18c76..b4bbec5a 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
index e13273f3..3a3a8f99 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
index b98a0df3..9ca86f44 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
index 50e90f16..7850e137 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
index f8ad823d..6d44d817 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
index 270d4819..74a42016 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
index aff7479a..60ab2fcc 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
index af593133..078838be 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
index b902108b..56717909 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
index a9be539f..3d92c90e 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBensecurestack.java b/src/main/java/com/iemr/common/identity/domain/MBensecurestack.java
index 1a175abe..e1dc4e66 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBensecurestack.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBensecurestack.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/domain/Phone.java b/src/main/java/com/iemr/common/identity/domain/Phone.java
index ae4896c2..4e6f835b 100644
--- a/src/main/java/com/iemr/common/identity/domain/Phone.java
+++ b/src/main/java/com/iemr/common/identity/domain/Phone.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
index 3a499baa..72fb3a23 100644
--- a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
+++ b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java b/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
index 184ed57b..81a8b278 100644
--- a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
+++ b/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.domain;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/dto/AbhaAddressDTO.java b/src/main/java/com/iemr/common/identity/dto/AbhaAddressDTO.java
index 2957870b..8cc3394e 100644
--- a/src/main/java/com/iemr/common/identity/dto/AbhaAddressDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/AbhaAddressDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/dto/BenDetailDTO.java b/src/main/java/com/iemr/common/identity/dto/BenDetailDTO.java
index c9a977bf..4eb761bf 100644
--- a/src/main/java/com/iemr/common/identity/dto/BenDetailDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BenDetailDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/dto/BenFamilyDTO.java b/src/main/java/com/iemr/common/identity/dto/BenFamilyDTO.java
index 7129286c..88667937 100644
--- a/src/main/java/com/iemr/common/identity/dto/BenFamilyDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BenFamilyDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/dto/BenIdImportDTO.java b/src/main/java/com/iemr/common/identity/dto/BenIdImportDTO.java
index bdebe262..319ee596 100644
--- a/src/main/java/com/iemr/common/identity/dto/BenIdImportDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BenIdImportDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/dto/BenIdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/BenIdentityDTO.java
index 45a1d1aa..334297e9 100644
--- a/src/main/java/com/iemr/common/identity/dto/BenIdentityDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BenIdentityDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/dto/BenServiceDTO.java b/src/main/java/com/iemr/common/identity/dto/BenServiceDTO.java
index d7e46990..7245faed 100644
--- a/src/main/java/com/iemr/common/identity/dto/BenServiceDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BenServiceDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
index d493e90c..a2b84254 100644
--- a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesPartialDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesPartialDTO.java
index de052fcd..9279fe23 100644
--- a/src/main/java/com/iemr/common/identity/dto/BeneficiariesPartialDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BeneficiariesPartialDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiaryCreateResp.java b/src/main/java/com/iemr/common/identity/dto/BeneficiaryCreateResp.java
index 7b9c3b3b..000047e0 100644
--- a/src/main/java/com/iemr/common/identity/dto/BeneficiaryCreateResp.java
+++ b/src/main/java/com/iemr/common/identity/dto/BeneficiaryCreateResp.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
index f8645351..38b472a6 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
index 09b861dd..23634fb8 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityFilterDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityFilterDTO.java
index ace66e99..f34183ad 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityFilterDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityFilterDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
index 980a344d..6506897a 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/dto/ReserveIdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/ReserveIdentityDTO.java
index d972cd4c..5c4b1bcb 100644
--- a/src/main/java/com/iemr/common/identity/dto/ReserveIdentityDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/ReserveIdentityDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.dto;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/identity/exception/IEMRException.java b/src/main/java/com/iemr/common/identity/exception/IEMRException.java
index 8cb46426..615255e7 100644
--- a/src/main/java/com/iemr/common/identity/exception/IEMRException.java
+++ b/src/main/java/com/iemr/common/identity/exception/IEMRException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.exception;
 
 public class IEMRException extends Exception {
diff --git a/src/main/java/com/iemr/common/identity/exception/IllegalActionException.java b/src/main/java/com/iemr/common/identity/exception/IllegalActionException.java
index 1cceb33d..be2883f4 100644
--- a/src/main/java/com/iemr/common/identity/exception/IllegalActionException.java
+++ b/src/main/java/com/iemr/common/identity/exception/IllegalActionException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.exception;
 
 public class IllegalActionException extends Exception {
diff --git a/src/main/java/com/iemr/common/identity/exception/MissingMandatoryFieldsException.java b/src/main/java/com/iemr/common/identity/exception/MissingMandatoryFieldsException.java
index 4ae6c790..58d1cf85 100644
--- a/src/main/java/com/iemr/common/identity/exception/MissingMandatoryFieldsException.java
+++ b/src/main/java/com/iemr/common/identity/exception/MissingMandatoryFieldsException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.exception;
 
 public class MissingMandatoryFieldsException extends Exception {
diff --git a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
index dc963b97..8a67569d 100644
--- a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
+++ b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.exception;
 
 public class SearchCriteriaException {
diff --git a/src/main/java/com/iemr/common/identity/filter/QuerySelector.java b/src/main/java/com/iemr/common/identity/filter/QuerySelector.java
index 9120aa30..91c63350 100644
--- a/src/main/java/com/iemr/common/identity/filter/QuerySelector.java
+++ b/src/main/java/com/iemr/common/identity/filter/QuerySelector.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.filter;
 
 import com.iemr.common.identity.dto.IdentityFilterDTO;
diff --git a/src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java b/src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java
index 15c468f2..8ab68601 100644
--- a/src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.mapper;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
index 04aa09c6..2f08bf4d 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.mapper;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
index f388cf66..64df182c 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.mapper;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
index 127c37d9..befc03db 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.mapper;
 
 import org.mapstruct.Mapper;
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
index 4e52b2e3..e8962e6e 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.mapper;
 
 import org.mapstruct.Mapper;
diff --git a/src/main/java/com/iemr/common/identity/mapper/InputMapper.java b/src/main/java/com/iemr/common/identity/mapper/InputMapper.java
index 09419008..9a46ba4f 100644
--- a/src/main/java/com/iemr/common/identity/mapper/InputMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/InputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.mapper;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/identity/mapper/OutputMapper.java b/src/main/java/com/iemr/common/identity/mapper/OutputMapper.java
index 975b5b10..906136b3 100644
--- a/src/main/java/com/iemr/common/identity/mapper/OutputMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/OutputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.mapper;
 
 import com.google.gson.Gson;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
index 7c7d1c2d..1c6d9906 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
index c1ca2628..f31ff771 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
index 39f52eb5..0f287916 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
index 1c0b8f48..22d6d0cc 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
index 3b55f3ef..8668bce0 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoCustom.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoCustom.java
index 50d3b90a..9395ba13 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoCustom.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoCustom.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
index 764f9c07..c77a1b19 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
index 18da0d4e..05b49af4 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java
index cdd96e09..c3f4bc8a 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
index d5178384..4d3ae32f 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
index 965c66fb..efffc666 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
index c9778de7..04a2bc36 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
index 03623203..55683eb4 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenSecureStackRepo.java b/src/main/java/com/iemr/common/identity/repo/BenSecureStackRepo.java
index df32e357..22c581be 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenSecureStackRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenSecureStackRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
index 7c731505..761a5de9 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
index 81d028d8..aaedeb1b 100644
--- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
index 91706b59..c1b5c415 100644
--- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import org.springframework.data.jpa.repository.Modifying;
diff --git a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
index f8dd12fd..3679f575 100644
--- a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/familyTag/FamilyTagRepo.java b/src/main/java/com/iemr/common/identity/repo/familyTag/FamilyTagRepo.java
index da1f1a9a..4451fd37 100644
--- a/src/main/java/com/iemr/common/identity/repo/familyTag/FamilyTagRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/familyTag/FamilyTagRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.familyTag;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenAccountRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenAccountRepo.java
index c9722efc..48809be0 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenAccountRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenAccountRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenAddressRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenAddressRepo.java
index e9343ff6..8015eb59 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenAddressRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenAddressRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
index 04181221..be760105 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenContactRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenContactRepo.java
index f512407d..2dcef401 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenContactRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenContactRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenDetailsRepo.java
index 20f16263..028e7814 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenDetailsRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenDetailsRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenImageRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenImageRepo.java
index 84e20cf4..762f0f44 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenImageRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenImageRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java
index f81ffbb1..1ef47379 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBornBirthDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBornBirthDetailsRepo.java
index 4e57baba..daa5b646 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBornBirthDetailsRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBornBirthDetailsRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
index e9eda21c..3d0e4968 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHHouseHoldDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHHouseHoldDetailsRepo.java
index 4395a0be..4aed3c87 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHHouseHoldDetailsRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHHouseHoldDetailsRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenFamilyMapRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenFamilyMapRepo.java
index 3c27f7cb..9d5205c5 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenFamilyMapRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenFamilyMapRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenMappingRepo.java
index 58d779fa..99e14aff 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java
index 51e64068..2112c987 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBeneficiaryServiceMapRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBeneficiaryServiceMapRepo.java
index ce94a1b5..df7b8557 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBeneficiaryServiceMapRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBeneficiaryServiceMapRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/security/Encryption.java b/src/main/java/com/iemr/common/identity/security/Encryption.java
index 729dd728..04286702 100644
--- a/src/main/java/com/iemr/common/identity/security/Encryption.java
+++ b/src/main/java/com/iemr/common/identity/security/Encryption.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.security;
 
 public class Encryption {
diff --git a/src/main/java/com/iemr/common/identity/security/Hash.java b/src/main/java/com/iemr/common/identity/security/Hash.java
index e9668a5e..041b55e9 100644
--- a/src/main/java/com/iemr/common/identity/security/Hash.java
+++ b/src/main/java/com/iemr/common/identity/security/Hash.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.security;
 
 public class Hash {
diff --git a/src/main/java/com/iemr/common/identity/security/Security.java b/src/main/java/com/iemr/common/identity/security/Security.java
index 53961b8c..fd362d2b 100644
--- a/src/main/java/com/iemr/common/identity/security/Security.java
+++ b/src/main/java/com/iemr/common/identity/security/Security.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.security;
 
 public interface Security {
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 9565b6f8..ab8bb995 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.service;
 
 import java.math.BigDecimal;
diff --git a/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagService.java b/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagService.java
index 61bc40b4..85e8cfba 100644
--- a/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagService.java
+++ b/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.service.familyTagging;
 
 import com.iemr.common.identity.exception.IEMRException;
diff --git a/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java b/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java
index ab6e83a3..e28fa693 100644
--- a/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.service.familyTagging;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncService.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncService.java
index be9855b5..1d343d4b 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncService.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.service.rmnch;
 
 public interface RmnchDataSyncService {
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index f0891928..bc7063e9 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.service.rmnch;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/identity/utils/CommonMain.java b/src/main/java/com/iemr/common/identity/utils/CommonMain.java
index 00d77712..7b38997f 100644
--- a/src/main/java/com/iemr/common/identity/utils/CommonMain.java
+++ b/src/main/java/com/iemr/common/identity/utils/CommonMain.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java b/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java
index 02d012d8..88ebe994 100644
--- a/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java
+++ b/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils;
 
 import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/iemr/common/identity/utils/IEMRApplBeans.java b/src/main/java/com/iemr/common/identity/utils/IEMRApplBeans.java
index 61959f46..bf6bea4d 100644
--- a/src/main/java/com/iemr/common/identity/utils/IEMRApplBeans.java
+++ b/src/main/java/com/iemr/common/identity/utils/IEMRApplBeans.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils;
 
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/com/iemr/common/identity/utils/JsonUtilities.java b/src/main/java/com/iemr/common/identity/utils/JsonUtilities.java
index 5abdc175..5f3d90bf 100644
--- a/src/main/java/com/iemr/common/identity/utils/JsonUtilities.java
+++ b/src/main/java/com/iemr/common/identity/utils/JsonUtilities.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/identity/utils/OutputResponse.java b/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
index 53df3fcb..3fa14ddd 100644
--- a/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
+++ b/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils;
 
 import java.util.Calendar;
diff --git a/src/main/java/com/iemr/common/identity/utils/Utilities.java b/src/main/java/com/iemr/common/identity/utils/Utilities.java
index f0a9e4ca..70551dc4 100644
--- a/src/main/java/com/iemr/common/identity/utils/Utilities.java
+++ b/src/main/java/com/iemr/common/identity/utils/Utilities.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java b/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
index 0f4a3e59..468186d8 100644
--- a/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
+++ b/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.config;
 
 import java.io.IOException;
diff --git a/src/main/java/com/iemr/common/identity/utils/exception/IEMRException.java b/src/main/java/com/iemr/common/identity/utils/exception/IEMRException.java
index b680d66a..6e97811a 100644
--- a/src/main/java/com/iemr/common/identity/utils/exception/IEMRException.java
+++ b/src/main/java/com/iemr/common/identity/utils/exception/IEMRException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.exception;
 
 public class IEMRException extends Exception
diff --git a/src/main/java/com/iemr/common/identity/utils/gateway/email/EmailService.java b/src/main/java/com/iemr/common/identity/utils/gateway/email/EmailService.java
index e4ce47b7..9eefb27b 100644
--- a/src/main/java/com/iemr/common/identity/utils/gateway/email/EmailService.java
+++ b/src/main/java/com/iemr/common/identity/utils/gateway/email/EmailService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.gateway.email;
 
 public interface EmailService
diff --git a/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java b/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
index 6355845f..d2a30279 100644
--- a/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.gateway.email;
 
 import org.json.JSONObject;
diff --git a/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
index 463c8c15..1021d8dd 100644
--- a/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
+++ b/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.http;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
index babeb355..5e349dfd 100644
--- a/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
+++ b/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.http;
 
 import java.io.FileInputStream;
diff --git a/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java b/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
index 0148dfe7..74d82471 100644
--- a/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
+++ b/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.mapper;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/identity/utils/mapper/OutputMapper.java b/src/main/java/com/iemr/common/identity/utils/mapper/OutputMapper.java
index d4446dfb..4e134ad5 100644
--- a/src/main/java/com/iemr/common/identity/utils/mapper/OutputMapper.java
+++ b/src/main/java/com/iemr/common/identity/utils/mapper/OutputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.mapper;
 
 import com.google.gson.Gson;
diff --git a/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java b/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java
index 96b30586..dc6a19f7 100644
--- a/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java
+++ b/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.redis;
 
 public class RedisConnection {
diff --git a/src/main/java/com/iemr/common/identity/utils/redis/RedisSessionException.java b/src/main/java/com/iemr/common/identity/utils/redis/RedisSessionException.java
index e9c32a2b..06567da0 100644
--- a/src/main/java/com/iemr/common/identity/utils/redis/RedisSessionException.java
+++ b/src/main/java/com/iemr/common/identity/utils/redis/RedisSessionException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.redis;
 
 import com.iemr.common.identity.utils.exception.IEMRException;
diff --git a/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java b/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
index b5ee0bc8..291756c6 100644
--- a/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
+++ b/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.redis;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java b/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
index 840934a9..e5ec994e 100644
--- a/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
+++ b/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.response;
 
 import java.util.Calendar;
diff --git a/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java b/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
index 9c8fb66d..6e1d75a5 100644
--- a/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
+++ b/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.sessionobject;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/identity/utils/validator/Validator.java b/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
index 4e36defd..35d7aaec 100644
--- a/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
+++ b/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.utils.validator;
 
 import org.json.JSONException;
diff --git a/src/test/java/com/iemr/common/identity/IdentityApplicationTests.java b/src/test/java/com/iemr/common/identity/IdentityApplicationTests.java
index 3a6d6159..047b4b89 100644
--- a/src/test/java/com/iemr/common/identity/IdentityApplicationTests.java
+++ b/src/test/java/com/iemr/common/identity/IdentityApplicationTests.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity;
 
 import org.junit.Test;
diff --git a/src/test/java/com/iemr/common/identity/controller/IdentityControllerTest.java b/src/test/java/com/iemr/common/identity/controller/IdentityControllerTest.java
index 3470005e..f9aad282 100644
--- a/src/test/java/com/iemr/common/identity/controller/IdentityControllerTest.java
+++ b/src/test/java/com/iemr/common/identity/controller/IdentityControllerTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.controller;
 
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
index e6b1d7e0..2dd5bd9b 100644
--- a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
+++ b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.identity.service;
 
 import static org.junit.Assert.assertFalse;

From dd0ec157c75b6911410766fdf6b1387e020f82a3 Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Thu, 15 Jun 2023 18:49:35 +0530
Subject: [PATCH 07/53] code smell fix (#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties
---
 .../controller/IdentityController.java        |  1 -
 .../data/familyTagging/BenFamilyMapping.java  |  3 -
 .../rmnch/RMNCHBeneficiaryDetailsRmnch.java   |  6 --
 .../data/rmnch/RMNCHMBeneficiaryAccount.java  |  1 -
 .../rmnch/RMNCHMBeneficiaryfamilymapping.java |  3 -
 .../iemr/common/identity/domain/Address.java  |  1 -
 .../identity/domain/MBeneficiaryAccount.java  |  2 -
 .../identity/domain/MBeneficiaryImage.java    |  3 -
 .../identity/domain/MBeneficiarydetail.java   | 23 -----
 .../domain/MBeneficiaryfamilymapping.java     |  5 --
 .../identity/domain/MBeneficiaryidentity.java |  6 --
 .../identity/domain/MBeneficiarymapping.java  | 12 ---
 .../domain/MBeneficiaryregidmapping.java      | 20 -----
 .../domain/MBeneficiaryservicemapping.java    |  4 -
 .../identity/domain/TBendataaccess.java       |  9 --
 .../identity/domain/V_BenAdvanceSearch.java   |  2 -
 .../common/identity/dto/BeneficiariesDTO.java |  3 -
 .../iemr/common/identity/dto/IdentityDTO.java | 20 +----
 .../common/identity/dto/IdentityEditDTO.java  |  8 --
 .../identity/dto/IdentitySearchDTO.java       |  1 -
 .../exception/SearchCriteriaException.java    |  1 -
 .../identity/mapper/IdentityMapper.java       | 15 ----
 .../common/identity/repo/BenContactRepo.java  |  4 -
 .../identity/repo/BenDataAccessRepo.java      | 21 -----
 .../common/identity/repo/BenDetailRepo.java   | 11 ---
 .../identity/repo/BenDetailRepoImpl.java      | 85 ++++++-------------
 .../identity/repo/BenFamilyMappingRepo.java   | 10 ---
 .../common/identity/repo/BenMappingRepo.java  | 81 ------------------
 .../identity/repo/BenMappingRepoImpl.java     |  2 -
 .../identity/repo/BenRegIdMappingRepo.java    |  2 -
 src/main/resources/application.properties     |  2 +
 31 files changed, 30 insertions(+), 337 deletions(-)

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 782b7586..3cd6d75e 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -458,7 +458,6 @@ public class IdentityController {
 		}
 
 		IdentityEditDTO identity = InputMapper.getInstance().gson().fromJson(json, IdentityEditDTO.class);
-		// MBeneficiarymapping map;
 		try {
 			svc.editIdentity(identity);
 			String response = getSuccessResponseString("Updated successfully", 200, "success", "editIdentityByAgent");
diff --git a/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java b/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
index e10ea131..f595accf 100644
--- a/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
+++ b/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
@@ -119,9 +119,6 @@ public class BenFamilyMapping {
 	@Transient
 	private Integer blockId;
 
-//	@Transient
-//	private BenFamilyMapping memberList[];
-
 	@Transient
 	private Long beneficiaryRegId;
 
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
index 944e2b70..4be1b4a3 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
@@ -353,12 +353,6 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	@Transient
 	private String stateName;
-//	@Expose
-//	@Transient
-//	private Integer districtId;
-//	@Expose
-//	@Transient
-//	private String districtName;
 	@Expose
 	@Transient
 	private Integer blockId;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
index 78e0da58..1cb6a282 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
@@ -31,7 +31,6 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.gson.annotations.Expose;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
index 6ba6ff7d..5da37b40 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
@@ -30,9 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/identity/domain/Address.java b/src/main/java/com/iemr/common/identity/domain/Address.java
index d37059de..c37b4507 100644
--- a/src/main/java/com/iemr/common/identity/domain/Address.java
+++ b/src/main/java/com/iemr/common/identity/domain/Address.java
@@ -45,7 +45,6 @@
 	 */
 	private Integer zoneID;
 	private String zoneName;
-	// private Integer parkingPlaceID;
 	private String parkingPlaceName;
 	private Integer servicePointID;
 	private String servicePointName;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
index ebdc65fa..eedd6f38 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
@@ -92,8 +92,6 @@ public class MBeneficiaryAccount {
 	@Column(name = "VehicalNo", length = 30)
 	private String vehicleNo;
 
-	// @Column(name = "ParkingPlaceID")
-	// private Integer parkingPlaceID;
 
 	@Column(name = "SyncedBy", length = 30)
 	private String syncedBy;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
index b4bbec5a..a762f64d 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
@@ -21,7 +21,6 @@
 */
 package com.iemr.common.identity.domain;
 
-import java.math.BigInteger;
 import java.sql.Timestamp;
 
 import javax.persistence.Column;
@@ -73,8 +72,6 @@ public class MBeneficiaryImage {
 
 	@Column(name = "VehicalNo")
 	private String vehicalNo;
-	// @Column(name = "ParkingPlaceID")
-	// private Integer parkingPlaceID;
 	@Column(name = "SyncedBy")
 	private String syncedBy;
 	@Column(name = "SyncedDate", unique = true, nullable = false)
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
index 6d44d817..f9bd7858 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -41,10 +41,6 @@
 
 import lombok.Data;
 
-/**
- * The persistent class for the m_beneficiarydetails database table.
- * 
- */
 @Entity
 @Table(name = "i_beneficiarydetails")
 @NamedQuery(name = "MBeneficiarydetail.findAll", query = "SELECT m FROM MBeneficiarydetail m order by beneficiaryDetailsId asc")
@@ -62,7 +58,6 @@ public class MBeneficiarydetail implements Serializable {
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(unique = true, nullable = false)
-	// @OrderBy(value = "beneficiaryDetailsId asc")
 	private BigInteger beneficiaryDetailsId;
 
 	private Integer areaId;
@@ -125,8 +120,6 @@ public class MBeneficiarydetail implements Serializable {
 	@Column(length = 50)
 	private String modifiedBy;
 
-	// private Integer parkingPlaceID;
-
 	private Integer occupationId;
 
 	@Column(length = 45)
@@ -238,21 +231,10 @@ public class MBeneficiarydetail implements Serializable {
 	@Column(name = "VanSerialNo", updatable = false)
 	private BigInteger vanSerialNo;
 
-//	@Expose
-//	@Column(name = "familyid", updatable = true)
-//	private String familyid;
-
-	// END OF new column added for data sync
-	/**
-	 * Default constructor
-	 */
 	public MBeneficiarydetail() {
 
 	}
 
-	/**
-	 * Constructor for retrieving partial beneficiary details
-	 */
 	public MBeneficiarydetail(BigInteger beneficiaryDetailsId, String firstName, String lastName, String middleName,
 			String fatherName, String spouseName) {
 
@@ -342,9 +324,4 @@ public static String getIsHIVPositive(Integer status) {
 		return isHIVPositive;
 	}
 
-	// public static void main(String[] args)
-	// {
-	// Timestamp dob = new Timestamp(10, 07, 10,0,0,0,0);
-	// System.out.println(calculateAge(dob));
-	// }
 }
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
index 74a42016..510d1d2e 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
@@ -94,11 +94,6 @@ public class MBeneficiaryfamilymapping implements Serializable {
 
 	private Timestamp reservedOn;
 
-	// commented, 28-09-2018
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */)
-//	@JoinColumn(name = "BenMapId", insertable = false, updatable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
 
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
index 60ab2fcc..4323b895 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
@@ -103,12 +103,6 @@ public class MBeneficiaryidentity implements Serializable {
 
 	private Timestamp reservedOn;
 
-	// commented, 28-09-2018, unidirectional
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId", insertable = false, updatable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
-
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
index 078838be..944df5c7 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
@@ -162,18 +162,6 @@ public class MBeneficiarymapping implements Serializable {
 	@JoinColumn(referencedColumnName = "benMapId", name = "benMapId", insertable = false, updatable = false)
 	private List<TBendataaccess> tBendataaccesses;
 
-	// public MBeneficiarymapping(BigInteger benMapId, String firstName)
-	// {
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// }
-
-	// public MBeneficiarymapping()
-	// {
-	//
-	// }
-
 	/*
 	 * New columns added for MMU integration 11-04-2018
 	 */
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
index 56717909..0e15dfcd 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
@@ -80,7 +80,6 @@ public class MBeneficiaryregidmapping implements Serializable {
 	@Column(name = "VehicalNo")
 	private String vehicalNo;
 
-	// private Integer ParkingPlaceID;
 
 	private String syncedBy;
 
@@ -88,24 +87,6 @@ public class MBeneficiaryregidmapping implements Serializable {
 
 	private String reservedForChange;
 
-	// //bi-directional one-to-one association to MBeneficiarydetail
-	// @OneToOne(fetch=FetchType.LAZY)
-	// @JoinColumn(name="BenRegId", referencedColumnName="BeneficiaryRegID",
-	// nullable=false, insertable=false, updatable=false)
-	// private MBeneficiarydetail MBeneficiarydetail;
-	//
-	// //bi-directional one-to-one association to MBeneficiarymapping
-	// @OneToOne(fetch=FetchType.LAZY)
-	// @JoinColumn(name="BenRegId", referencedColumnName="BenRegId", nullable=false,
-	// insertable=false, updatable=false)
-	// private MBeneficiarymapping MBeneficiarymapping;
-	//
-	// //bi-directional many-to-one association to MBeneficiaryfamilymapping
-	// @OneToMany(mappedBy="MBeneficiaryregid")
-	// private List<MBeneficiaryfamilymapping> MBeneficiaryfamilymappings;
-
-	// new column added for data sync
-	// 17-06-2018
 	@Expose
 	@Column(name = "vanID")
 	private Integer vanID;
@@ -117,5 +98,4 @@ public class MBeneficiaryregidmapping implements Serializable {
 	@Column(name = "VanSerialNo")
 	private BigInteger vanSerialNo;
 
-	// END OF new column added for data sync
 }
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
index 3d92c90e..aea73035 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
@@ -107,10 +107,6 @@ public class MBeneficiaryservicemapping implements Serializable {
 	@Column(length = 45)
 	private String stateName;
 
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId")
-//	private MBeneficiarymapping MBeneficiarymapping;
 	
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
diff --git a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
index 72fb3a23..647bfda4 100644
--- a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
+++ b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
@@ -68,8 +68,6 @@ public class TBendataaccess implements Serializable
 	private String authId;
 
 	@Transient
-	// @Column(nullable=false, length=75) //SQL Error: 1054, SQLState: 42S22 Unknown column 'tbendataac0_.consentId' in
-	// 'field list'
 	private String consentId;
 
 	@Column(length = 4)
@@ -79,8 +77,6 @@ public class TBendataaccess implements Serializable
 	private Integer userAgentId;
 
 	@Transient
-	// @Column(nullable=false, length=20)// SQL Error: 1054, SQLState: 42S22 Unknown column
-	// 'tbendataac0_.userAgentIpAddr' in 'field list'
 	private String userAgentIpAddr;
 
 	@Column(nullable = false)
@@ -92,11 +88,6 @@ public class TBendataaccess implements Serializable
 	@Column(nullable = false)
 	private Integer userAgentServiceId;
 
-	// commented on 28-09-2018
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/*fetch = FetchType.EAGER*/) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId", nullable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java b/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
index 81a8b278..ea615acd 100644
--- a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
+++ b/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
@@ -97,7 +97,6 @@ public class V_BenAdvanceSearch {
 	@Column(name = "DOB")
 	private Timestamp dOB;
 
-	// new column added for D2D, 21-01-2021
 	@Expose
 	@Column(name = "houseoldId")
 	private Long houseHoldID;
@@ -144,7 +143,6 @@ public void setHouseHoldID(Long houseHoldID) {
 
 	public V_BenAdvanceSearch() {
 		super();
-		// TODO Auto-generated constructor stub
 	}
 
 	public BigInteger getBenMapID() {
diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
index a2b84254..456b8030 100644
--- a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
@@ -52,7 +52,6 @@ public class BeneficiariesDTO implements Comparable<BeneficiariesDTO> {
 	private String preferredEmailId; //
 	private BenDetailDTO beneficiaryDetails;
 	private List<BenFamilyDTO> beneficiaryFamilyTags;
-	// private List<BenFamilyDTO> benFamilyDTOs;
 	private List<BenIdentityDTO> beneficiaryIdentites;
 	private List<BenServiceDTO> beneficiaryServiceMap;
 	private List<Phone> contacts;
@@ -65,8 +64,6 @@ public int compareTo(BeneficiariesDTO ben) {
 		return this.benMapId.compareTo(ben.benMapId);
 	}
 
-	// Start Outreach
-	// New columns added for MMU integration 09-04-2018
 	private Timestamp marriageDate;
 	private Integer ageAtMarriage;
 	private String literacyStatus;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
index 38b472a6..590bbfa3 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
@@ -28,7 +28,6 @@
 import com.iemr.common.identity.domain.Address;
 import com.iemr.common.identity.domain.Contact;
 import com.iemr.common.identity.domain.Identity;
-// import com.iemr.common.identity.domain.Phone;
 
 import lombok.Data;
 
@@ -36,7 +35,6 @@
 public class IdentityDTO {
 
 	private String eventTypeName; // created, reserved, registered, modified,
-									// deleted
 	private Timestamp eventTypeDate;
 	private Integer agentId;
 	private String agentName;
@@ -50,7 +48,6 @@ public class IdentityDTO {
 	private String stateName;
 	private Integer providerServiceMapId;
 
-	// details
 	private Integer areaId;
 	private Integer beneficiaryId;
 	private Integer beneficiaryRegId;
@@ -91,7 +88,6 @@ public class IdentityDTO {
 	private String title;
 	private Integer zoneId;
 
-	// address
 	private Address currentAddress;
 	private Address permanentAddress;
 	private Address emergencyAddress;
@@ -101,28 +97,18 @@ public class IdentityDTO {
 	private Boolean isEmerAddrSameAsPermAddr;
 	private String addressType;
 
-	// contacts
 	private String preferredEmailId;
 	private Contact contact;
 
-	// family tagging
 	List<BenFamilyDTO> benFamilyDTOs;
-	// private Boolean isEmergencyContact;
-	// private String relationshipToSelf;
-	// private BigInteger associatedBenRegId;
 
-	// identities
 	private List<Identity> identities;
 
-	// Start 1097
 	private Integer sexualOrientationID;
 	private String sexualOrientationType;
 	private String isHIVPositive;
-	// End 1097
 
-	/*
-	 * New columns added for MMU integration 11-04-2018
-	 */
+	
 	private String bankName;
 	private String branchName;
 	private String ifscCode;
@@ -133,14 +119,10 @@ public class IdentityDTO {
 	private Integer ageAtMarriage;
 	private Integer incomeStatusId;
 	private String incomeStatus;
-	// End
 
-	// new column added for data sync
-	// 17-06-2018
 	@Expose
 	private Integer vanID;
 
-	// END OF new column added for data sync
 
 	@Expose
 	private Boolean beneficiaryConsent;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
index 23634fb8..5efb3c79 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
@@ -65,7 +65,6 @@ public class IdentityEditDTO {
 	private String gender;
 	private Integer titleId;
 	private String title;
-	// private Integer parkingPlaceId;
 	private String literacyStatus;
 
 	// self address
@@ -109,13 +108,6 @@ public class IdentityEditDTO {
 	// family details
 	private Boolean changeInFamilyDetails = false;
 	List<BenFamilyDTO> benFamilyDTOs;
-	// private Boolean isEmergencyContact;
-	// private String relationshipToSelf;
-	// private BigInteger associatedBenRegId; // Family mapping must be a list
-
-	// List<BenFamilyDTO> benFamilyDTOs;
-
-	// MMU/TM details
 	private Boolean changeInAssociations = false;
 
 	private Integer zoneId;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
index 6506897a..db4bf011 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
@@ -56,7 +56,6 @@ public class IdentitySearchDTO {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Timestamp dob;
 
-	// new column added for D2D, 21-01-2021
 	private Long houseHoldID;
 	private Boolean isD2D;
 
diff --git a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
index 8a67569d..6fee444f 100644
--- a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
+++ b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
@@ -23,6 +23,5 @@
 
 public class SearchCriteriaException {
 	
-	// SUNIL TODO: add the exception & propagate
 
 }
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
index 64df182c..85e47c19 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -298,7 +298,6 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID") })
 	MBeneficiaryservicemapping identityDTOToMBeneficiaryservicemapping(IdentityDTO dto);
 
-	// SUNIL TODO: Change to order of target & source to maintain consistency
 	@Mappings({ @Mapping(target = "benMapId", source = "benMapId"),
 			@Mapping(target = "benId", source = "map.MBeneficiaryregidmapping.beneficiaryID"),
 			@Mapping(target = "benRegId", source = "map.MBeneficiaryregidmapping.benRegId"),
@@ -579,26 +578,12 @@ List<BenFamilyDTO> mapToMBeneficiaryfamilymappingWithBenFamilyDTOList(
 
 	List<BenServiceDTO> mBeneficiaryservicemappingListToBenServiceDTOList(List<MBeneficiaryservicemapping> services);
 
-	// @Mapping(target = "MBeneficiaryservicemappings", expression =
-	// "java(Collections.singletonList(svcMapping))"),
-	// @Mapping(target = "MBeneficiaryfamilymappings", expression =
-	// "java(Collections.singletonList(familyMapping))")
-	// MBeneficiarymapping
-	// MBeneficiarymappingDTOToMBeneficiarymapping(MBeneficiarymappingDTOInbound
-	// dto);
-	// MBeneficiarymappingDTOInbound
-	// MBeneficiarymappingToMBeneficiarymappingDTO(MBeneficiarymapping map);
-
-	// Start outreach
-	// code specific for outreach
 	@Mappings({ @Mapping(source = "dto.bankName", target = "bankName"),
 			@Mapping(source = "dto.branchName", target = "branchName"),
 			@Mapping(source = "dto.ifscCode", target = "ifscCode"),
 			@Mapping(source = "dto.accountNo", target = "accountNo"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
 			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
-			// new mapping added for data sync(van ID & parking place ID)
-			// 17-09-2018
 			@Mapping(source = "dto.vanID", target = "vanID"),
 			@Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// End
diff --git a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
index 0f287916..b9ba6524 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
@@ -48,10 +48,6 @@ public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigI
 
 	List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String SMSPhoneNum);
 
-//	@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum or phoneNum1 = :phoneNum "
-//			+ "or c.phoneNum2 = :phoneNum or c.phoneNum3 = :phoneNum or c.phoneNum4 = :phoneNum "
-//			+ "or c.phoneNum5 = :phoneNum order by c.benContactsID desc")
-//	List<MBeneficiarycontact> findByAnyPhoneNum(@Param("phoneNum") String phoneNum);
 	
 	@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum ")
 	List<MBeneficiarycontact> findByAnyPhoneNum(@Param("phoneNum") String phoneNum);
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
index 22d6d0cc..24d20829 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
@@ -40,21 +40,12 @@ public interface BenDataAccessRepo extends CrudRepository<TBendataaccess, BigInt
 	List<TBendataaccess> findByUserAgentIdAndAccessedOnBetweenOrderByAccessIdAsc(Integer userAgentId,
 			Timestamp fromDate, Timestamp toDate);
 
-	// commented as userAgentIpAddr is unknown column
-	// List<TBendataaccess> findByUserAgentIpAddr(String userAgentIpAddr);
-	// List<TBendataaccess> findByUserAgentIpAddrAndAccessedOnBetween(String userAgentIpAddr, Timestamp fromDate,
-	// Timestamp toDate);
-	// List<TBendataaccess> findByUserAgentIdAndUserAgentIpAddr(Integer userAgentId, String userAgentIpAddr);
-	// List<TBendataaccess> findByUserAgentIdAndUserAgentIpAddrAndAccessedOnBetween(Integer userAgentId, String
-	// userAgentIpAddr, Timestamp fromDate, Timestamp toDate);
 
 	List<TBendataaccess> findByUserAgentPSMapIdOrderByAccessIdAsc(Integer userAgentPSMapId);
 
 	List<TBendataaccess> findByUserAgentRoleIdOrderByAccessIdAsc(Integer userAgentRoleId);
 
 	List<TBendataaccess> findByUserAgentServiceIdOrderByAccessIdAsc(Integer userAgentServiceId);
-	// List<TBendataaccess> findByUserAgentStateId(Integer userAgentStateId);
-	// List<TBendataaccess> findByUserAgentServiceProviderId(Integer userAgentServiceProviderId);
 
 	List<TBendataaccess> findByUserAgentPSMapIdAndAccessedOnBetweenOrderByAccessIdAsc(Integer userAgentPSMapId,
 			Timestamp fromDate, Timestamp toDate);
@@ -64,15 +55,8 @@ List<TBendataaccess> findByUserAgentRoleIdAndAccessedOnBetweenOrderByAccessIdAsc
 
 	List<TBendataaccess> findByUserAgentServiceIdAndAccessedOnBetweenOrderByAccessIdAsc(Integer userAgentServiceId,
 			Timestamp fromDate, Timestamp toDate);
-	// List<TBendataaccess> findByUserAgentStateIdAndAccessedOnBetween(Integer userAgentStateId, Timestamp fromDate,
-	// Timestamp toDate);
-	// List<TBendataaccess> findByUserAgentServiceProviderIdAndAccessedOnBetween(Integer userAgentServiceProviderId,
-	// Timestamp fromDate, Timestamp toDate);
 
 	Long countByUserAgentIdAndAccessedOnBetweenOrderByAccessIdAsc(Integer userAgentId, Timestamp fromDate, Timestamp toDate);
-	// Long countByUserAgentIpAddrAndAccessedOnBetween(String userAgentIpAddr, Timestamp fromDate, Timestamp toDate);
-	// Long countByUserAgentIdAndUserAgentIpAddrAndAccessedOnBetween(Integer userAgentId, String userAgentIpAddr,
-	// Timestamp fromDate, Timestamp toDate);
 
 	Long countByUserAgentPSMapId(Integer userAgentPSMapId);
 
@@ -80,17 +64,12 @@ List<TBendataaccess> findByUserAgentServiceIdAndAccessedOnBetweenOrderByAccessId
 
 	Long countByUserAgentServiceId(Integer userAgentServiceId);
 
-	// Long countByUserAgentStateId(Integer userAgentStateId);
-	// Long countByUserAgentServiceProviderId(Integer userAgentServiceProviderId);
 	Long countByUserAgentPSMapIdAndAccessedOnBetween(Integer userAgentPSMapId, Timestamp fromDate, Timestamp toDate);
 
 	Long countByUserAgentRoleIdAndAccessedOnBetween(Integer userAgentRoleId, Timestamp fromDate, Timestamp toDate);
 
 	Long countByUserAgentServiceIdAndAccessedOnBetween(Integer userAgentServiceId, Timestamp fromDate,
 			Timestamp toDate);
-	// Long countByUserAgentStateIdAndAccessedOnBetween(Integer userAgentStateId, Timestamp fromDate, Timestamp toDate);
-	// Long countByUserAgentServiceProviderIdAndAccessedOnBetween(Integer userAgentServiceProviderId, Timestamp
-	// fromDate, Timestamp toDate);
 
 	List<TBendataaccess> findByaccessedOnBetweenOrderByAccessIdAsc(Timestamp fromDate, Timestamp toDate);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
index 8668bce0..af2998cd 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
@@ -42,18 +42,12 @@ public interface BenDetailRepo extends CrudRepository<MBeneficiarydetail, BigInt
 	List<MBeneficiarydetail> findByCreatedDateBetweenOrderByBeneficiaryDetailsIdAsc(Timestamp fromDate,
 			Timestamp toDate);
 
-	// List<MBeneficiarydetail> findByMBeneficiaryregid(MBeneficiaryregidmapping
-	// MBeneficiaryregid);
 	List<MBeneficiarydetail> findByFirstNameAndLastNameOrderByBeneficiaryDetailsIdAsc(String fName, String mName);
 
-	// searching with criterias
 
 	@Query("select d from MBeneficiarydetail d " + "where d.mBeneficiarymapping.benRegId = :benRegId")
 	MBeneficiarydetail findByBenRegId(BigInteger benRegId);
 
-	// @Query("select d from MBeneficiarydetail d "
-	// + "where d.mBeneficiarymapping.beneficiaryID = :beneficiaryID")
-	// MBeneficiarydetail findByBeneficiaryID(BigInteger beneficiaryID);
 
 	@Query("select d from MBeneficiarydetail d where d.firstName = :fName and d.middleName = :mName and "
 			+ "d.lastName = :lName Order By d.beneficiaryDetailsId Asc")
@@ -84,17 +78,12 @@ List<MBeneficiarydetail> findByNameAndSpouseNameAndDob(String fName, String mNam
 	@Query("select new MBeneficiarydetail(d.beneficiaryDetailsId, d.firstName, d.lastName, d.middleName, "
 			+ "d.fatherName, d.spouseName) "
 			+ "from MBeneficiarydetail d where d.mBeneficiarymapping.benRegId = :benRegId")
-	// + "in (select beneficiaryDetailsId from MBeneficiarymapping where benRegId =
-	// :benRegId)")
 	MBeneficiarydetail findPartialBeneficiaryDetailByBenRegId(@Param("benRegId") BigInteger benRegId);
 
 	@Query("select new MBeneficiarydetail(d.beneficiaryDetailsId, d.firstName, d.lastName, d.middleName, "
 			+ "d.fatherName, d.spouseName) "
 			+ "from MBeneficiarydetail d where d.mBeneficiarymapping.benRegId in :benRegIds")
 	List<MBeneficiarydetail> findPartialBeneficiaryDetailByBenRegId(@Param("benRegIds") List<BigInteger> benRegId);
-	// @Query("select d from MBeneficiarydetail d where d.MBeneficiaryregid.benRegId
-	// = :benRegid")
-	// List<MBeneficiarydetail> findByBeneficiaryRegid(BigInteger benRegid);
 
 	@Transactional
 	@Modifying
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
index c77a1b19..ca18a43b 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
@@ -37,8 +37,7 @@
 import com.iemr.common.identity.domain.MBeneficiarydetail;
 import com.iemr.common.identity.dto.IdentitySearchDTO;
 
-public class BenDetailRepoImpl implements BenDetailRepoCustom
-{
+public class BenDetailRepoImpl implements BenDetailRepoCustom {
 
 	@PersistenceContext
 	private EntityManager entityManager;
@@ -48,19 +47,22 @@ public class BenDetailRepoImpl implements BenDetailRepoCustom
 	/**
 	 * Search Criteria: the following are necessary to conduct a finite search
 	 * 
-	 * 1. beneficiary ID 2. beneficiary Reg ID 3. Contact Number 4. Name (First, Middle, Last), Age, Gender 5. Village
-	 * Name 6. District State Zone Coordinates 7. Pin Code 8. Father Name 9. Spouse Name
+	 * 1. beneficiary ID 2. beneficiary Reg ID 3. Contact Number 4. Name (First,
+	 * Middle, Last), Age, Gender 5. Village Name 6. District State Zone Coordinates
+	 * 7. Pin Code 8. Father Name 9. Spouse Name
 	 * 
-	 * Allowed Single Parameters: - beneficiary Id - beneficiary Reg Id - Contact Number
+	 * Allowed Single Parameters: - beneficiary Id - beneficiary Reg Id - Contact
+	 * Number
 	 * 
-	 * Allowed Multi-Parameters: - Name (First, Middle, Last), Age, Gender - Contact Number & Name (First, Middle, Last)
-	 * - Pin Code & Name (First, Middle, Last) - Village, Father Name & Name (First, Middle, Last) - Village, Spouse
-	 * Name & Name (First, Middle, Last) - Village, District, State - Govt identities(keys, values)
+	 * Allowed Multi-Parameters: - Name (First, Middle, Last), Age, Gender - Contact
+	 * Number & Name (First, Middle, Last) - Pin Code & Name (First, Middle, Last) -
+	 * Village, Father Name & Name (First, Middle, Last) - Village, Spouse Name &
+	 * Name (First, Middle, Last) - Village, District, State - Govt identities(keys,
+	 * values)
 	 */
 
 	@Override
-	public List<MBeneficiarydetail> advanceFilterSearch(IdentitySearchDTO searchDTO)
-	{
+	public List<MBeneficiarydetail> advanceFilterSearch(IdentitySearchDTO searchDTO) {
 
 		CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
 		CriteriaQuery<MBeneficiarydetail> criteriaQuery = criteriaBuilder.createQuery(MBeneficiarydetail.class);
@@ -69,113 +71,80 @@ public List<MBeneficiarydetail> advanceFilterSearch(IdentitySearchDTO searchDTO)
 		// add predicates to see more parameters
 		List<Predicate> predicates = new ArrayList<Predicate>();
 
-		/**
-		 * Beneficiary ID is present, no need for other criteria
-		 */
-		// if(filterDTO.getBeneficiaryId().isPresent()) {
-		// //filterDTO.getBeneficiaryId().get();
-		// MBeneficiaryregidmapping regId = regIdRepo.findByBeneficiaryID(filterDTO.getBeneficiaryId().get());
-		// predicates.add(criteriaBuilder.equal(root.get("beneficiaryRegID"), regId.getBenRegId()));
-		// }
-
-		/**
-		 * Beneficiary Reg ID is present, no need for other criteria
-		 */
-		// if(filterDTO.getBeneficiaryRegId().isPresent()) {
-		// //filterDTO.getBeneficiaryRegId().get();
-		// predicates.add(criteriaBuilder.equal(root.get("beneficiaryRegID"), filterDTO.getBeneficiaryRegId().get()));
-		// }
-
 		/**
 		 * First Name is present, additional criteria needed
 		 */
-		if (searchDTO.getFirstName() != null)
-		{
+		if (searchDTO.getFirstName() != null) {
 
-			predicates.add(criteriaBuilder.like(root.<String> get("firstName"), "%" + searchDTO.getFirstName() + "%"));
+			predicates.add(criteriaBuilder.like(root.<String>get("firstName"), "%" + searchDTO.getFirstName() + "%"));
 		}
 
 		/**
 		 * Middle Name is present, additional criteria needed
 		 */
-		if (searchDTO.getMiddleName() != null)
-		{
-			predicates
-					.add(criteriaBuilder.like(root.<String> get("middleName"), "%" + searchDTO.getMiddleName() + "%"));
+		if (searchDTO.getMiddleName() != null) {
+			predicates.add(criteriaBuilder.like(root.<String>get("middleName"), "%" + searchDTO.getMiddleName() + "%"));
 		}
 
 		/**
 		 * Last Name is present, additional criteria needed
 		 */
-		if (searchDTO.getLastName() != null)
-		{
-			predicates.add(criteriaBuilder.like(root.<String> get("lastName"), "%" + searchDTO.getLastName() + "%"));
+		if (searchDTO.getLastName() != null) {
+			predicates.add(criteriaBuilder.like(root.<String>get("lastName"), "%" + searchDTO.getLastName() + "%"));
 		}
 
 		/**
 		 * Age Id is present, additional criteria needed
 		 */
-		if (searchDTO.getAgeId() != null)
-		{
+		if (searchDTO.getAgeId() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("ageId"), searchDTO.getAgeId()));
 		}
 
 		/**
 		 * Age is present, additional criteria needed
 		 */
-		if (searchDTO.getAge() != null)
-		{
+		if (searchDTO.getAge() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("age"), searchDTO.getAge()));
 		}
 
 		/**
 		 * Gender Id is present, additional criteria needed
 		 */
-		if (searchDTO.getGenderId() != null)
-		{
+		if (searchDTO.getGenderId() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("genderId"), searchDTO.getGenderId()));
 		}
 
 		/**
 		 * Gender Name is present, additional criteria needed
 		 */
-		if (searchDTO.getGenderName() != null)
-		{
+		if (searchDTO.getGenderName() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("genderName"), searchDTO.getGenderName()));
 		}
 
 		/**
 		 * Spouse Name is present, additional criteria needed
 		 */
-		if (searchDTO.getSpouseName() != null)
-		{
-			predicates
-					.add(criteriaBuilder.like(root.<String> get("spouseName"), "%" + searchDTO.getSpouseName() + "%"));
+		if (searchDTO.getSpouseName() != null) {
+			predicates.add(criteriaBuilder.like(root.<String>get("spouseName"), "%" + searchDTO.getSpouseName() + "%"));
 		}
 
 		/**
 		 * Father Name present, additional criteria needed
 		 */
-		if (searchDTO.getFatherName() != null)
-		{
-			predicates
-					.add(criteriaBuilder.like(root.<String> get("fatherName"), "%" + searchDTO.getFatherName() + "%"));
+		if (searchDTO.getFatherName() != null) {
+			predicates.add(criteriaBuilder.like(root.<String>get("fatherName"), "%" + searchDTO.getFatherName() + "%"));
 		}
 
 		/**
 		 * Pin Code is present, additional criteria needed
 		 */
-		if (searchDTO.getPinCode() != null)
-		{
+		if (searchDTO.getPinCode() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("pinCode"), searchDTO.getPinCode()));
 		}
 
 		/**
 		 * Contact Number is present, additional criteria needed
 		 */
-		// if(filterDTO.getContactNumber().isPresent()){
-		// predicates.add(criteriaBuilder.equal(root.get("contactNumber"), filterDTO.getPinCode().get()));
-		// }
 
 		criteriaQuery.select(root).where(predicates.toArray(new Predicate[] {}))
 				.orderBy(criteriaBuilder.asc(root.get("benMapId")));
diff --git a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
index 05b49af4..f4f55096 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
@@ -27,7 +27,6 @@
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-// import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -39,18 +38,9 @@
 public interface BenFamilyMappingRepo extends CrudRepository<MBeneficiaryfamilymapping, BigInteger> {
 	List<MBeneficiaryfamilymapping> findByBenFamilyMapIdOrderByBenFamilyMapIdAsc(BigInteger benFamilyMapId);
 
-	// List<MBeneficiaryfamilymapping> findByAssociatedBenRegID(BigInteger
-	// associatedBenRegID);
-	// List<MBeneficiaryfamilymapping>
-	// findByAssociatedBenRegIDAndIsEmergencyContact(BigInteger associatedBenRegID,
-	// Boolean isEmergencyContact);
 	List<MBeneficiaryfamilymapping> findByCreatedDateBetweenOrderByBenFamilyMapIdAsc(Timestamp fromDate,
 			Timestamp toDate);
 
-	// @Query("select f from MBeneficiaryfamilymapping f where
-	// f.MBeneficiaryregid.benRegId = :associatedBenID")
-	// List<MBeneficiaryfamilymapping> findByAssociatedBenID(BigInteger
-	// associatedBenID);
 
 	List<MBeneficiaryfamilymapping> findByBenMapIdOrderByBenFamilyMapIdAsc(BigInteger benMapId);
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
index 4d3ae32f..ceaca5de 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
@@ -26,20 +26,14 @@
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-// import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.iemr.common.identity.domain.MBeneficiaryaddress;
-// import com.iemr.common.identity.domain.MBeneficiaryaddress;
-// import com.iemr.common.identity.domain.MBeneficiaryconsent;
 import com.iemr.common.identity.domain.MBeneficiarycontact;
 import com.iemr.common.identity.domain.MBeneficiarydetail;
-// import com.iemr.common.identity.domain.MBeneficiarydetail;
-// import com.iemr.common.identity.domain.MBeneficiaryfamilymapping;
-// import com.iemr.common.identity.domain.MBeneficiaryidentity;
 import com.iemr.common.identity.domain.MBeneficiarymapping;
 import com.iemr.common.identity.domain.MBeneficiaryregidmapping;
 
@@ -54,17 +48,6 @@ public interface BenMappingRepo extends CrudRepository<MBeneficiarymapping, BigI
 	List<MBeneficiarymapping> findByMBeneficiaryregidmappingOrderByBenMapIdAsc(
 			MBeneficiaryregidmapping MBeneficiaryregidmapping);
 
-	// @Query("select m from MBeneficiarymapping m where
-	// m.mBeneficiarycontact.benContactsID = :benContactsID")
-	// MBeneficiarymapping findByBenContactsID(@Param("benContactsID")
-	// BigInteger benContactsID);
-	// List<MBeneficiarymapping>
-	// findByMBeneficiaryregidmapping(MBeneficiaryregidmapping
-	// MBeneficiaryregidmapping);
-	// MBeneficiarymapping findByMBeneficiaryaddress(MBeneficiaryaddress
-	// MBeneficiaryaddress);
-	// List<MBeneficiarymapping> findByMBeneficiarycontact(MBeneficiarycontact
-	// MBeneficiarycontact);
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailOrderByBenMapIdAsc(MBeneficiarydetail mBeneficiarydetail);
 
@@ -91,65 +74,6 @@ List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBene
 	@Query("select t from MBeneficiarymapping t where t.benRegId = :benRegID")
 	MBeneficiarymapping getBenImageIdByBenRegID(@Param("benRegID") BigInteger benRegID);
 
-	// List<MBeneficiarymapping> findByMBeneficiaryconsent(MBeneficiaryconsent
-	// MBeneficiaryconsent);
-
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryRegIdMapping.benRegId = :benRegId")
-	// List<MBeneficiarymapping> findByBeneficiaryRegId(BigInteger benRegId);
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryaddress.benAddressID = :benAddressID")
-	// List<MBeneficiarymapping> findByBeneficiaryAddressId(BigInteger
-	// benAddressID);
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiarycontact.benContactsID = :benContactsID")
-	// List<MBeneficiarymapping> findByBeneficiaryContactId(BigInteger
-	// benContactsID);
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryconsent.benConsentID = :benConsentID")
-	// List<MBeneficiarymapping> findByBeneficiaryConsentId(BigInteger
-	// benConsentID);
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiarydetail.beneficiaryDetailsId =
-	// :beneficiaryDetailsId")
-	// List<MBeneficiarymapping> findByBeneficiaryDetailId(BigInteger
-	// beneficiaryDetailsId);
-	//
-	//
-	// @Query("select m from MBeneficiarymapping m where m.deleted = b'1'")
-	// List<MBeneficiarymapping> findByDeleted();
-	//
-	// @Query("select m from MBeneficiarymapping m where m.reserved = b'1'")
-	// List<MBeneficiarymapping> findByReserved();
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryregidmapping.beneficiaryID = :BeneficiaryID")
-	// List<MBeneficiarymapping> findByBeneficiaryId(BigInteger BeneficiaryID);
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryidentities.MBeneficiaryidentity =
-	// :MBeneficiaryidentity")
-	// List<MBeneficiarymapping> findByMBeneficiaryidentity(MBeneficiaryidentity
-	// MBeneficiaryidentity);
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryfamilymappings.MBeneficiaryfamilymapping =
-	// :MBeneficiaryfamilymapping")
-	// List<MBeneficiarymapping>
-	// findByMBeneficiaryfamilymapping(MBeneficiaryfamilymapping
-	// MBeneficiaryfamilymapping);
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryfamilymappings.MBeneficiaryservicemapping =
-	// :MBeneficiaryservicemapping")
-	// List<MBeneficiarymapping>
-	// findByMBeneficiaryservicemapping(MBeneficiaryservicemapping
-	// MBeneficiaryservicemapping);
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.TBendataaccesses.tBendataaccess = :tBendataaccess")
-	// List<MBeneficiarymapping> findByTBendataaccess(TBendataaccess
-	// tBendataaccess);
 
 	@Transactional
 	@Modifying
@@ -162,14 +86,12 @@ List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBene
 			+ " WHERE t.benRegId = :benRegID ORDER BY t.benMapId Desc ")
 	public List<Object[]> getBenMappingByRegID(@Param("benRegID") BigInteger benRegID);
 
-	// old code 1.0
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
 			+ "  WHERE t.benContactsId IN :contactIDList  ORDER BY t.benMapId Desc ")
 	public List<Object[]> getBenMappingByBenContactIdList(@Param("contactIDList") List<BigInteger> contactIDList);
 
-	// new code 1.0
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
@@ -177,7 +99,6 @@ List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBene
 	public List<Object[]> getBenMappingByBenContactIdListNew(@Param("benContactId") BigInteger benContactId,
 			@Param("vanID") Integer vanID);
 
-	// 19-12-2018, neeraj
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
@@ -190,7 +111,6 @@ public List<Object[]> getBenMappingByBenContactIdListNew(@Param("benContactId")
 	@Query("SELECT t.benRegId FROM MBeneficiarymapping t WHERE t.benDetailsId =:benDetailsId AND vanID = :vanID")
 	public BigInteger getBenRegId(@Param("benDetailsId") BigInteger benDetailsId, @Param("vanID") Integer vanID);
 
-	// 12-09-2022
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
@@ -198,7 +118,6 @@ public List<Object[]> getBenMappingByBenContactIdListNew(@Param("benContactId")
 	public List<Object[]> getBenMappingByBenDetailsIds(@Param("benDetailsIds") List<BigInteger> benDetailsIds,
 			@Param("vanID") Integer vanID);
 
-	// 12-09-2022
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
index 04a2bc36..ce01b507 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
@@ -339,8 +339,6 @@ public List<MBeneficiarymapping> finiteSearch(IdentityDTO identityDTO) {
 
 			predicates.add(criteriaBuilder.equal(benContact.get("preferredPhoneNum"),
 					identityDTO.getContact().getPreferredPhoneNum()));
-			// predicates.add(criteriaBuilder.or(benContact.get("phoneNum1"),
-			// identityDTO.getContact().getPreferredPhoneNum()));
 		}
 
 		criteriaQuery.select(root).where(predicates.toArray(new Predicate[] {}));
diff --git a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
index 55683eb4..830b0f41 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
@@ -41,8 +41,6 @@ public interface BenRegIdMappingRepo extends CrudRepository<MBeneficiaryregidmap
 
 	MBeneficiaryregidmapping findByBeneficiaryID(BigInteger beneficiaryID);
 
-	// List<MBeneficiaryregidmapping> findByMBeneficiarydetail(MBeneficiarydetail
-	// MBeneficiarydetail);
 	List<MBeneficiaryregidmapping> findByCreatedDateBetweenOrderByBenRegIdAsc(Timestamp fromDate, Timestamp toDate);
 
 	MBeneficiaryregidmapping findFirstByProvisionedAndReserved(Boolean isProvisioned, Boolean isReserved);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 238ccda5..9ec2a197 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -63,3 +63,5 @@ getHealthID=healthID/getBenhealthID
 
 
 
+
+

From c9c75f448fb6d4dd62bd776603d390b4ca9c4ed4 Mon Sep 17 00:00:00 2001
From: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Date: Thu, 15 Jun 2023 18:50:17 +0530
Subject: [PATCH 08/53] Swagger changes (#9)

* Swagger changes

* Swagger changes
---
 .../java/com/iemr/common/identity/config/SwaggerConfig.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
index 9b7d9568..d16305ff 100644
--- a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
@@ -46,10 +46,10 @@ public Docket productApi()
 	private ApiInfo metaData()
 	{
 		ApiInfoBuilder builder = new ApiInfoBuilder();
-		builder.contact(new Contact("Wipro HCIT", "https://www.wipro.com", "mywipro@wipro.com"));
-		builder.description("Identity APIs for AMRIT");
+		builder.contact(new Contact("AMRIT", "https://psmri.github.io/PSMRI/", "amrit@piramalswasthya.org"));
+		builder.description("A microservice for the creation and management of beneficaries.");
 		builder.version("1.0");
-		builder.title("Identity APIs for AMRIT");
+		builder.title("Identity API");
 		return builder.build();
 	}
 }

From 4e28fe2a93df49375d36042e9808cb39a12be045 Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Fri, 16 Jun 2023 16:57:11 +0530
Subject: [PATCH 09/53] Code smell fix (#10)

---
 .../identity/service/IdentityService.java     | 342 ------------------
 1 file changed, 342 deletions(-)

diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index ab8bb995..40721cbf 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -95,8 +95,6 @@
 @Service
 public class IdentityService {
 	private static final Logger logger = LoggerFactory.getLogger(IdentityService.class);
-	// private ExecutorService executor = Executors
-	// .newFixedThreadPool(5)/* .newCachedThreadPool() */;
 
 	@Autowired
 	private DataSource dataSource;
@@ -575,13 +573,8 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {
 			benMapOBJ.setMBeneficiaryAccount(accountRepo
 					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]));
 
-			// family
-//			benMapOBJ.setMBeneficiaryfamilymappings(
-//					familyMapRepo.findByBenMapIdOrderByBenFamilyMapIdAsc(getBigIntegerValueFromObject(benMapArr[9])));
 			benMapOBJ.setMBeneficiaryfamilymappings(familyMapRepo.findByBenMapIdAndVanIDOrderByBenFamilyMapIdAsc(
 					getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]));
-//			benMapOBJ
-//					.setMBeneficiaryidentities(identityRepo.findByBenMapId(getBigIntegerValueFromObject(benMapArr[9])));
 			benMapOBJ.setMBeneficiaryidentities(identityRepo
 					.findByBenMapIdAndVanID(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]));
 
@@ -688,8 +681,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			throw new MissingMandatoryFieldsException("Either of BeneficiaryID or Beneficiary Reg Id is mandatory.");
 		}
 
-		// SUNIL TODO: Logic for the various Edit scenarios goes here
-
 		MBeneficiarymapping benMapping = mappingRepo.findByBenRegIdOrderByBenMapIdAsc(identity.getBeneficiaryRegId());
 
 		// change in self details is implement here and other details here
@@ -700,15 +691,10 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 				|| Boolean.TRUE.equals(identity.getChangeInOtherDetails())
 				|| Boolean.TRUE.equals(identity.getChangeInAssociations())) {
 
-			// MBeneficiarydetail mbDetl =
-			// detailRepo.findOne(benMapping.getMBeneficiarydetail().getBeneficiaryDetailsId());
 			MBeneficiarydetail mbDetl = editMapper.IdentityEditDTOToMBeneficiarydetail(identity);
 			/**
 			 * new logic for data sync, 26-09-2018
 			 */
-			// next commented statement is old one
-			// mbDetl.setBeneficiaryDetailsId(benMapping.getMBeneficiarydetail().getBeneficiaryDetailsId());
-
 			// getting correct beneficiaryDetailsId by passing vanSerialNo & vanID
 			MBeneficiarydetail benDetails = detailRepo.findBenDetailsByVanSerialNoAndVanID(
 					benMapping.getMBeneficiarydetail().getBeneficiaryDetailsId(), benMapping.getVanID());
@@ -730,8 +716,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			 * END
 			 */
 
-			// old logic
-			// mbDetl.setBeneficiaryDetailsId(benMapping.getMBeneficiarydetail().getBeneficiaryDetailsId());
 			logger.debug("Beneficiary details to update = " + new OutputMapper().gson().toJson(mbDetl));
 			detailRepo.save(mbDetl);
 		}
@@ -745,8 +729,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			/**
 			 * new logic for data sync, 26-09-2018
 			 */
-			// next commented statement is old one
-			// mbAddr.setBenAddressID(benMapping.getMBeneficiaryaddress().getBenAddressID());
 
 			// getting correct beneficiaryDetailsId by passing vanSerialNo & vanID
 			BigInteger benAddressID = addressRepo.findIdByVanSerialNoAndVanID(
@@ -761,8 +743,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			 * END
 			 */
 
-			// old logic
-			// mbAddr.setBenAddressID(benMapping.getMBeneficiaryaddress().getBenAddressID());
 			logger.debug("Beneficiary address to update = " + OutputMapper.gson().toJson(mbAddr));
 			addressRepo.save(mbAddr);
 		}
@@ -776,8 +756,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			/**
 			 * new logic for data sync, 26-09-2018
 			 */
-			// next commented statement is old one
-			// benCon.setBenContactsID(benMapping.getMBeneficiarycontact().getBenContactsID());
 
 			// getting correct beneficiaryDetailsId by passing vanSerialNo & vanID
 			BigInteger benContactsID = contactRepo.findIdByVanSerialNoAndVanID(
@@ -793,7 +771,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			 */
 
 			logger.debug("Beneficiary contact to update = " + OutputMapper.gson().toJson(benCon));
-			// benCon.setBenContactsID(benMapping.getMBeneficiarycontact().getBenContactsID());
 			contactRepo.save(benCon);
 		}
 
@@ -806,10 +783,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 					.IdentityEditDTOListToMBeneficiaryidentityList(identity.getIdentities());
 			logger.debug("identities to upsert = " + OutputMapper.gson().toJson(identities));
 
-			// old logic for getting beneficiary identities, 26-09-2018
-			// List<MBeneficiaryidentity> idList =
-			// identityRepo.findByBenMapId(benMapping.getBenMapId());
-
 			// new logic for getting beneficiary identities, 26-09-2018
 			List<MBeneficiaryidentity> idList = identityRepo.findByBenMapId(benMapping.getVanSerialNo());
 
@@ -819,15 +792,11 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			while (iterator.hasNext()) {
 				beneficiaryidentity = iterator.next();
 
-				// old logic, 26-09-2018
-				// beneficiaryidentity.setBenMapId(benMapping.getBenMapId());
-
 				// new logic, 26-09-2018
 				beneficiaryidentity.setBenMapId(benMapping.getVanSerialNo());
 				logger.debug("Beneficiary identity to update = " + OutputMapper.gson().toJson(beneficiaryidentity));
 				if (index < idList.size() && beneficiaryidentity.getBenIdentityId() == null) {
 					beneficiaryidentity.setBenIdentityId(idList.get(index).getBenIdentityId());
-					// identityRepo.save(beneficiaryidentity);
 				}
 
 				// new code to set vanID & parkingPlaceID for new record, 26-09-2018
@@ -835,21 +804,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 					beneficiaryidentity.setVanID(benMapping.getVanID());
 					beneficiaryidentity.setParkingPlaceID(benMapping.getParkingPlaceID());
 				}
-				// else
-				// {
-				/**
-				 * add vanID & parkingPlaceID for data sync
-				 */
-				// if (identity != null && identity.getVanID() != null)
-				// beneficiaryidentity.setVanID(identity.getVanID());
-				// if (identity != null && identity.getParkingPlaceId() != null)
-				// beneficiaryidentity.setParkingPlaceID(identity.getParkingPlaceId());
-				/**
-				 * END
-				 */
-
-				// old logic, 26-09-2018
-				// identityRepo.save(beneficiaryidentity);
 
 				// new logic, 26-09-2018
 				MBeneficiaryidentity m = identityRepo.save(beneficiaryidentity);
@@ -859,17 +813,10 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 					int i8 = identityRepo.updateVanSerialNo(m.getBenIdentityId());
 				}
 
-				// }
 				index++;
 			}
 		}
 
-		// change other details are added here *** commented cause all details
-		// are
-		// available in ben details
-		// if(identity.getChangeInOtherDetails()){
-		// }
-
 		// family detail changes are performing here
 		logger.debug("identity.getChangeInFamilyDetails = " + identity.getChangeInFamilyDetails());
 		if (Boolean.TRUE.equals(identity.getChangeInFamilyDetails())) {
@@ -878,10 +825,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 
 			logger.debug("family map to upsert = " + OutputMapper.gson().toJson(fbMaps));
 
-			// old logic, 26-09-2018
-			// List<MBeneficiaryfamilymapping> fmList = familyMapRepo
-			// .findByBenMapIdOrderByBenFamilyMapIdAsc(benMapping.getBenMapId());
-
 			// new logic, 26-09-2018
 			List<MBeneficiaryfamilymapping> fmList = familyMapRepo
 					.findByBenMapIdOrderByBenFamilyMapIdAsc(benMapping.getVanSerialNo());
@@ -893,9 +836,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			while (iterator.hasNext()) {
 
 				familymapping = iterator.next();
-				// old logic, 26-09-2018
-				// familymapping.setBenMapId(benMapping.getBenMapId());
-
 				// new logic, 26-09-2018
 				familymapping.setBenMapId(benMapping.getVanSerialNo());
 
@@ -909,9 +849,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 					familymapping.setParkingPlaceID(benMapping.getParkingPlaceID());
 				}
 
-				// old logic, 26-09-2018
-				// familyMapRepo.save(familymapping);
-
 				// new logic, 26-09-2018
 				MBeneficiaryfamilymapping m = familyMapRepo.save(familymapping);
 
@@ -972,17 +909,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			imageRepo.save(beneficiaryImage);
 		}
 
-		// end
-
-		// change in association will be done here *** commented cause all
-		// details are
-		// available in ben details
-		// if(identity.getChangeInAssociations()) {
-		//
-		// }
-
 		logger.info("IdentityService.editIdentity - end. id = " + benMapping.getBenMapId());
-		// return benMapping;
 	}
 
 	/**
@@ -990,8 +917,6 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 	 * @return
 	 */
 
-	// SynchronousQueue<MBeneficiaryregidmapping> queue = new
-	// SynchronousQueue<MBeneficiaryregidmapping>();
 	ArrayDeque<MBeneficiaryregidmapping> queue = new ArrayDeque<MBeneficiaryregidmapping>();
 
 	public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRException {
@@ -1017,25 +942,6 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 
 		regMap.setProvisioned(true);
 
-		/*
-		 * synchronized (regIdRepo) { regMap =
-		 * regIdRepo.findFirstByProvisionedAndReserved(false, false);
-		 * 
-		 * if (regMap == null) throw new
-		 * IEMRException("Beneficiary IDs are not available! Please allocate the IDs");
-		 * 
-		 * regMap.setReserved(true);
-		 * 
-		 * regIdRepo.save(regMap);
-		 * 
-		 * regMap.setProvisioned(true); }
-		 */
-
-		// return regMap;
-		// });
-
-		// Future<MBeneficiaryaddress> fAddress = executor.submit(() ->
-		// {
 		logger.info("IdentityService.createIdentity - saving Address");
 		MBeneficiaryaddress mAddr = mapper.identityDTOToMBeneficiaryaddress(identity);
 		logger.info("identity.getIsPermAddrSameAsCurrAddr = " + identity.getIsPermAddrSameAsCurrAddr());
@@ -1068,11 +974,6 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		// Update van serial no for data sync
 		int i = addressRepo.updateVanSerialNo(mAddr.getBenAddressID());
 
-		// return mAddr;
-		// });
-
-		// Future<MBeneficiaryconsent> fConsent = executor.submit(() ->
-		// {
 		MBeneficiaryconsent mConsnt = mapper.identityDTOToDefaultMBeneficiaryconsent(identity, true, false);
 		logger.info("IdentityService.createIdentity - saving Consent");
 		mConsnt = consentRepo.save(mConsnt);
@@ -1081,11 +982,6 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		// Update van serial no for data sync
 		int i1 = consentRepo.updateVanSerialNo(mConsnt.getBenConsentID());
 
-		// return mConsnt;
-		// });
-
-		// Future<MBeneficiarycontact> fContact = executor.submit(() ->
-		// {
 		logger.info("IdentityService.createIdentity - saving Contacts");
 		MBeneficiarycontact mContc = mapper.identityDTOToMBeneficiarycontact(identity);
 		mContc = contactRepo.save(mContc);
@@ -1094,11 +990,6 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		// Update van serial no for data sync
 		int i2 = contactRepo.updateVanSerialNo(mContc.getBenContactsID());
 
-		// return mContc;
-		// });
-
-		// Future<MBeneficiarydetail> fDetail = executor.submit(() ->
-		// {
 		logger.info("IdentityService.createIdentity - saving Details");
 		MBeneficiarydetail mDetl = mapper.identityDTOToMBeneficiarydetail(identity);
 		mDetl = detailRepo.save(mDetl);
@@ -1107,38 +998,20 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		// Update van serial no for data sync
 		int i3 = detailRepo.updateVanSerialNo(mDetl.getBeneficiaryDetailsId());
 
-		// return mDetl;
-		// });
-
-		// start
-		// Feature used in outreach
-		// Future<MBeneficiaryAccount> fBankDetails = executor.submit(() ->
-		// {
 		MBeneficiaryAccount bankOBJ = mapper.identityDTOToMBeneficiaryAccount(identity);
 		bankOBJ = accountRepo.save(bankOBJ);
 		// Update van serial no for data sync
 		int i4 = accountRepo.updateVanSerialNo(bankOBJ.getBenAccountID());
 
-		// return bankOBJ;
-		// });
-
-		// Future<MBeneficiaryImage> fBenImage = executor.submit(() ->
-		// {
 		MBeneficiaryImage benImageOBJ = mapper.identityDTOToMBeneficiaryImage(identity);
 		benImageOBJ = imageRepo.save(benImageOBJ);
 
 		// Update van serial no for data sync
 		int i5 = imageRepo.updateVanSerialNo(benImageOBJ.getBenImageId());
 
-		// return benImageOBJ;
-		// });
-		// end
-
 		logger.info("IdentityService.createIdentity - saving Mapping");
 		MBeneficiarymapping benMapping = mapper.identityDTOToMBeneficiarymapping(identity);
 
-		// try
-		// {
 		benMapping.setMBeneficiarycontact(mContc);
 		benMapping.setMBeneficiaryaddress(mAddr);
 		benMapping.setMBeneficiaryconsent(mConsnt);
@@ -1158,35 +1031,12 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		// END
 
 		regIdRepo.save(regMap);
-		// } catch (InterruptedException | ExecutionException e)
-		// {
-		// logger.info("error under catch interrupted exception - benMapping: "
-		// + benMapping);
-		//
-		// e.printStackTrace();
-		// if (benMapping.getMBeneficiarycontact() != null)
-		// {
-		//
-		// logger.info("INSIDE IF IT IS THERE ");
-		// contactRepo.delete(benMapping.getMBeneficiarycontact().getBenContactsID());
-		// }
-		// if (benMapping.getMBeneficiaryaddress() != null)
-		// {
-		//
-		// logger.info("INSIDE IF IT IS THERE ");
-		// regIdRepo.delete(benMapping.getMBeneficiaryaddress().getBenAddressID());
-		// }
-		// e.printStackTrace();
-		// }
 
 		benMapping = mappingRepo.save(benMapping);
 		// Update van serial no for data sync
 		int i6 = mappingRepo.updateVanSerialNo(benMapping.getBenMapId());
 
 		final MBeneficiarymapping benMapping2 = benMapping;
-		// Future<List<MBeneficiaryfamilymapping>> fFamily = executor.submit(()
-		// ->
-		// {
 		logger.info("IdentityService.createIdentity - saving FamilyMaps");
 		List<MBeneficiaryfamilymapping> fIdenList = new ArrayList<MBeneficiaryfamilymapping>();
 		List<MBeneficiaryfamilymapping> fList = new ArrayList<MBeneficiaryfamilymapping>();
@@ -1217,38 +1067,11 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 				}
 			}
 
-			/**
-			 * commenting below code as optimization process, ABOVE code replaced it
-			 * 
-			 */
-
-			// ListIterator<MBeneficiaryfamilymapping> iterator = fIdenList.listIterator();
-			// while (iterator.hasNext()) {
-			//
-			// MBeneficiaryfamilymapping fMap = iterator.next();
-			// fMap.setBenMapId(benMapping2.getBenMapId());
-			// if (fMap.getAssociatedBenRegId() == null) {
-			// fMap.setAssociatedBenRegId(benMapping2.getBenRegId());
-			// }
-			// fMap = familyMapRepo.save(fMap);
-			// fList.add(fMap);
-			// }
-			/**
-			 * END
-			 * 
-			 */
 		}
 
 		logger.info("IdentityService.createIdentity - FamilyMap saved ");
-		// return fList;
-		// });
-
-		// Future<List<MBeneficiaryservicemapping>> fService =
-		// executor.submit(() ->
-		// {
 		logger.info("IdentityService.createIdentity - saving Service Map");
 		MBeneficiaryservicemapping sMap = mapper.identityDTOToMBeneficiaryservicemapping(identity);
-		// sMap.setMBeneficiarymapping(benMapping);
 		sMap.setBenMapId(benMapping.getBenMapId());
 		sMap = serviceMapRepo.save(sMap);
 		logger.info("IdentityService.createIdentity - ServiceMap saved  - id = " + sMap.getBenServiceMapID());
@@ -1258,11 +1081,6 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 
 		List<MBeneficiaryservicemapping> sList = new ArrayList<MBeneficiaryservicemapping>();
 		sList.add(sMap);
-		// return sList;
-		// });
-
-		// Future<List<MBeneficiaryidentity>> fIdentity = executor.submit(() ->
-		// {
 		logger.info("IdentityService.createIdentity - saving Identity");
 		List<MBeneficiaryidentity> mIdenList2 = new ArrayList<MBeneficiaryidentity>();
 		if (null != identity.getIdentities()) {
@@ -1289,15 +1107,6 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 			});
 		}
 
-		// commented on 28-09-2018
-		// benMapping.setMBeneficiaryfamilymappings(fList);
-		// benMapping.setMBeneficiaryservicemappings(sList);
-		// benMapping.setMBeneficiaryidentities(mIdenList2);
-		//
-		//
-		// benMapping = mappingRepo.save(benMapping);
-		// end
-
 		logger.info("IdentityService.createIdentity - end. id = " + benMapping.getBenMapId());
 		return partialMapper.MBeneficiarymappingToBeneficiaryCreateResp(benMapping);
 	}
@@ -1348,52 +1157,11 @@ public String unReserveIdentity(ReserveIdentityDTO unReserve) {
 	 * @param BenRegIds
 	 * @return {@link List} Beneficiaries
 	 */
-	// public List<BeneficiariesPartialDTO>
-	// getBeneficiariesPartialDeatilsByBenRegIdList(List<BigInteger> BenRegIds)
-	// {
-	//
-	// logger.info("IdentityService.getBeneficiariesPartialDeatilsByBenRegId -
-	// end");
-	// List<BeneficiariesPartialDTO> list = new
-	// ArrayList<BeneficiariesPartialDTO>();
-	// List<MBeneficiaryregidmapping> benMapIDList =
-	// (List<MBeneficiaryregidmapping>) regIdRepo.findAll(BenRegIds);
-	// ListIterator<MBeneficiaryregidmapping> benMapListIter =
-	// benMapIDList.listIterator();
-	//
-	// MBeneficiarydetail beneficiarydetail;
-	// MBeneficiarymapping benMap;
-	// while (benMapListIter.hasNext())
-	// {
-	//
-	// MBeneficiaryregidmapping regId = benMapListIter.next();
-	// beneficiarydetail =
-	// detailRepo.findPartialBeneficiaryDetailByBenRegId(regId.getBenRegId());
-	// benMap = new MBeneficiarymapping();
-	// benMap.setMBeneficiarydetail(beneficiarydetail);
-	// benMap.setMBeneficiaryregidmapping(regId);
-	// list.add(partialMapper.MBeneficiarymappingToBeneficiariesPartialDTO(benMap));
-	// }
-	//
-	// logger.info("IdetityService.getBeneficiariesPartialDeatilsByBenRegId -
-	// end");
-	//
-	// return list;
-	// }
 
 	public List<BeneficiariesPartialDTO> getBeneficiariesPartialDeatilsByBenRegIdList(List<BigInteger> BenRegIds) {
 
 		logger.info("IdentityService.getBeneficiariesPartialDeatilsByBenRegId - end");
 		List<BeneficiariesPartialDTO> list = new ArrayList<BeneficiariesPartialDTO>();
-		// old logic
-		// List<MBeneficiarymapping> benMapIDList = (List<MBeneficiarymapping>)
-		// mappingRepo
-		// .findAllByBenRegIdOrderByBenMapIdAsc(BenRegIds);
-		// // List<Future<?>> futures = new ArrayList<Future<?>>();
-		// for (MBeneficiarymapping benMap : benMapIDList) {
-		// list.add(partialMapper.MBeneficiarymappingToBeneficiariesPartialDTO(benMap));
-		// }
-		// end
 
 		// new logic, 19-12-2018
 		List<Object[]> benMapObjArr = new ArrayList<>();
@@ -1402,7 +1170,6 @@ public List<BeneficiariesPartialDTO> getBeneficiariesPartialDeatilsByBenRegIdLis
 			if (benMapObjArr != null && benMapObjArr.size() > 0) {
 				for (Object[] objArr : benMapObjArr) {
 					MBeneficiarymapping benMap = this.getBeneficiariesDTONewPartial(objArr);
-//					logger.info("benMap " + benMap);
 
 					list.add(partialMapper.MBeneficiarymappingToBeneficiariesPartialDTO(benMap));
 				}
@@ -1423,68 +1190,10 @@ public List<BeneficiariesPartialDTO> getBeneficiariesPartialDeatilsByBenRegIdLis
 	 * @param BenRegIds
 	 * @return {@link List} Beneficiaries
 	 */
-	// public List<BeneficiariesDTO>
-	// getBeneficiariesDeatilsByBenRegIdList(List<BigInteger> BenRegIds)
-	// {
-	//
-	// logger.info("IdentityService.getBeneficiariesPartialDeatilsByBenRegId -
-	// end");
-	// List<BeneficiariesDTO> list = new ArrayList<BeneficiariesDTO>();
-	// List<MBeneficiaryregidmapping> benMapIDList =
-	// (List<MBeneficiaryregidmapping>) regIdRepo.findAll(BenRegIds);
-	// List<MBeneficiarymapping> benMapList = new
-	// ArrayList<MBeneficiarymapping>();
-	//
-	// benMapIDList.forEach(benIdMap ->
-	// {
-	//
-	// MBeneficiarymapping benMap =
-	// mappingRepo.findByBenRegIdOrderByBenMapIdAsc(benIdMap.getBenRegId());
-	// benMapList.add(benMap);
-	// });
-	//
-	// List<Future<?>> futures = new ArrayList<Future<?>>();
-	// benMapList.forEach(benMap ->
-	// {
-	// Future<?> future = executor.submit(() ->
-	// {
-	//
-	// list.add(this.getBeneficiariesDTO(benMap));
-	// logger.info("benMapId: " + benMap.getBenMapId() + " :: BenId: "
-	// + benMap.getMBeneficiaryregidmapping().getBeneficiaryID());
-	// });
-	// futures.add(future);
-	// });
-	//
-	// try
-	// {
-	// for (Future<?> future : futures)
-	// {
-	// future.get();
-	// }
-	// } catch (InterruptedException | ExecutionException e)
-	// {
-	// e.printStackTrace();
-	// }
-	//
-	// logger.info("IdetityService.getBeneficiariesPartialDeatilsByBenRegId -
-	// end");
-	//
-	// return list;
-	// }
 	public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInteger> BenRegIds) {
 
 		logger.info("IdentityService.getBeneficiariesDeatilsByBenRegIdList - end");
 		List<BeneficiariesDTO> list = new ArrayList<BeneficiariesDTO>();
-		// old logic
-		// List<MBeneficiarymapping> benMapIDList = (List<MBeneficiarymapping>)
-		// mappingRepo
-		// .findAllByBenRegIdOrderByBenMapIdAsc(BenRegIds);
-		//
-		// for (MBeneficiarymapping benMap : benMapIDList) {
-		// list.add(getBeneficiariesDTO(benMap));
-		// }
-		// end
 
 		// new logic, 19-12-2018
 		List<Object[]> benMapObjArr = new ArrayList<>();
@@ -1513,8 +1222,6 @@ public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInte
 	 * @param benMap
 	 * @return
 	 */
-	// private synchronized BeneficiariesDTO
-	// getBeneficiariesDTO(MBeneficiarymapping benMap)
 	private BeneficiariesDTO getBeneficiariesDTO(MBeneficiarymapping benMap) {
 
 		BeneficiariesDTO bdto = mapper.MBeneficiarymappingToBeneficiariesDTO(benMap);
@@ -1523,7 +1230,6 @@ private BeneficiariesDTO getBeneficiariesDTO(MBeneficiarymapping benMap) {
 		bdto.setBeneficiaryIdentites(
 				mapper.mBeneficiaryidentityListToBenIdentityDTOList(benMap.getMBeneficiaryidentities()));
 
-		// System.out.println("ABHA start....");
 		List<Object[]> abhaList = v_BenAdvanceSearchRepo.getBenAbhaDetailsByBenRegID(bdto.getBenRegId());
 		if (abhaList != null && abhaList.size() > 0) {
 			List<AbhaAddressDTO> abhaDTOList = new ArrayList<>();
@@ -1545,7 +1251,6 @@ private BeneficiariesDTO getBeneficiariesDTO(MBeneficiarymapping benMap) {
 			}
 			bdto.setAbhaDetails(abhaDTOList);
 		}
-		// System.out.println("ABHA end....");
 		return bdto;
 	}
 
@@ -1559,30 +1264,11 @@ public List<BeneficiariesDTO> getBeneficiaries(IdentityDTO identityDTO) {
 		List<BeneficiariesDTO> list = new ArrayList<BeneficiariesDTO>();
 
 		List<MBeneficiarymapping> benMapList = mappingRepo.finiteSearch(identityDTO);
-		// List<Future<?>> futures = new ArrayList<Future<?>>();
-		// benMapList.forEach(benMap ->
-		// {
-		// Future<?> future = executor.submit(() ->
-		// {
 		for (MBeneficiarymapping benMap : benMapList) {
 			list.add(this.getBeneficiariesDTO(benMap));
 			logger.info("benMapId: " + benMap.getBenMapId() + " :: BenId: "
 					+ benMap.getMBeneficiaryregidmapping().getBeneficiaryID());
 		}
-		// });
-		// futures.add(future);
-		// });
-
-		// try
-		// {
-		// for (Future<?> future : futures)
-		// {
-		// future.get();
-		// }
-		// } catch (InterruptedException | ExecutionException e)
-		// {
-		// e.printStackTrace();
-		// }
 
 		return list;
 	}
@@ -1595,14 +1281,12 @@ public String getBeneficiaryImage(String requestOBJ) {
 		OutputResponse response = new OutputResponse();
 		try {
 			Map<String, Object> benImageMap = new HashMap<String, Object>();
-			// String benImage = null;
 			if (requestOBJ != null) {
 				JsonObject obj = new JsonObject();
 				JsonParser jsnParser = new JsonParser();
 				JsonElement jsnElmnt = jsnParser.parse(requestOBJ);
 				obj = jsnElmnt.getAsJsonObject();
 
-				// JSONObject obj = new JSONObject(requestOBJ);
 				if (obj != null && obj.has("beneficiaryRegID") && obj.get("beneficiaryRegID") != null) {
 					MBeneficiarymapping benMap = mappingRepo
 							.getBenImageIdByBenRegID(obj.get("beneficiaryRegID").getAsBigInteger());
@@ -1631,33 +1315,11 @@ public String getBeneficiaryImage(String requestOBJ) {
 	}
 
 	public void editIdentityEducationOrCommunity(IdentityEditDTO identity) throws MissingMandatoryFieldsException {
-		// TODO Auto-generated method stub
 		logger.info("IdentityService.editIdentityEducationorCommunity - start");
 		if (identity.getBeneficiaryRegId() == null && null == identity.getBeneficaryId()) {
 			throw new MissingMandatoryFieldsException("Either of BeneficiaryID or Beneficiary Reg Id is mandatory.");
 		}
 
-		// SUNIL TODO: Logic for the various Edit scenarios goes here
-		// old logic : 13-11-2018
-		// MBeneficiarymapping benMapping =
-		// mappingRepo.findByBenRegIdOrderByBenMapIdAsc(identity.getBeneficiaryRegId());
-		// MBeneficiarydetail mbDetl =
-		// editMapper.IdentityEditDTOToMBeneficiarydetail(identity);
-		// logger.debug("Beneficiary details to update = " + new
-		// OutputMapper().gson().toJson(mbDetl));
-		// mbDetl.setBeneficiaryDetailsId(benMapping.getMBeneficiarydetail().getBeneficiaryDetailsId());
-		// if (benMapping != null && benMapping.getMBeneficiarydetail() != null
-		// && benMapping.getMBeneficiarydetail().getBeneficiaryDetailsId() != null) {
-		// if (identity.getCommunityId() != null) {
-		// detailRepo.updateCommunity(benMapping.getMBeneficiarydetail().getBeneficiaryDetailsId(),
-		// identity.getCommunityId());
-		// }
-		// if (identity.getEducationId() != null) {
-		// detailRepo.updateEducation(benMapping.getMBeneficiarydetail().getBeneficiaryDetailsId(),
-		// identity.getEducationId());
-		// }
-		// }
-
 		// new logic : 13-11-2018
 		MBeneficiarymapping benMapping = mappingRepo.findByBenRegIdOrderByBenMapIdAsc(identity.getBeneficiaryRegId());
 		if (benMapping != null && benMapping.getBenDetailsId() != null && benMapping.getVanID() != null) {
@@ -1695,15 +1357,11 @@ public int importBenIdToLocalServer(List<BenIdImportDTO> benIdImportDTOList) {
 				objArr[5] = false;
 
 				dataList.add(objArr);
-//				obj.setProvisioned(false);
-//				obj.setReserved(false);
 				System.out.println("regid :" + obj.getBenRegId() + " - benid :" + obj.getBeneficiaryID());
 			}
 
 			int[] i = jdbcTemplate.batchUpdate(query, dataList);
 
-//			ArrayList<MBeneficiaryregidmapping> rs = (ArrayList<MBeneficiaryregidmapping>) regIdRepo
-//					.save(mBeneficiaryregidmappingList);
 			return i.length;
 		} else
 			return 0;

From 4a81aed0d73947c4d4d7d630f06e30e212b954b1 Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Tue, 20 Jun 2023 15:26:14 +0530
Subject: [PATCH 10/53] code smell fixes (#11)

---
 .../data/rmnch/BenHealthIDDetails.java        |  10 -
 .../domain/MBeneficiaryfamilymapping.java     |   2 -
 .../identity/domain/MBeneficiaryidentity.java |   2 -
 .../domain/MBeneficiaryservicemapping.java    |   3 -
 .../identity/domain/TBendataaccess.java       |   5 +-
 .../repo/rmnch/RMNCHBenConsentRepo.java       |   1 -
 .../common/identity/security/Encryption.java  |  26 ---
 .../iemr/common/identity/security/Hash.java   |  26 ---
 .../rmnch/RmnchDataSyncServiceImpl.java       |  72 -------
 .../common/identity/utils/OutputResponse.java | 191 ++++++------------
 .../iemr/common/identity/utils/Utilities.java |   9 +-
 .../utils/config/ConfigProperties.java        |   6 -
 .../email/GenericEmailServiceImpl.java        |  29 ---
 .../utils/http/HTTPRequestInterceptor.java    |   1 -
 .../common/identity/utils/http/HttpUtils.java |  28 +--
 .../identity/utils/mapper/InputMapper.java    |  42 ----
 .../identity/utils/redis/RedisConnection.java |  80 --------
 .../identity/utils/redis/RedisStorage.java    |  50 -----
 .../utils/response/OutputResponse.java        | 157 ++++++--------
 .../utils/sessionobject/SessionObject.java    |  57 +-----
 .../identity/utils/validator/Validator.java   |  72 ++-----
 21 files changed, 160 insertions(+), 709 deletions(-)
 delete mode 100644 src/main/java/com/iemr/common/identity/security/Encryption.java
 delete mode 100644 src/main/java/com/iemr/common/identity/security/Hash.java
 delete mode 100644 src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java

diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
index a22339d6..7886bcc1 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
@@ -21,16 +21,6 @@
 */
 package com.iemr.common.identity.data.rmnch;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import com.google.gson.annotations.Expose;
-
 public class BenHealthIDDetails {
 
 	Integer benHealthID;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
index 510d1d2e..30cb0776 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
@@ -30,8 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
index 4323b895..f2b9d2dc 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
@@ -30,8 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
index aea73035..400b7f40 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
@@ -30,8 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
@@ -107,7 +105,6 @@ public class MBeneficiaryservicemapping implements Serializable {
 	@Column(length = 45)
 	private String stateName;
 
-	
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
index 647bfda4..8bdc2d22 100644
--- a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
+++ b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
@@ -30,8 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -46,8 +44,7 @@
 @Table(name = "t_bendataaccess")
 @NamedQuery(name = "TBendataaccess.findAll", query = "SELECT t FROM TBendataaccess t")
 @Data
-public class TBendataaccess implements Serializable
-{
+public class TBendataaccess implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
index be760105..ccbd753e 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
@@ -28,7 +28,6 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.iemr.common.identity.data.rmnch.RMNCHMBeneficiaryaddress;
 import com.iemr.common.identity.data.rmnch.RMNCHMBeneficiaryconsent;
 
 @Repository
diff --git a/src/main/java/com/iemr/common/identity/security/Encryption.java b/src/main/java/com/iemr/common/identity/security/Encryption.java
deleted file mode 100644
index 04286702..00000000
--- a/src/main/java/com/iemr/common/identity/security/Encryption.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.security;
-
-public class Encryption {
-
-}
diff --git a/src/main/java/com/iemr/common/identity/security/Hash.java b/src/main/java/com/iemr/common/identity/security/Hash.java
deleted file mode 100644
index 041b55e9..00000000
--- a/src/main/java/com/iemr/common/identity/security/Hash.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.security;
-
-public class Hash {
-
-}
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index bc7063e9..ddeffe17 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -125,8 +125,6 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 
 		try {
 			if (requestOBJ != null && !requestOBJ.isEmpty()) {
-				// JSONObject jsonOBJ = new JSONObject(requestOBJ);
-
 				JsonObject jsnOBJ = new JsonObject();
 				JsonParser jsnParser = new JsonParser();
 				JsonElement jsnElmnt = jsnParser.parse(requestOBJ);
@@ -147,15 +145,11 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 
 						if (benRegID != null) {
 							for (RMNCHBeneficiaryDetailsRmnch obj : benDetailsExtraList) {
-//						RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
-//								.getByIdAndVanID(obj.getId(), obj.getVanID());
 								obj.setBenRegId(benRegID);
 								RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
 										.getByRegID(benRegID);
 								if (temp != null) {
 									obj.setBeneficiaryDetails_RmnchId(temp.getBeneficiaryDetails_RmnchId());
-//									obj.setModifiedBy(obj.getCreatedBy());
-//									obj.setLastModDate(new Timestamp(System.currentTimeMillis()));
 								}
 
 								if (obj.getRelatedBeneficiaryIds() != null
@@ -334,33 +328,6 @@ public String getBenDataByAsha(String requestOBJ, String authorisation) throws E
 			} else
 				throw new Exception("Invalid/missing village details");
 
-			// ------
-//			if (request != null && request.getVillageID() != null) {
-//				List<RMNCHMBeneficiaryaddress> resultSet;
-//				Integer pageSize = Integer.valueOf(door_to_door_page_size);
-//				if (request.getPageNo() != null) {
-//					PageRequest pr = new PageRequest(request.getPageNo(), pageSize);
-//					if (request.getFromDate() != null && request.getToDate() != null) {
-//						Page<RMNCHMBeneficiaryaddress> p = rMNCHBenAddressRepo.getBenDataFilteredWithDateRange(
-//								request.getVillageID(), request.getFromDate(), request.getToDate(), pr);
-//						resultSet = p.getContent();
-//						totalPage = p.getTotalPages();
-//					} else {
-//						Page<RMNCHMBeneficiaryaddress> p = rMNCHBenAddressRepo.getBenData(request.getVillageID(), pr);
-//						resultSet = p.getContent();
-//						totalPage = p.getTotalPages();
-//					}
-//					if (resultSet != null && resultSet.size() > 0) {
-//						outputResponse = getMappingsForAddressIDs(resultSet, totalPage, authorisation);
-//					}
-//				} else {
-//					// page no not invalid
-//					throw new Exception("Invalid page no");
-//				}
-//			} else {
-//				// missing village details : village ID
-//				throw new Exception("Invalid/missing village details");
-//			}
 		} catch (Exception e) {
 			throw new Exception(e.getMessage());
 		}
@@ -516,8 +483,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 					if (benAddressOBJ.getPermAddrLine3() != null)
 						benDetailsRMNCH_OBJ.setAddressLine3(benAddressOBJ.getPermAddrLine3());
 
-					// -----------------------------------------------------------------------------
-
 					// related benids
 					if (benDetailsRMNCH_OBJ.getRelatedBeneficiaryIdsDB() != null) {
 
@@ -531,7 +496,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 
 						benDetailsRMNCH_OBJ.setRelatedBeneficiaryIds(relatedBenIDs);
 					}
-					// ------------------------------------------------------------------------------
 
 					if (benDetailsOBJ.getCommunity() != null)
 						benDetailsRMNCH_OBJ.setCommunity(benDetailsOBJ.getCommunity());
@@ -648,7 +612,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 					resultMap.put("benficieryid", benDetailsRMNCH_OBJ.getBenficieryid());
 					resultMap.put("BenRegId", m.getBenRegId());
 
-
 					// adding asha id / created by - user id
 					if (benAddressOBJ.getCreatedBy() != null) {
 						Integer userID = rMNCHMBenMappingRepo.getUserIDByUserName(benAddressOBJ.getCreatedBy());
@@ -742,7 +705,6 @@ public NCD_TB_HRP_data getHRP_NCD_TB_SuspectedStatus(Long benRegID, String autho
 						response.setConfirmed_hrp(getConfirmedHRP(benRegID, visitCode, authorization, benDetails));
 						break;
 					case "ANC":
-//					response = getConfirmedNCD_TB_Common(benRegID, visitCode);
 						response.setConfirmed_hrp(getConfirmedHRP(benRegID, visitCode, authorization, benDetails));
 						break;
 					case "NCD care":
@@ -986,38 +948,4 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode
 		return response;
 	}
 
-//		String isTB = "no", isNCD = "no";
-//	Object obj = null;
-//		ArrayList<String> ncdList = new ArrayList<String>();
-//		if (visitCode != null && benRegID != null) {// add NCD care
-//			if (visitCategory.equalsIgnoreCase("PNC")) {
-//	obj=rMNCHCBACDetailsRepo.getDiagnosisProvidedPNC(benRegID,visitCode);
-//			} else
-//				obj = rMNCHCBACDetailsRepo.getDiagnosisProvidedExceptPNC(benRegID, visitCode);
-//			if (obj != null) {
-//				String diagnosis[] = ((String) obj).split("||");
-//				if (diagnosis.length > 0) {
-//					for (String s : diagnosis) {
-//						if (s.equalsIgnoreCase("Tuberculosis"))
-//							isTB = "yes";
-//						else if (s.equalsIgnoreCase("Diabetes mellitus") || s.equalsIgnoreCase("Hypertension")
-//								|| s.equalsIgnoreCase("Breast cancer")
-//								|| s.equalsIgnoreCase("Mental health disorder")) {
-//							isNCD = "yes";
-//							ncdList.add(s);
-//						}
-//
-//					}
-//				}
-//			}
-//		}
-//		Map<String, String> res = new HashMap<String, String>();
-//		// return yes,no
-//		res.put("suspected_ncd", "isNCD");
-//		res.put("suspected_tb", "isTB");
-//		res.put("suspected_hrp", "isHRP");
-//		res.put("confirmed_ncd_diseases", "ncdList.toString()");
-//		return new Gson().toJson(res);
-//	}
-
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/OutputResponse.java b/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
index 3fa14ddd..9068c0c1 100644
--- a/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
+++ b/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
@@ -31,7 +31,6 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-// import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.LongSerializationPolicy;
 import com.google.gson.annotations.Expose;
@@ -39,21 +38,13 @@
 import lombok.Data;
 
 @Data
-public class OutputResponse
-{
+public class OutputResponse {
 	private static Logger logger = LoggerFactory.getLogger(OutputResponse.class);
 
 	@Expose
 	private JsonElement response;
 
-	/*
-	 * Response JSON: { "methodName" : "<Method_Name>", "dataObjectType" : "Object_Name", "dataJsonType		:	"object
-	 * or array or primitive or null" "data" : "<json of Object_Name>", "statusCode" : <number>, "statusMessage" :
-	 * "<message>" "statusMessageLong" : "<messageLong> }
-	 */
-
-	public static class Builder
-	{
+	public static class Builder {
 		private String methodName;
 		private String dataObjectType;
 		private String dataJsonType;
@@ -74,8 +65,7 @@ public static class Builder
 		public static final int MANDATORY_PARAMS_MISSING = 5008;
 		public static final int ILLEGAL_ACTION = 5009;
 
-		public Builder()
-		{
+		public Builder() {
 			this.methodName = "";
 			this.dataObjectType = "";
 			this.dataJsonType = "";
@@ -85,149 +75,102 @@ public Builder()
 			this.statusMessageLong = "";
 		}
 
-		public Builder setMethodName(String str)
-		{
+		public Builder setMethodName(String str) {
 			methodName = str;
 			return this;
 		}
 
-		public Builder setDataObjectType(String str)
-		{
+		public Builder setDataObjectType(String str) {
 			dataObjectType = str;
 			return this;
 		}
 
-		public Builder setDataJsonType(String str)
-		{
+		public Builder setDataJsonType(String str) {
 			dataJsonType = str;
 			return this;
 		}
 
-		public Builder setData(String str) throws JsonParseException, JsonSyntaxException
-		{
-			// JsonElement element = new JsonParser().parse(str);
+		public Builder setData(String str) throws JsonParseException, JsonSyntaxException {
 			data = str;
 			return this;
 		}
 
-		public Builder setStatusCode(Integer code)
-		{
+		public Builder setStatusCode(Integer code) {
 			statusCode = code;
 			return this;
 		}
 
-		public Builder setStatusMessage(String str)
-		{
+		public Builder setStatusMessage(String str) {
 			statusMessage = str;
 			return this;
 		}
 
-		public Builder setStatusMessageLong(String str)
-		{
+		public Builder setStatusMessageLong(String str) {
 			statusMessageLong = str;
 			return this;
 		}
 
-		public Builder setErrorMessage(Throwable thrown)
-		{
+		public Builder setErrorMessage(Throwable thrown) {
 
 			Date currDate = Calendar.getInstance().getTime();
 			logger.info("error happened due to " + thrown.getClass().getSimpleName() + " at " + currDate.toString());
-			switch (thrown.getClass().getSimpleName())
-			{
-				case "MissingMandatoryFieldsException":
-					statusCode = MANDATORY_PARAMS_MISSING;
-					statusMessage = "Missing Mandatory Parameters.";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "IEMRException":
-					statusCode = USERID_FAILURE;
-					statusMessage = "User login failed";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "JSONException":
-					statusCode = OBJECT_FAILURE;
-					statusMessage = "Invalid object conversion";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "IllegalActionException":
-					statusCode = ILLEGAL_ACTION;
-					statusMessage = "Illegal Action performed. Please contact your adminstrator.";
-					statusMessageLong = thrown.getMessage();
-					break;
-
-				case "SQLException":
-				case "ParseException":
-				case "NullPointerException":
-				case "SQLGrammarException":
-				case "ArrayIndexOutOfBoundsException":
-				case "ConstraintViolationException":
-					this.statusCode = CODE_EXCEPTION;
-					statusMessage = "Failed with critical errors at " + currDate.toString()
-							+ ".Please try after some time. " + "If error is still seen, contact your administrator.";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "IOException":
-				case "ConnectException":
-				case "ConnectIOException":
-					this.statusCode = ENVIRONMENT_EXCEPTION;
-					statusMessage = "Failed with connection issues at " + currDate.toString()
-							+ "Please try after some time. " + "If error is still seen,  contact your administrator.";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "JDBCException":
-					this.statusCode = ENVIRONMENT_EXCEPTION;
-					statusMessage = "Failed with DB connection issues at " + currDate.toString()
-							+ ". Please try after some time. " + "If error is still seen,  contact your administrator.";
-					statusMessageLong = thrown.getMessage();
-					break;
-				default:
-					statusCode = GENERIC_FAILURE;
-					statusMessage = "Failed with generic exception";
-					statusMessageLong = thrown.getMessage();
-					break;
+			switch (thrown.getClass().getSimpleName()) {
+			case "MissingMandatoryFieldsException":
+				statusCode = MANDATORY_PARAMS_MISSING;
+				statusMessage = "Missing Mandatory Parameters.";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "IEMRException":
+				statusCode = USERID_FAILURE;
+				statusMessage = "User login failed";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "JSONException":
+				statusCode = OBJECT_FAILURE;
+				statusMessage = "Invalid object conversion";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "IllegalActionException":
+				statusCode = ILLEGAL_ACTION;
+				statusMessage = "Illegal Action performed. Please contact your adminstrator.";
+				statusMessageLong = thrown.getMessage();
+				break;
+
+			case "SQLException":
+			case "ParseException":
+			case "NullPointerException":
+			case "SQLGrammarException":
+			case "ArrayIndexOutOfBoundsException":
+			case "ConstraintViolationException":
+				this.statusCode = CODE_EXCEPTION;
+				statusMessage = "Failed with critical errors at " + currDate.toString()
+						+ ".Please try after some time. " + "If error is still seen, contact your administrator.";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "IOException":
+			case "ConnectException":
+			case "ConnectIOException":
+				this.statusCode = ENVIRONMENT_EXCEPTION;
+				statusMessage = "Failed with connection issues at " + currDate.toString()
+						+ "Please try after some time. " + "If error is still seen,  contact your administrator.";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "JDBCException":
+				this.statusCode = ENVIRONMENT_EXCEPTION;
+				statusMessage = "Failed with DB connection issues at " + currDate.toString()
+						+ ". Please try after some time. " + "If error is still seen,  contact your administrator.";
+				statusMessageLong = thrown.getMessage();
+				break;
+			default:
+				statusCode = GENERIC_FAILURE;
+				statusMessage = "Failed with generic exception";
+				statusMessageLong = thrown.getMessage();
+				break;
 			}
 			return this;
 		}
 
-		// private JsonElement parser(String str) throws JsonParseException, JsonSyntaxException {
-		// JsonElement element = new JsonParser().parse(str);
-		// return element;
-		// }
-		//
-		// private JsonObject createJsonObject(String name, Object value) throws JsonParseException, JsonSyntaxException
-		// {
-		// JsonObject element = new JsonObject();
-		// if(value instanceof Boolean) {
-		// element.addProperty(name, (Boolean)value);
-		// } else if(value instanceof Character) {
-		// element.addProperty(name, (Character)value);
-		// } else if(value instanceof Number) {
-		// element.addProperty(name, (Number)value);
-		// } else if(value instanceof String) {
-		// element.addProperty(name, (String)value);
-		// } else if(value instanceof JsonElement) {
-		// element.add(name, (JsonElement)value);
-		// }
-		//
-		// return element;
-		// }
-
-		/**
-		 * To Do for later
-		 * 
-		 * @return
-		 */
-		// // SUNIL TODO: Add this when needed!
-		// private JsonElement createJsonArray(List<Object> list, Type type) {
-		// Type typeOfSrc = new TypeToken<List<FeedbackDTOOutbound>>(){private static final long serialVersionUID =
-		// 1L;}.getType();
-		// JsonElement element = new JsonArray();
-		// return element;
-		// }
-
-		public OutputResponse build()
-		{
+		public OutputResponse build() {
 			OutputResponse response = new OutputResponse();
 			JsonObject elements = new JsonObject();
 			elements.addProperty("methodName", methodName);
@@ -244,14 +187,12 @@ public OutputResponse build()
 		}
 	}
 
-	protected OutputResponse()
-	{
+	protected OutputResponse() {
 
 	}
 
 	@Override
-	public String toString()
-	{
+	public String toString() {
 		GsonBuilder builder = new GsonBuilder();
 		builder.excludeFieldsWithoutExposeAnnotation();
 		builder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
diff --git a/src/main/java/com/iemr/common/identity/utils/Utilities.java b/src/main/java/com/iemr/common/identity/utils/Utilities.java
index 70551dc4..f4186731 100644
--- a/src/main/java/com/iemr/common/identity/utils/Utilities.java
+++ b/src/main/java/com/iemr/common/identity/utils/Utilities.java
@@ -23,17 +23,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iemr.common.identity.controller.IdentityController;
 
 public class Utilities {
-	//private static final Logger logger = LoggerFactory.getLogger(Utilities.class);
-	
 	/**
 	 * Gets the json as string.
 	 *
@@ -41,6 +35,7 @@ public class Utilities {
 	 * @return the json as string
 	 */
 	private Logger logger = LoggerFactory.getLogger(IdentityController.class);
+
 	public String getJsonAsString(Object obj) {
 		ObjectMapper mapper = new ObjectMapper();
 		StringBuilder sb = new StringBuilder();
@@ -49,7 +44,7 @@ public String getJsonAsString(Object obj) {
 		} catch (JsonProcessingException e) {
 			logger.error(e.getMessage());
 		}
-		
+
 		return sb.toString();
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java b/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
index 468186d8..0a3628d5 100644
--- a/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
+++ b/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
@@ -56,14 +56,9 @@ private static void initalizeProperties() {
 		if (properties == null) {
 			properties = new Properties();
 
-			// FileInputStream fis;
 			try {
-				// this.getClass().getResourceAsStream(
-
 				InputStream fis = ConfigProperties.class.getResourceAsStream("/application.properties");
 				properties.load(fis);
-				// properties.
-				// fis.close();
 			} catch (IOException e) {
 				logger.error("Loading of config file failed with error " + e.getLocalizedMessage(), e);
 			}
@@ -122,7 +117,6 @@ public static String getPropertyByName(String propertyName) {
 			if (properties == null) {
 				initalizeProperties();
 			}
-			// result = environment.getProperty(propertyName);
 			result = properties.getProperty(propertyName).trim();
 		} catch (Exception e) {
 			logger.error(propertyName + " retrival failed.", e);
diff --git a/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java b/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
index d2a30279..e6d41d8a 100644
--- a/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
@@ -43,9 +43,6 @@ public void sendEmail(String jsonObject, String template) {
 		String subject = requestObj.getString("subject");
 		String message = requestObj.getString("message");
 
-		// TODO
-		// JSONObject templateObj = new JSONObject(template);
-
 		mailMessage.setTo(to);
 		mailMessage.setFrom(from);
 		mailMessage.setSubject(subject);
@@ -72,31 +69,5 @@ public void sendEmail(String jsonObject) {
 
 	@Override
 	public void sendEmailWithAttachment(String jsonObject, String template) {
-		// TODO Auto-generated method stub
-
 	}
-
-	// public static void main(String[] args)
-	// {
-	// GenericEmailServiceImpl impl = new GenericEmailServiceImpl();
-	// JSONObject test = new JSONObject();
-	// test.put("to", "vinay.chidambara@wipro.com, vinay.sompur@gmail.com");
-	// test.put("from", "vinay.sompur@gmail.com");
-	// test.put("subject", "Test email event");
-	// test.put("message", "Testing email for demo");
-	// impl.sendEmail(test.toString());
-	// }
-
-	// public static void main(String[] args) throws Exception
-	// {
-	// GenericEmailServiceImpl impl = new GenericEmailServiceImpl();
-	// JSONObject test = new JSONObject();
-	// test.put("to", "vinay.chidambara@wipro.com, vinay.sompur@gmail.com");
-	// test.put("from", "vinay.sompur@gmail.com");
-	// test.put("subject", "Test email event");
-	// test.put("message", "Testing email for demo");
-	// SpringApplication.run(GenericEmailServiceImpl.class, args);
-	// impl.sendEmail(test.toString());
-	// }
-
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
index 1021d8dd..40ff0a55 100644
--- a/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
+++ b/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
@@ -84,7 +84,6 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 					status = false;
 					break;
 				default:
-					//validator.checkKeyExists(authorization, request.getRemoteAddr());
 					break;
 				}
 			} catch (Exception e) {
diff --git a/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
index 5e349dfd..ad5ed11f 100644
--- a/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
+++ b/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
@@ -62,30 +62,15 @@ public HttpUtils() {
 			headers.add("Content-Type", "application/json");
 		}
 	}
-	private Logger logger = LoggerFactory.getLogger(IdentityController.class);
-	// public HttpUtils() {
-	// if (rest == null) {
-	// rest = new RestTemplate();
-	// headers = new HttpHeaders();
-	// headers.add("Content-Type", "application/json");
-	// }
-	// }
 
-	// @Bean
-	// public HttpUtils httpUtils() {
-	// return new HttpUtils();
-	// }
+	private Logger logger = LoggerFactory.getLogger(IdentityController.class);
 
 	public String get(String uri) {
 		String body;
 		HttpEntity<String> requestEntity = new HttpEntity<String>("", headers);
 		ResponseEntity<String> responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class);
 		setStatus(responseEntity.getStatusCode());
-		// if (status == HttpStatus.OK){
 		body = responseEntity.getBody();
-		// }else{
-		// responseEntity
-		// }
 		return body;
 	}
 
@@ -122,7 +107,6 @@ public String post(String uri, String data, HashMap<String, Object> header) {
 		if (header.containsKey(headers.AUTHORIZATION)) {
 			headers.add(headers.AUTHORIZATION, header.get(headers.AUTHORIZATION).toString());
 		}
-		// headers.add("Content-Type", MediaType.APPLICATION_JSON);
 		ResponseEntity<String> responseEntity = new ResponseEntity(HttpStatus.BAD_REQUEST);
 		HttpEntity<String> requestEntity;
 		requestEntity = new HttpEntity<String>(data, headers);
@@ -158,16 +142,14 @@ public String uploadFile(String uri, String data, HashMap<String, Object> header
 				multiPart.field("docPath", data);
 				headers.add("Content-Type", MediaType.APPLICATION_JSON);
 				requestEntity = new HttpEntity<FormDataMultiPart>(multiPart, headers);// new
-																						// HttpEntity<String>(multiPart,
-																						// headers);
 				responseEntity = rest.exchange(uri, HttpMethod.POST, requestEntity, String.class);
 			} catch (FileNotFoundException e) {
 				logger.error(e.getMessage());
 			} finally {
-				if(multiPart!=null)
-				multiPart.close();
-				if(is!=null)
-				is.close();
+				if (multiPart != null)
+					multiPart.close();
+				if (is != null)
+					is.close();
 			}
 		} else {
 			HttpEntity<String> requestEntity;
diff --git a/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java b/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
index 74d82471..4c8db37d 100644
--- a/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
+++ b/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
@@ -43,22 +43,11 @@ public class InputMapper {
 	static GsonBuilder builder;
 	ExclusionStrategy strategy;
 	Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
-	// @Autowired
-	// ConfigProperties configProperties;
-
-	// @Autowired
-	// SessionObject sessionObject;
-
-	// public void setSessionObject(SessionObject sessionObject)
-	// {
-	// this.sessionObject = sessionObject;
-	// }
 
 	public InputMapper() {
 		if (builder == null) {
 			builder = new GsonBuilder();
 			builder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
-			// builder.addDeserializationExclusionStrategy(strategy)
 		}
 	}
 
@@ -83,35 +72,4 @@ public <T> T fromJson(JsonElement json, Class<T> classOfT) throws IEMRException
 		return builder.create().fromJson(json, classOfT);
 	}
 
-	/**
-	 * @param json
-	 * @throws IEMRException This function will check for the following things and
-	 *                       throws login exception if any one fails 1. Get the
-	 *                       session details from the redis 2. IP address in request
-	 *                       and the logged in IP address should be same.
-	 */
-	// private void valildate(String json) throws IEMRException
-	// {
-	// Object obj = new JsonParser().parse(json);
-	// try
-	// {
-	// if (obj instanceof JsonObject)
-	// {
-	// JSONObject reqObj = new JSONObject(json);
-	// String key = reqObj.getString("key");
-	// // Validator.checkKeyExists(key);
-	// } else if (obj instanceof JsonObject)
-	// {
-	// // to do
-	// } else
-	// {
-	// // throw new IEMRException("Invalid login key");
-	// logger.info("Invalid login key");
-	// }
-	// } catch (Exception e)
-	// {
-	// // throw new IEMRException("Invalid login key");
-	// logger.info("Invalid login key");
-	// }
-	// }
 }
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java b/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java
deleted file mode 100644
index dc6a19f7..00000000
--- a/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.utils.redis;
-
-public class RedisConnection {
-	// // static ConfigProperties configProperties;
-	// // @Autowired(required = true)
-	// // @Required
-	// // public void setConfigProperties(ConfigProperties configProperties)
-	// // {
-	// // if (configProperties == null) {
-	// // configProperties = new ConfigProperties();
-	// // }
-	// // this.configProperties = configProperties;
-	// // }
-	// static JedisPool jedisPool = null;
-	// static int paasConnectionCounter = 0;
-	// static int redisPort;// = new ConfigProperties().getRedisPort();
-	// static String redisURL;// = new ConfigProperties().getRedisUrl();
-	//
-	// private void intializeRedisPool() throws NumberFormatException {
-	// // if (configProperties == null) {
-	// // configProperties = new ConfigProperties();
-	// // }
-	// redisPort = ConfigProperties.getRedisPort();
-	// redisURL = ConfigProperties.getRedisUrl();
-	// JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
-	// jedisPoolConfig.setMaxIdle(1);
-	// jedisPoolConfig.setMinIdle(1);
-	// jedisPoolConfig.setMaxTotal(500);
-	//
-	// // jedisPool = new JedisPool(jedisPoolConfig, "localhost", 6379);
-	// jedisPool = new JedisPool(jedisPoolConfig, redisURL, redisPort);
-	// }
-	//
-	// public Jedis getRedisConnection() throws RedisSessionException {
-	// Jedis jedis = null;
-	// try {
-	// if (jedisPool == null) {
-	// intializeRedisPool();
-	// }
-	// jedis = jedisPool.getResource();
-	// } catch (JedisConnectionException | JedisDataException e) {
-	// throw new RedisSessionException("Unable to connect to Redis server", e);
-	// } catch (Exception e) {
-	// if ((e instanceof SocketException)) {
-	// throw new RedisSessionException("Not a proper config format", e);
-	// }
-	// throw new RedisSessionException("Redis exception occured on fetch", e);
-	// }
-	// return jedis;
-	// }
-	//
-	// public void closeRedisConnection(Jedis jedis) throws
-	// JedisConnectionException, JedisDataException {
-	// if ((jedisPool != null) && (jedis != null)) {
-	// jedisPool.returnResource(jedis);
-	// jedis = null;
-	// }
-	// }
-}
diff --git a/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java b/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
index 291756c6..04a3f1d8 100644
--- a/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
+++ b/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
@@ -32,56 +32,26 @@
 
 @Component
 public class RedisStorage {
-	// @Autowired
-	// private RedisConnection redisConnection;// = new RedisConnection();
 	@Autowired
 	private LettuceConnectionFactory connection;
 
 	Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
-	// @Autowired(required = true)
-	// @Required
-	// public void setRedisConnection(RedisConnection redisConnection)
-	// {
-	// if (redisConnection == null)
-	// {
-	// redisConnection = new RedisConnection();
-	// }
-	// this.redisConnection = redisConnection;
-	// }
-
-	// public RedisStorage()
-	// {
-	// redisConnection = new RedisConnection();
-	// }
-
 	public String setObject(String key, String value, int expirationTime) throws RedisSessionException {
 		RedisConnection redCon = connection.getConnection();
-		// redCon.get(key.getBytes());
-		// redCon.expire(key.getBytes(), expirationTime);
-		// redCon.set(key.getBytes(), value.getBytes(),
-		// Expiration.seconds(expirationTime), SetOption.UPSERT);
 		byte[] sessionData = redCon.get(key.getBytes());
 		String userRespFromRedis = null;
 		if (sessionData != null) {
 			userRespFromRedis = new String(redCon.get(key.getBytes()));
 		}
-		// Jedis jedis = redisConnection.getRedisConnection();
-		// userRespFromRedis = jedis.get(key);
 		if ((userRespFromRedis == null) || (userRespFromRedis.isEmpty())) {
 			logger.info("updating session time of redis for " + key);
 			redCon.set(key.getBytes(), value.getBytes(), Expiration.seconds(expirationTime), SetOption.UPSERT);
-			// jedis.expire(key, expirationTime);
 		}
-		// redisConnection.closeRedisConnection(jedis);
 		return key;
 	}
 
 	public String getObject(String key, Boolean extendExpirationTime, int expirationTime) throws RedisSessionException {
-		// String userRespFromRedis = null;
-		// Jedis jedis = redisConnection.getRedisConnection();
-		// userRespFromRedis = jedis.get(key);
-
 		RedisConnection redCon = connection.getConnection();
 		byte[] sessionData = redCon.get(key.getBytes());
 		String userRespFromRedis = null;
@@ -89,56 +59,36 @@ public String getObject(String key, Boolean extendExpirationTime, int expiration
 			userRespFromRedis = new String(redCon.get(key.getBytes()));
 		}
 		if ((userRespFromRedis != null) && (userRespFromRedis.trim().length() != 0)) {
-			// if (extendExpirationTime.booleanValue())
-			// {
-			// jedis.expire(key, expirationTime);
-			// }
-
 			logger.info("updating session time of redis for " + key);
 			redCon.expire(key.getBytes(), expirationTime);
 		} else {
 			throw new RedisSessionException("Unable to fetch session object from Redis server");
 		}
-		// redisConnection.closeRedisConnection(jedis);
 		return userRespFromRedis;
 	}
 
 	public Long deleteObject(String key) throws RedisSessionException {
 		RedisConnection redCon = connection.getConnection();
 		Long userRespFromRedis = Long.valueOf(0L);
-		// Jedis jedis = redisConnection.getRedisConnection();
-		// userRespFromRedis = jedis.del(key);
 		userRespFromRedis = redCon.del(key.getBytes());
-		// redisConnection.closeRedisConnection(jedis);
 		return userRespFromRedis;
 	}
 
 	public String updateObject(String key, String value, Boolean extendExpirationTime, int expirationTime)
 			throws RedisSessionException {
 		RedisConnection redCon = connection.getConnection();
-		// String userRespFromRedis = null;
-		// Jedis jedis = redisConnection.getRedisConnection();
-
 		byte[] sessionData = redCon.get(key.getBytes());
 		String userRespFromRedis = null;
 		if (sessionData != null) {
 			userRespFromRedis = new String(redCon.get(key.getBytes()));
 		}
-		// userRespFromRedis = jedis.get(key);
 		if ((userRespFromRedis != null) && (userRespFromRedis.trim().length() != 0)) {
-			// jedis.set(key, value);
-			// if (extendExpirationTime.booleanValue())
-			// {
-			// jedis.expire(key, expirationTime);
-			// }
-
 			logger.info("updating session time of redis for " + key);
 			redCon.set(key.getBytes(), value.getBytes(), Expiration.seconds(expirationTime), SetOption.UPSERT);
 		} else {
 			throw new RedisSessionException("Unable to fetch session object from Redis server");
 		}
 
-		// redisConnection.closeRedisConnection(jedis);
 		return key;
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java b/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
index e5ec994e..65d8cc63 100644
--- a/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
+++ b/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
@@ -35,8 +35,7 @@
 import com.google.gson.LongSerializationPolicy;
 import com.google.gson.annotations.Expose;
 
-public class OutputResponse
-{
+public class OutputResponse {
 	@Expose
 	private Object data;
 	Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
@@ -59,26 +58,19 @@ public class OutputResponse
 	private static final String RESPONSE = "{\"response\":\"$$STRING\"}";
 	private static final String RESPONSE_VALUE = "$$STRING";
 
-	public void setResponse(String message)
-	{
+	public void setResponse(String message) {
 		JsonArray ja = null;
-		try
-		{
+		try {
 			Object obj = new JsonParser().parse(message);
-			if ((obj instanceof JsonArray))
-			{
+			if ((obj instanceof JsonArray)) {
 				ja = (JsonArray) obj;
 				this.data = ja;
-			} else if ((obj instanceof JsonObject))
-			{
+			} else if ((obj instanceof JsonObject)) {
 				this.data = obj;
-			} else
-			{
+			} else {
 				this.data = new JsonParser().parse(RESPONSE.replace(RESPONSE_VALUE, message));
-				// this.data = message;
 			}
-		} catch (Exception exe)
-		{
+		} catch (Exception exe) {
 			this.data = message;
 			this.data = new JsonParser().parse(RESPONSE.replace(RESPONSE_VALUE, message));
 		}
@@ -88,85 +80,77 @@ public void setResponse(String message)
 
 	}
 
-	public void setError(Throwable thrown)
-	{
+	public void setError(Throwable thrown) {
 		Date currDate = Calendar.getInstance().getTime();
 		logger.info("error happened due to " + thrown.getClass().getSimpleName() + " at " + currDate.toString());
-		switch (thrown.getClass().getSimpleName())
-		{
-			case "IEMRException":
-				this.statusCode = USERID_FAILURE;
-				status = "User login failed";
-				errorMessage = thrown.getMessage();
-				break;
-			case "JSONException":
-				this.statusCode = OBJECT_FAILURE;
-				status = "Invalid object conversion";
-				errorMessage = "Invalid object conversion";
-				break;
-			case "SQLException":
-			case "ParseException":
-			case "NullPointerException":
-			case "SQLGrammarException":
-			case "ArrayIndexOutOfBoundsException":
-			case "ConstraintViolationException":
-				this.statusCode = CODE_EXCEPTION;
-				status = "Failed with critical errors at " + currDate.toString() + ".Please try after some time. "
-						+ "If error is still seen, contact your administrator.";
-				errorMessage = thrown.getMessage();
-				break;
-			case "IOException":
-			case "ConnectException":
-			case "ConnectIOException":
-				this.statusCode = ENVIRONMENT_EXCEPTION;
-				status = "Failed with connection issues at " + currDate.toString() + "Please try after some time. "
-						+ "If error is still seen,  contact your administrator.";
-				errorMessage = thrown.getMessage();
-				break;
-			case "JDBCException":
-				this.statusCode = ENVIRONMENT_EXCEPTION;
-				status = "Failed with DB connection issues at " + currDate.toString() + ". Please try after some time. "
-						+ "If error is still seen,  contact your administrator.";
-				errorMessage = thrown.getMessage();
-				break;
-			default:
-				this.statusCode = GENERIC_FAILURE;
-				status = "Failed with " + thrown.getMessage() + " at " + currDate.toString()
-						+ ".Please try after some time. If error is still seen, contact your administrator.";
-				errorMessage = thrown.getMessage();
-				break;
+		switch (thrown.getClass().getSimpleName()) {
+		case "IEMRException":
+			this.statusCode = USERID_FAILURE;
+			status = "User login failed";
+			errorMessage = thrown.getMessage();
+			break;
+		case "JSONException":
+			this.statusCode = OBJECT_FAILURE;
+			status = "Invalid object conversion";
+			errorMessage = "Invalid object conversion";
+			break;
+		case "SQLException":
+		case "ParseException":
+		case "NullPointerException":
+		case "SQLGrammarException":
+		case "ArrayIndexOutOfBoundsException":
+		case "ConstraintViolationException":
+			this.statusCode = CODE_EXCEPTION;
+			status = "Failed with critical errors at " + currDate.toString() + ".Please try after some time. "
+					+ "If error is still seen, contact your administrator.";
+			errorMessage = thrown.getMessage();
+			break;
+		case "IOException":
+		case "ConnectException":
+		case "ConnectIOException":
+			this.statusCode = ENVIRONMENT_EXCEPTION;
+			status = "Failed with connection issues at " + currDate.toString() + "Please try after some time. "
+					+ "If error is still seen,  contact your administrator.";
+			errorMessage = thrown.getMessage();
+			break;
+		case "JDBCException":
+			this.statusCode = ENVIRONMENT_EXCEPTION;
+			status = "Failed with DB connection issues at " + currDate.toString() + ". Please try after some time. "
+					+ "If error is still seen,  contact your administrator.";
+			errorMessage = thrown.getMessage();
+			break;
+		default:
+			this.statusCode = GENERIC_FAILURE;
+			status = "Failed with " + thrown.getMessage() + " at " + currDate.toString()
+					+ ".Please try after some time. If error is still seen, contact your administrator.";
+			errorMessage = thrown.getMessage();
+			break;
 		}
 		logger.error("Failure happend with " + thrown.getMessage() + "at " + currDate.toString(), thrown);
 	}
 
-	public void setError(int errorCode, String message, String status)
-	{
+	public void setError(int errorCode, String message, String status) {
 		this.errorMessage = message;
 		this.status = status;
 		this.statusCode = errorCode;
 	}
 
-	public void setError(int errorCode, String message)
-	{
+	public void setError(int errorCode, String message) {
 		setError(errorCode, message, message);
 	}
 
-	public boolean isSuccess()
-	{
+	public boolean isSuccess() {
 		return (this.statusCode == SUCCESS);
 	}
 
 	/**
 	 * @return the data
 	 */
-	public String getData()
-	{
+	public String getData() {
 		JSONObject obj = new JSONObject(toString());
-		if (obj.has("data"))
-		{
+		if (obj.has("data")) {
 			return obj.get("data").toString();
-		} else
-		{
+		} else {
 			return null;
 		}
 	}
@@ -174,55 +158,36 @@ public String getData()
 	/**
 	 * @return the statusCode
 	 */
-	public int getStatusCode()
-	{
+	public int getStatusCode() {
 		return statusCode;
 	}
 
 	/**
 	 * @return the errorMessage
 	 */
-	public String getErrorMessage()
-	{
+	public String getErrorMessage() {
 		return errorMessage;
 	}
 
 	/**
 	 * @return the status
 	 */
-	public String getStatus()
-	{
+	public String getStatus() {
 		return status;
 	}
 
 	@Override
-	public String toString()
-	{
-		// return new Gson().toJson(this);
-		// Gson gson = OutputMapper.gson();
+	public String toString() {
 		GsonBuilder builder = new GsonBuilder();
 		builder.excludeFieldsWithoutExposeAnnotation().setLongSerializationPolicy(LongSerializationPolicy.STRING);
-		// builder.disableInnerClassSerialization();
 		return builder.create().toJson(this);
-		// JSONObject response = new JSONObject();
-		// response.put("data", data);
-		// response.put("statusCode", statusCode);
-		// response.put("status", status);
-		// response.put("errorMessage", errorMessage);
-		// return response.toString();
 	}
 
-	public String toStringWithSerialization()
-	{
+	public String toStringWithSerialization() {
 		GsonBuilder builder = new GsonBuilder();
 		builder.excludeFieldsWithoutExposeAnnotation();
 		builder.serializeNulls().setLongSerializationPolicy(LongSerializationPolicy.STRING);
 		return builder.create().toJson(this);
 	}
 
-	// public static void main(String[] args) {
-	// OutputResponse resp = new OutputResponse();
-	// resp.setResponse("{testing: [test]}");
-	// System.out.println(resp.toString());
-	// }
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java b/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
index 6e1d75a5..af0cb84d 100644
--- a/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
+++ b/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
@@ -33,50 +33,23 @@
 
 @Component
 public class SessionObject {
-
-	// //
-	// @Autowired(required = true)
-	// // @Required
-	// public void setConfigProperties(ConfigProperties configProperties)
-	// {
-	// // if (configProperties == null)
-	// // {
-	// // configProperties = new ConfigProperties();
-	// // }
-	// this.configProperties = configProperties;
-	// }
-
 	private RedisStorage objectStore;
 
-	@Autowired
-	// @Required
 	public void setObjectStore(RedisStorage objectStore) {
-		// if (objectStore == null)
-		// {
-		// objectStore = new RedisStorage();
-		// }
 		this.objectStore = objectStore;
 	}
 
 	public SessionObject() {
-		// configProperties = new ConfigProperties();
-		// objectStore = new RedisStorage();
-		// if (objectStore == null)
-		// {
-		// objectStore = new RedisStorage();
-		// }
 		extendExpirationTime = ConfigProperties.getExtendExpiryTime();
 		sessionExpiryTime = ConfigProperties.getSessionExpiryTime();
 	}
 
-	private boolean extendExpirationTime;// =
-											// configProperties.getExtendExpiryTime();
-	private int sessionExpiryTime;// = configProperties.getSessionExpiryTime();
+	private boolean extendExpirationTime;
+	private int sessionExpiryTime;
 
 	public String getSessionObject(String key) throws RedisSessionException {
 		Boolean extendExpirationTime = ConfigProperties.getExtendExpiryTime();
 		Integer sessionExpiryTime = ConfigProperties.getSessionExpiryTime();
-		// RedisStorage objectStore = new RedisStorage();
 		return objectStore.getObject(key, extendExpirationTime, sessionExpiryTime);
 	}
 
@@ -90,9 +63,9 @@ public String updateSessionObject(String key, String value) throws RedisSessionE
 		Boolean extendExpirationTime = ConfigProperties.getExtendExpiryTime();
 		Integer sessionExpiryTime = ConfigProperties.getSessionExpiryTime();
 		updateConcurrentSessionObject(key, value, extendExpirationTime, sessionExpiryTime);
-		// RedisStorage objectStore = new RedisStorage();
 		return objectStore.updateObject(key, value, extendExpirationTime, sessionExpiryTime);
 	}
+
 	private void updateConcurrentSessionObject(String key, String value, Boolean extendExpirationTime,
 			Integer sessionExpiryTime) {
 		try {
@@ -108,31 +81,9 @@ private void updateConcurrentSessionObject(String key, String value, Boolean ext
 
 		}
 	}
+
 	public void deleteSessionObject(String key) throws RedisSessionException {
-		// RedisStorage objectStore = new RedisStorage();
 		System.out.println(objectStore.deleteObject(key));
 	}
 
-	// public static void test(String[] args)
-	// {
-	// SessionObject obj = new SessionObject();
-	// JSONObject testdata = new JSONObject();
-	// try
-	// {
-	// System.out.println("Set Object " + obj.getSessionObject("test1234"));
-	// System.out.println("Set Object " + obj.setSessionObject("test1234",
-	// testdata.toString()));
-	// System.out.println("Set Object " + obj.getSessionObject("test1234"));
-	// testdata.put("userName", "test");
-	// // testdata.put("validity", obj.sessionExpiryTime);
-	// System.out.println("Set Object " + obj.updateSessionObject("test1234",
-	// testdata.toString()));
-	// System.out.println("Set Object " + obj.getSessionObject("test1234"));
-	// obj.deleteSessionObject("test1234");
-	// System.out.println("Set Object " + obj.getSessionObject("test1234"));
-	// } catch (RedisSessionException | JSONException e)
-	// {
-	// e.printStackTrace();
-	// }
-	// }
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/validator/Validator.java b/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
index 35d7aaec..595ba715 100644
--- a/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
+++ b/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
@@ -34,58 +34,38 @@
 import com.iemr.common.identity.utils.redis.RedisSessionException;
 import com.iemr.common.identity.utils.sessionobject.SessionObject;
 
-
-
 @Service
-public class Validator
-{
-	// private static SessionObject session;
-
+public class Validator {
 	private SessionObject session;
 
 	private static Boolean enableIPValidation = false;
 
 	@Autowired(required = true)
 	@Required
-	public void setSessionObject(SessionObject sessionObject)
-	{
+	public void setSessionObject(SessionObject sessionObject) {
 		this.session = sessionObject;
 	}
 
-	// private static void setSessionObject() {
-	// if (session == null) {
-	// session = new SessionObject();
-	// }
-	// }
-
-	public Validator()
-	{
-		if (!enableIPValidation)
-		{
+	public Validator() {
+		if (!enableIPValidation) {
 			enableIPValidation = ConfigProperties.getBoolean("enableIPValidation");
 		}
 	}
 
 	private Logger logger = LoggerFactory.getLogger(Validator.class);
 
-	public JSONObject updateCacheObj(JSONObject responseObj, String key, String ipKey)
-	{
-		try
-		{
+	public JSONObject updateCacheObj(JSONObject responseObj, String key, String ipKey) {
+		try {
 			Boolean loggedFromDifferentIP = false;
 			String loginKey = key;
 			String status = "login failed";
-			try
-			{
+			try {
 				responseObj.put("sessionStatus", "session creation failed");
 				String sessionData = session.getSessionObject(key);
-				if (enableIPValidation)
-				{
-					if (sessionData != null && sessionData.trim().length() > 0)
-					{
+				if (enableIPValidation) {
+					if (sessionData != null && sessionData.trim().length() > 0) {
 						JSONObject sessionObj = new JSONObject(sessionData);
-						if (!sessionObj.getString("loginIPAddress").equals(responseObj.getString("loginIPAddress")))
-						{
+						if (!sessionObj.getString("loginIPAddress").equals(responseObj.getString("loginIPAddress"))) {
 							logger.error("Logged in IP : " + sessionObj.getString("loginIPAddress") + "\tRequest IP : "
 									+ responseObj.getString("loginIPAddress"));
 							loggedFromDifferentIP = true;
@@ -93,49 +73,39 @@ public JSONObject updateCacheObj(JSONObject responseObj, String key, String ipKe
 						}
 					}
 				}
-			} catch (RedisSessionException e)
-			{
+			} catch (RedisSessionException e) {
 				logger.error("Session validation failed with exception", e);
 			}
-			if (!loggedFromDifferentIP)
-			{
+			if (!loggedFromDifferentIP) {
 				status = "login success";
 				session.setSessionObject(key, responseObj.toString());
-			} else
-			{
+			} else {
 				responseObj = new JSONObject();
 			}
 			responseObj.put("key", loginKey);
 			responseObj.put("sessionStatus", status);
-		} catch (RedisSessionException | JSONException e)
-		{
+		} catch (RedisSessionException | JSONException e) {
 			logger.error("Session validation failed with exception", e);
 		}
 		return responseObj;
 	}
 
-	public String getSessionObject(String key) throws RedisSessionException
-	{
+	public String getSessionObject(String key) throws RedisSessionException {
 		return session.getSessionObject(key);
 	}
 
-	public void checkKeyExists(String loginKey, String ipAddress) throws IEMRException
-	{
-		try
-		{
+	public void checkKeyExists(String loginKey, String ipAddress) throws IEMRException {
+		try {
 			String sessionString = session.getSessionObject(loginKey);
 			JSONObject sessionObj = new JSONObject(sessionString);
-			if (enableIPValidation)
-			{
-				if (!sessionObj.getString("loginIPAddress").equals(ipAddress))
-				{
+			if (enableIPValidation) {
+				if (!sessionObj.getString("loginIPAddress").equals(ipAddress)) {
 					logger.error(
 							"Logged in IP : " + sessionObj.getString("loginIPAddress") + "\tRequest IP : " + ipAddress);
 					throw new Exception();
-				} 
+				}
 			}
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			throw new IEMRException("Invalid login key or session is expired");
 		}
 	}

From bba7258d07e0c422f472da955f11e89e80b7ba22 Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Wed, 21 Jun 2023 11:22:12 +0530
Subject: [PATCH 11/53] Create sast-and-package-prod.yml (#12)

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml
---
 .github/workflows/sast-and-package-prod.yml | 61 +++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 .github/workflows/sast-and-package-prod.yml

diff --git a/.github/workflows/sast-and-package-prod.yml b/.github/workflows/sast-and-package-prod.yml
new file mode 100644
index 00000000..fb4f1a4e
--- /dev/null
+++ b/.github/workflows/sast-and-package-prod.yml
@@ -0,0 +1,61 @@
+name: Static Code Analysis and Packaging Prod
+on:
+  push:
+    branches: [ "master","develop" ]
+    
+jobs:
+  CodeQL:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+    steps:
+
+    - name: Checkout code 
+      uses: actions/checkout@v2
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: Java    
+
+    - name: Build with Maven
+      run: mvn clean install -Denvironment=prod
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        languages: Java   
+    
+  Packaging:
+    needs: codeql
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Create WAR file 
+      run: mvn -B package --file pom.xml
+
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Identity-API
+        path: target/identity-0.0.1.war  

From 29d3a17239143c898525fc89cd42e8a96b7ae42c Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Wed, 21 Jun 2023 20:25:37 +0530
Subject: [PATCH 12/53] Code smell changes (#13)

---
 .../controller/IdentityController.java        |  8 +--
 ...NCD_TB_HRP_data.java => NcdTbHrpData.java} |  2 +-
 ...anceSearch.java => VBenAdvanceSearch.java} |  4 +-
 .../exception/SearchCriteriaException.java    | 27 ----------
 .../identity/mapper/IdentityEditMapper.java   | 20 ++++----
 .../mapper/IdentityPartialMapper.java         |  4 +-
 .../identity/mapper/IdentitySearchMapper.java |  6 +--
 .../common/identity/repo/BenAddressRepo.java  |  8 +--
 .../common/identity/repo/BenConsentRepo.java  |  2 +-
 .../common/identity/repo/BenContactRepo.java  |  6 +--
 .../common/identity/repo/BenDetailRepo.java   |  8 +--
 .../common/identity/repo/BenMappingRepo.java  |  6 +--
 .../identity/repo/BenMappingRepoCustom.java   |  4 +-
 .../identity/repo/BenMappingRepoImpl.java     | 10 ++--
 .../identity/repo/BenRegIdMappingRepo.java    |  2 +-
 .../identity/repo/BenServiceMappingRepo.java  | 28 +++++------
 .../repo/MBeneficiaryAccountRepo.java         |  2 +-
 .../identity/repo/MBeneficiaryImageRepo.java  |  4 +-
 .../identity/repo/V_BenAdvanceSearchRepo.java |  8 +--
 .../identity/service/IdentityService.java     | 50 +++++++++----------
 .../rmnch/RmnchDataSyncServiceImpl.java       | 22 ++++----
 .../identity/service/IdentityServiceTest.java | 10 ++--
 22 files changed, 107 insertions(+), 134 deletions(-)
 rename src/main/java/com/iemr/common/identity/data/rmnch/{NCD_TB_HRP_data.java => NcdTbHrpData.java} (97%)
 rename src/main/java/com/iemr/common/identity/domain/{V_BenAdvanceSearch.java => VBenAdvanceSearch.java} (98%)
 delete mode 100644 src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 3cd6d75e..3a502b55 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -1005,17 +1005,17 @@ public String getJsonAsString(Object obj) {
 					+ "        \"benIDRequired\": \"Integer\"\r\n" + "       }") @RequestBody String regIDList) {
 		com.iemr.common.identity.utils.response.OutputResponse response = new com.iemr.common.identity.utils.response.OutputResponse();
 		try {
-			BenIdImportDTO[] BenIdImportDTOArr = InputMapper.getInstance().gson().fromJson(regIDList,
+			BenIdImportDTO[] benIdImportDTOArr = InputMapper.getInstance().gson().fromJson(regIDList,
 					BenIdImportDTO[].class);
 
-			List<BenIdImportDTO> BenIdImportDTOList = Arrays.asList(BenIdImportDTOArr);
+			List<BenIdImportDTO> benIdImportDTOList = Arrays.asList(benIdImportDTOArr);
 
-			int i = svc.importBenIdToLocalServer(BenIdImportDTOList);
+			int i = svc.importBenIdToLocalServer(benIdImportDTOList);
 			if (i > 0)
 				response.setResponse(i + " Unique benid imported to local server");
 			else {
 				response.setResponse("Empty or invalid data");
-				logger.error("Empty or invalid data. Data Size is : " + BenIdImportDTOList.size());
+				logger.error("Empty or invalid data. Data Size is : " + benIdImportDTOList.size());
 			}
 		} catch (Exception e) {
 			logger.error("Exception in importing benID to local server : " + e);
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java b/src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
similarity index 97%
rename from src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
rename to src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
index 18ec46da..c86f6048 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
@@ -29,7 +29,7 @@
 import lombok.Data;
 
 @Data
-public class NCD_TB_HRP_data {
+public class NcdTbHrpData {
 
 	@Expose
 	private String confirmed_ncd;
diff --git a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java b/src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
similarity index 98%
rename from src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
rename to src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
index ea615acd..8134468a 100644
--- a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
+++ b/src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
@@ -33,7 +33,7 @@
 
 @Entity
 @Table(name = "v_benadvancesearch")
-public class V_BenAdvanceSearch {
+public class VBenAdvanceSearch {
 
 	@Id
 	@Expose
@@ -141,7 +141,7 @@ public void setHouseHoldID(Long houseHoldID) {
 		this.houseHoldID = houseHoldID;
 	}
 
-	public V_BenAdvanceSearch() {
+	public VBenAdvanceSearch() {
 		super();
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
deleted file mode 100644
index 6fee444f..00000000
--- a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.exception;
-
-public class SearchCriteriaException {
-	
-
-}
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
index 2f08bf4d..c3191420 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
@@ -57,7 +57,7 @@ public interface IdentityEditMapper {
 			@Mapping(source = "dto.eventTypeDate", target = "lastModDate")
 
 	})
-	MBeneficiarymapping IdentityEditDTOToMBeneficiarymapping(IdentityEditDTO dto);
+	MBeneficiarymapping identityEditDTOToMBeneficiarymapping(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "dto.currentAddress.addrLine1", target = "currAddrLine1"),
 			@Mapping(source = "dto.currentAddress.addrLine2", target = "currAddrLine2"),
@@ -141,7 +141,7 @@ public interface IdentityEditMapper {
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiaryaddress IdentityEditDTOToMBeneficiaryaddress(IdentityEditDTO dto);
+	MBeneficiaryaddress identityEditDTOToMBeneficiaryaddress(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "defaultNo", target = "shareAnonymousWithGovt"),
 			@Mapping(source = "defaultNo", target = "shareAnonymousWithMedicalCommunity"),
@@ -188,7 +188,7 @@ MBeneficiaryconsent IdentityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiarycontact IdentityEdiDTOToMBeneficiarycontact(IdentityEditDTO dto);
+	MBeneficiarycontact identityEdiDTOToMBeneficiarycontact(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "dto.areaId", target = "areaId"),
 			@Mapping(source = "dto.beneficiaryRegId", target = "beneficiaryRegID"),
@@ -237,14 +237,14 @@ MBeneficiaryconsent IdentityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiarydetail IdentityEditDTOToMBeneficiarydetail(IdentityEditDTO dto);
+	MBeneficiarydetail identityEditDTOToMBeneficiarydetail(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "benFamilyDTO.isEmergencyContact", target = "isEmergencyContact"),
 			@Mapping(source = "benFamilyDTO.relationshipToSelf", target = "relationshipToSelf"),
 			@Mapping(source = "benFamilyDTO.associatedBenRegId", target = "associatedBenRegId"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
+	MBeneficiaryfamilymapping identityEditDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
 			Timestamp createdDate);
 
 	List<MBeneficiaryfamilymapping> IdentityEditDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
@@ -258,9 +258,9 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "identity.identityFilePath", target = "identityFilePath"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryidentity IdentityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
+	MBeneficiaryidentity identityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
 
-	List<MBeneficiaryidentity> IdentityEditDTOListToMBeneficiaryidentityList(List<Identity> list);
+	List<MBeneficiaryidentity> identityEditDTOListToMBeneficiaryidentityList(List<Identity> list);
 
 	@Mappings({ @Mapping(source = "dto.serviceId", target = "serviceId"),
 			@Mapping(source = "dto.serviceName", target = "serviceName"),
@@ -274,7 +274,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "dto.eventTypeDate", target = "registeredDate"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
 			@Mapping(source = "dto.eventTypeDate", target = "createdDate") })
-	MBeneficiaryservicemapping IdentityEditDTOToMBeneficiaryservicemapping(IdentityEditDTO dto);
+	MBeneficiaryservicemapping identityEditDTOToMBeneficiaryservicemapping(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "beneficiaryDetailsId", target = "beneficiaryDetailsId"),
 			@Mapping(source = "areaId", target = "areaId"),
@@ -302,7 +302,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "sourceOfInfo", target = "sourceOfInfo"),
 			@Mapping(source = "spouseName", target = "spouseName"), @Mapping(source = "status", target = "status"),
 			@Mapping(source = "title", target = "title"), @Mapping(source = "zoneId", target = "zoneId") })
-	BenDetailDTO MBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
+	BenDetailDTO mBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
 
 	@Mappings({ @Mapping(source = "family.benFamilyMapId", target = "benFamilyMapId"),
 			@Mapping(source = "family.associatedBenRegId", target = "associatedBenRegId"),
@@ -313,7 +313,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "family.lastModDate", target = "lastModDate"),
 			@Mapping(source = "family.modifiedBy", target = "modifiedBy"),
 			@Mapping(source = "family.relationshipToSelf", target = "relationshipToSelf") })
-	BenFamilyDTO MBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
+	BenFamilyDTO mBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
 
 	List<BenFamilyDTO> mBeneficiaryfamilymappingListToBenFamilyDTOList(List<MBeneficiaryfamilymapping> families);
 
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
index befc03db..4696ae8f 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
@@ -47,9 +47,9 @@ public interface IdentityPartialMapper
 			@Mapping(target = "beneficiaryAge",
 					expression = "java(MBeneficiarydetail.calculateAge(map.getMBeneficiarydetail().getDob()))"), })
 
-	BeneficiariesPartialDTO MBeneficiarymappingToBeneficiariesPartialDTO(MBeneficiarymapping map);
+	BeneficiariesPartialDTO mBeneficiarymappingToBeneficiariesPartialDTO(MBeneficiarymapping map);
 
 	@Mappings({ @Mapping(target = "benId", source = "map.MBeneficiaryregidmapping.beneficiaryID"),
 			@Mapping(target = "benRegId", source = "map.MBeneficiaryregidmapping.benRegId") })
-	BeneficiaryCreateResp MBeneficiarymappingToBeneficiaryCreateResp(MBeneficiarymapping map);
+	BeneficiaryCreateResp mBeneficiarymappingToBeneficiaryCreateResp(MBeneficiarymapping map);
 }
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
index e8962e6e..03bd85b4 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
@@ -50,7 +50,7 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.spouseName", target = "spouseName")
 
 			})
-	MBeneficiarydetail IdentitySearchDTOMBeneficiarydetail(IdentitySearchDTO dto);
+	MBeneficiarydetail identitySearchDTOMBeneficiarydetail(IdentitySearchDTO dto);
 
 	@Mappings({
 
@@ -60,7 +60,7 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.currentAddress.district", target = "currDistrict"),
 			@Mapping(source = "dto.pinCode", target = "currPinCode") 
 			})
-	MBeneficiaryaddress IdentitySearchDTOToMBeneficiaryaddress(IdentitySearchDTO dto);
+	MBeneficiaryaddress identitySearchDTOToMBeneficiaryaddress(IdentitySearchDTO dto);
 
 	@Mappings({
 
@@ -71,5 +71,5 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.contactNumber", target = "phoneNum4"),
 			@Mapping(source = "dto.contactNumber", target = "phoneNum5")
 			})
-	MBeneficiarycontact IdentitySearchDTOToMBeneficiarycontact(IdentitySearchDTO dto);
+	MBeneficiarycontact identitySearchDTOToMBeneficiarycontact(IdentitySearchDTO dto);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
index 1c6d9906..d9339ab2 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
@@ -52,10 +52,10 @@ List<MBeneficiaryaddress> findByCurrStateIdAndCurrDistrictIdOrderByBenAddressIDA
 	List<MBeneficiaryaddress> findByPermStateIdAndPermDistrictIdOrderByBenAddressIDAsc(Integer permStateID,
 			Integer permDistID);
 
-	List<MBeneficiaryaddress> findByEmerStateAndEmerDistrictOrderByBenAddressIDAsc(String EmerState, String EmerDist);
+	List<MBeneficiaryaddress> findByEmerStateAndEmerDistrictOrderByBenAddressIDAsc(String emerState, String emerDist);
 
-	List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDAsc(Integer EmerStateID,
-			Integer EmerDistID);
+	List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDAsc(Integer emerStateID,
+			Integer emerDistID);
 
 	List<MBeneficiaryaddress> findByCreatedDateBetweenOrderByBenAddressIDAsc(Timestamp fromDate, Timestamp toDate);
 
@@ -72,6 +72,6 @@ List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDA
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryaddress a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryaddress getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryaddress getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
index f31ff771..9abb4cb8 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
@@ -46,6 +46,6 @@ public interface BenConsentRepo extends CrudRepository<MBeneficiaryconsent, BigI
 	int updateVanSerialNo(@Param("benConsentID") BigInteger benConsentID);
 
 	@Query("SELECT a FROM MBeneficiaryconsent a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryconsent getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryconsent getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
index b9ba6524..fdbda216 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
@@ -36,7 +36,7 @@
 
 @Repository
 public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigInteger> {
-	List<MBeneficiarycontact> findByBenContactsIDOrderByBenContactsIDAsc(BigInteger BenContactsID);
+	List<MBeneficiarycontact> findByBenContactsIDOrderByBenContactsIDAsc(BigInteger benContactsID);
 
 	List<MBeneficiarycontact> findByCreatedDateBetweenOrderByBenContactsIDAsc(Timestamp fromDate, Timestamp toDate);
 
@@ -46,7 +46,7 @@ public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigI
 
 	List<MBeneficiarycontact> findByPreferredPhoneNumOrderByBenContactsIDAsc(String phoneNum);
 
-	List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String SMSPhoneNum);
+	List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String smsPhoneNum);
 
 	
 	@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum ")
@@ -67,7 +67,7 @@ public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigI
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiarycontact a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiarycontact getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiarycontact getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
index af2998cd..8e5c9ea9 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
@@ -122,8 +122,8 @@ MBeneficiarydetail getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger va
 			+ " c.headOfFamily_Relation =:headofFamily_Relation,c.other =:other "
 			+ " WHERE c.vanSerialNo =:vanSerialNo AND c.vanID =:vanID ")
 	Integer updateFamilyDetails(@Param("familyId") String familyId,
-			@Param("headofFamily_RelationID") Integer headofFamily_RelationID,
-			@Param("headofFamily_Relation") String headofFamily_Relation, @Param("other") String other,
+			@Param("headofFamily_RelationID") Integer headofFamilyRelationID,
+			@Param("headofFamily_Relation") String headofFamilyRelation, @Param("other") String other,
 			@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Transactional
@@ -131,8 +131,8 @@ Integer updateFamilyDetails(@Param("familyId") String familyId,
 	@Query("UPDATE MBeneficiarydetail c SET c.headOfFamily_RelationID =:headofFamily_RelationID, "
 			+ " c.headOfFamily_Relation =:headofFamily_Relation,c.other =:other "
 			+ " WHERE c.vanSerialNo =:vanSerialNo AND c.vanID =:vanID AND c.familyId=:familyId ")
-	Integer editFamilyDetails(@Param("headofFamily_RelationID") Integer headofFamily_RelationID,
-			@Param("headofFamily_Relation") String headofFamily_Relation, @Param("other") String other,
+	Integer editFamilyDetails(@Param("headofFamily_RelationID") Integer headofFamilyRelationID,
+			@Param("headofFamily_Relation") String headofFamilyRelation, @Param("other") String other,
 			@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID,
 			@Param("familyId") String familyId);
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
index ceaca5de..b55a243c 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
@@ -43,16 +43,16 @@ public interface BenMappingRepo extends CrudRepository<MBeneficiarymapping, BigI
 
 	MBeneficiarymapping findByBenRegIdOrderByBenMapIdAsc(BigInteger benRegId);
 
-	MBeneficiarymapping findByMBeneficiarycontactOrderByBenMapIdAsc(MBeneficiarycontact MBeneficiarycontact);
+	MBeneficiarymapping findByMBeneficiarycontactOrderByBenMapIdAsc(MBeneficiarycontact mBeneficiarycontact);
 
 	List<MBeneficiarymapping> findByMBeneficiaryregidmappingOrderByBenMapIdAsc(
-			MBeneficiaryregidmapping MBeneficiaryregidmapping);
+			MBeneficiaryregidmapping mBeneficiaryregidmapping);
 
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailOrderByBenMapIdAsc(MBeneficiarydetail mBeneficiarydetail);
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressOrderByBenMapIdAsc(
-			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress MBeneficiaryaddress);
+			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress mBeneficiaryaddress);
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBeneficiarycontactOrderByBenMapIdAsc(
 			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress mBeneficiaryaddress,
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
index efffc666..43f92050 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 import com.iemr.common.identity.domain.MBeneficiarymapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.IdentityDTO;
 import com.iemr.common.identity.dto.IdentitySearchDTO;
 
@@ -41,5 +41,5 @@ public interface BenMappingRepoCustom {
 	 */
 	List<MBeneficiarymapping> finiteSearch(IdentityDTO identityDTO);
 
-	List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO);
+	List<VBenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
index ce01b507..0e7077ef 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
@@ -44,7 +44,7 @@
 import com.iemr.common.identity.domain.MBeneficiarycontact;
 import com.iemr.common.identity.domain.MBeneficiarydetail;
 import com.iemr.common.identity.domain.MBeneficiarymapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.IdentityDTO;
 import com.iemr.common.identity.dto.IdentitySearchDTO;
 import com.iemr.common.identity.mapper.IdentitySearchMapper;
@@ -347,10 +347,10 @@ public List<MBeneficiarymapping> finiteSearch(IdentityDTO identityDTO) {
 	}
 
 	@Override
-	public List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO) {
+	public List<VBenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO) {
 		CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
-		CriteriaQuery<V_BenAdvanceSearch> criteriaQuery = criteriaBuilder.createQuery(V_BenAdvanceSearch.class);
-		Root<V_BenAdvanceSearch> root = criteriaQuery.from(V_BenAdvanceSearch.class);
+		CriteriaQuery<VBenAdvanceSearch> criteriaQuery = criteriaBuilder.createQuery(VBenAdvanceSearch.class);
+		Root<VBenAdvanceSearch> root = criteriaQuery.from(VBenAdvanceSearch.class);
 		List<Predicate> predicateList = new ArrayList<Predicate>();
 
 		// if firstName is not null
@@ -412,7 +412,7 @@ public List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchD
 		}
 
 		criteriaQuery.select(root).where(predicateList.toArray(new Predicate[] {}));
-		TypedQuery<V_BenAdvanceSearch> typedQuery = entityManager.createQuery(criteriaQuery);
+		TypedQuery<VBenAdvanceSearch> typedQuery = entityManager.createQuery(criteriaQuery);
 		return typedQuery.getResultList();
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
index 830b0f41..9154ab87 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
@@ -68,7 +68,7 @@ public int unreserveBeneficiaryIds(@Param("providerServiceMapID") Integer provid
 			@Param("vehicalNo") String vehicalNo);
 
 	@Query("SELECT a FROM MBeneficiaryregidmapping a WHERE a.benRegId =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryregidmapping getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryregidmapping getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 	
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
index 761a5de9..15801662 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
@@ -41,40 +41,40 @@ public interface BenServiceMappingRepo extends CrudRepository<MBeneficiaryservic
 	List<MBeneficiaryservicemapping> findByProviderServiceMapId(Integer registeredProviderServiceMapId);
 
 	List<MBeneficiaryservicemapping> findByProviderServiceMapIdAndRegisteredDateBetween(
-			Integer registeredProviderServiceMapId, Timestamp from, Timestamp To);
+			Integer registeredProviderServiceMapId, Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByStateNameAndRegisteredDateBetween(String stateName, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId,
-			Timestamp from, Timestamp To);
+			Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName,
-			Timestamp from, Timestamp To);
+			Timestamp from, Timestamp to);
 
 	Long countByProviderServiceMapIdAndRegisteredDateBetween(Integer registeredProviderServiceMapId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
-	Long countByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from, Timestamp To);
+	Long countByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from, Timestamp to);
 
-	Long countByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from, Timestamp To);
+	Long countByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from, Timestamp to);
 
-	Long countByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from, Timestamp To);
+	Long countByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from, Timestamp to);
 
-	Long countByStateNameAndRegisteredDateBetween(String stateName, Timestamp from, Timestamp To);
+	Long countByStateNameAndRegisteredDateBetween(String stateName, Timestamp from, Timestamp to);
 
-	Long countByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId, Timestamp from, Timestamp To);
+	Long countByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId, Timestamp from, Timestamp to);
 
-	Long countByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName, Timestamp from, Timestamp To);
+	Long countByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName, Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByCreatedDateBetween(Timestamp fromDate, Timestamp toDate);
 
diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
index aaedeb1b..0df9d358 100644
--- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
@@ -41,7 +41,7 @@ public interface MBeneficiaryAccountRepo extends CrudRepository<MBeneficiaryAcco
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryAccount a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryAccount getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryAccount getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
index c1b5c415..2e2a162b 100644
--- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
@@ -36,12 +36,12 @@ public interface MBeneficiaryImageRepo extends CrudRepository<MBeneficiaryImage,
 	@Transactional
 	@Modifying
 	@Query(" UPDATE MBeneficiaryImage set vanSerialNo = :BenImageId WHERE BenImageId = :BenImageId")
-	int updateVanSerialNo(@Param("BenImageId") Long BenImageId);
+	int updateVanSerialNo(@Param("BenImageId") Long benImageId);
 
 	@Query("SELECT benImageId FROM MBeneficiaryImage WHERE vanSerialNo =:vanSerialNo AND vanID =:vanID ")
 	Long findIdByVanSerialNoAndVanID(@Param("vanSerialNo") Long vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryImage a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryImage getWith_vanSerialNo_vanID(@Param("vanSerialNo") Long vanSerialNo,
+	MBeneficiaryImage getWithVanSerialNoVanID(@Param("vanSerialNo") Long vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
index 3679f575..0be61bb0 100644
--- a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
@@ -29,10 +29,10 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 
 @Repository
-public interface V_BenAdvanceSearchRepo extends CrudRepository<V_BenAdvanceSearch, BigInteger> {
+public interface V_BenAdvanceSearchRepo extends CrudRepository<VBenAdvanceSearch, BigInteger> {
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID, HealthID, HealthIDNumber, AuthenticationMode, CreatedDate"
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE BeneficiaryRegID=:benRegID")
@@ -40,10 +40,10 @@ public interface V_BenAdvanceSearchRepo extends CrudRepository<V_BenAdvanceSearc
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID "
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE HealthID=:healthID AND BeneficiaryRegID is not null ")
-	List<BigInteger> getBenRegIDByHealthID_AbhaAddress(@Param("healthID") String healthID);
+	List<BigInteger> getBenRegIDByHealthIDAbhaAddress(@Param("healthID") String healthID);
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID "
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE HealthIDNumber=:healthIDNo  AND BeneficiaryRegID is not null ")
-	List<BigInteger> getBenRegIDByHealthIDNo_AbhaIdNo(@Param("healthIDNo") String healthIDNo);
+	List<BigInteger> getBenRegIDByHealthIDNoAbhaIdNo(@Param("healthIDNo") String healthIDNo);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 40721cbf..7998eab5 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -58,7 +58,7 @@
 import com.iemr.common.identity.domain.MBeneficiarymapping;
 import com.iemr.common.identity.domain.MBeneficiaryregidmapping;
 import com.iemr.common.identity.domain.MBeneficiaryservicemapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.AbhaAddressDTO;
 import com.iemr.common.identity.dto.BenIdImportDTO;
 import com.iemr.common.identity.dto.BeneficiariesDTO;
@@ -293,8 +293,8 @@ public List<BeneficiariesDTO> getBeneficiaries(IdentitySearchDTO searchDTO)
 		/**
 		 * New logic for advance search, 03-10-2018
 		 */
-		List<V_BenAdvanceSearch> tmpList = mappingRepo.dynamicFilterSearchNew(searchDTO);
-		for (V_BenAdvanceSearch obj : tmpList) {
+		List<VBenAdvanceSearch> tmpList = mappingRepo.dynamicFilterSearchNew(searchDTO);
+		for (VBenAdvanceSearch obj : tmpList) {
 			list.add(this.getBeneficiariesDTO(this.getBeneficiariesDTONew1(obj)));
 			logger.debug("benMapId: " + obj.getBenMapID());
 		}
@@ -421,7 +421,7 @@ public List<BeneficiariesDTO> getBeneficiaryByHealthID_AbhaAddress(String health
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();
 		try {
-			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthID_AbhaAddress(healthID);
+			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDAbhaAddress(healthID);
 			if (regIDList != null && regIDList.size() > 0) {
 				for (BigInteger benRegID : regIDList) {
 					if (benRegID != null) {
@@ -452,7 +452,7 @@ public List<BeneficiariesDTO> getBeneficiaryByHealthIDNo_AbhaIdNo(String healthI
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();
 		try {
-			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDNo_AbhaIdNo(healthIDNo);
+			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDNoAbhaIdNo(healthIDNo);
 			if (regIDList != null && regIDList.size() > 0) {
 				for (BigInteger benRegID : regIDList) {
 					if (benRegID != null) {
@@ -559,19 +559,19 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {
 			}
 
 			benMapOBJ.setMBeneficiaryaddress(addressRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[1]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[1]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryconsent(consentRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[2]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[2]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiarycontact(contactRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[3]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[3]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiarydetail(detailRepo
 					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[4]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryImage(
-					imageRepo.getWith_vanSerialNo_vanID((Long) benMapArr[6], (Integer) benMapArr[8]));
+					imageRepo.getWithVanSerialNoVanID((Long) benMapArr[6], (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryAccount(accountRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]));
 
 			benMapOBJ.setMBeneficiaryfamilymappings(familyMapRepo.findByBenMapIdAndVanIDOrderByBenFamilyMapIdAsc(
 					getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]));
@@ -594,14 +594,14 @@ private MBeneficiarymapping getBeneficiariesDTONewPartial(Object[] benMapArr) {
 			benMapOBJ.setMBeneficiarydetail(detailRepo
 					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[4]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
 		}
 		return benMapOBJ;
 	}
 
 	// 03-10-2018
 	// get ben mapping object from v_benadvancesearch
-	private MBeneficiarymapping getBeneficiariesDTONew1(V_BenAdvanceSearch benAdvanceSearchOBJ) {
+	private MBeneficiarymapping getBeneficiariesDTONew1(VBenAdvanceSearch benAdvanceSearchOBJ) {
 		MBeneficiarymapping benMapOBJ = new MBeneficiarymapping();
 
 		// for createdBy & createdDate
@@ -621,18 +621,18 @@ private MBeneficiarymapping getBeneficiariesDTONew1(V_BenAdvanceSearch benAdvanc
 			benMapOBJ.setCreatedDate(benDetailsOBJ.getCreatedDate());
 
 			benMapOBJ.setMBeneficiaryaddress(addressRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenAddressID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenAddressID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiaryconsent(consentRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenConsentID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenConsentID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiarycontact(contactRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenContactID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenContactID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiarydetail(benDetailsOBJ);
-			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenRegID(),
+			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenRegID(),
 					benAdvanceSearchOBJ.getVanID()));
-			benMapOBJ.setMBeneficiaryImage(imageRepo.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenImageID(),
+			benMapOBJ.setMBeneficiaryImage(imageRepo.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenImageID(),
 					benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiaryAccount(accountRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenAccountID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenAccountID(), benAdvanceSearchOBJ.getVanID()));
 
 			benMapOBJ.setMBeneficiaryfamilymappings(
 					familyMapRepo.findByBenMapIdOrderByBenFamilyMapIdAsc(benAdvanceSearchOBJ.getVanSerialNo()));
@@ -691,7 +691,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 				|| Boolean.TRUE.equals(identity.getChangeInOtherDetails())
 				|| Boolean.TRUE.equals(identity.getChangeInAssociations())) {
 
-			MBeneficiarydetail mbDetl = editMapper.IdentityEditDTOToMBeneficiarydetail(identity);
+			MBeneficiarydetail mbDetl = editMapper.identityEditDTOToMBeneficiarydetail(identity);
 			/**
 			 * new logic for data sync, 26-09-2018
 			 */
@@ -724,7 +724,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 		logger.debug("identity.getChangeInAddress = " + identity.getChangeInAddress());
 		if (Boolean.TRUE.equals(identity.getChangeInAddress())) {
 
-			MBeneficiaryaddress mbAddr = editMapper.IdentityEditDTOToMBeneficiaryaddress(identity);
+			MBeneficiaryaddress mbAddr = editMapper.identityEditDTOToMBeneficiaryaddress(identity);
 
 			/**
 			 * new logic for data sync, 26-09-2018
@@ -751,7 +751,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 		logger.debug("identity.getChangeInContacts = " + identity.getChangeInContacts());
 		if (Boolean.TRUE.equals(identity.getChangeInContacts())) {
 
-			MBeneficiarycontact benCon = editMapper.IdentityEdiDTOToMBeneficiarycontact(identity);
+			MBeneficiarycontact benCon = editMapper.identityEdiDTOToMBeneficiarycontact(identity);
 
 			/**
 			 * new logic for data sync, 26-09-2018
@@ -780,7 +780,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 
 			MBeneficiaryidentity beneficiaryidentity;
 			List<MBeneficiaryidentity> identities = editMapper
-					.IdentityEditDTOListToMBeneficiaryidentityList(identity.getIdentities());
+					.identityEditDTOListToMBeneficiaryidentityList(identity.getIdentities());
 			logger.debug("identities to upsert = " + OutputMapper.gson().toJson(identities));
 
 			// new logic for getting beneficiary identities, 26-09-2018
@@ -1108,7 +1108,7 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		}
 
 		logger.info("IdentityService.createIdentity - end. id = " + benMapping.getBenMapId());
-		return partialMapper.MBeneficiarymappingToBeneficiaryCreateResp(benMapping);
+		return partialMapper.mBeneficiarymappingToBeneficiaryCreateResp(benMapping);
 	}
 
 	public String getReservedIdList() {
@@ -1171,7 +1171,7 @@ public List<BeneficiariesPartialDTO> getBeneficiariesPartialDeatilsByBenRegIdLis
 				for (Object[] objArr : benMapObjArr) {
 					MBeneficiarymapping benMap = this.getBeneficiariesDTONewPartial(objArr);
 
-					list.add(partialMapper.MBeneficiarymappingToBeneficiariesPartialDTO(benMap));
+					list.add(partialMapper.mBeneficiarymappingToBeneficiariesPartialDTO(benMap));
 				}
 			}
 			logger.info("benMap size" + (list.size() == 0 ? "No Beneficiary Found" : list.size()));
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index ddeffe17..570b060c 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -51,7 +51,7 @@
 import com.iemr.common.identity.controller.rmnch.RmnchMobileAppController;
 import com.iemr.common.identity.data.rmnch.BenHealthIDDetails;
 import com.iemr.common.identity.data.rmnch.GetBenRequestHandler;
-import com.iemr.common.identity.data.rmnch.NCD_TB_HRP_data;
+import com.iemr.common.identity.data.rmnch.NcdTbHrpData;
 import com.iemr.common.identity.data.rmnch.RMNCHBeneficiaryDetailsRmnch;
 import com.iemr.common.identity.data.rmnch.RMNCHBornBirthDetails;
 import com.iemr.common.identity.data.rmnch.RMNCHCBACdetails;
@@ -394,7 +394,7 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 
 						benCABCRMNCH_ROBJ = rMNCHCBACDetailsRepo.getByRegID((m.getBenRegId()).longValue());
 						// 20-09-2021,start
-						NCD_TB_HRP_data res = getHRP_NCD_TB_SuspectedStatus(m.getBenRegId().longValue(), authorisation,
+						NcdTbHrpData res = getHRP_NCD_TB_SuspectedStatus(m.getBenRegId().longValue(), authorisation,
 								benDetailsOBJ);
 						if (res != null && benCABCRMNCH_ROBJ != null) {
 							if (res.getConfirmed_hrp() != null)
@@ -680,15 +680,15 @@ public List<String> fetchHealthIdByBenRegID(Long benRegID, String authorization)
 
 	}
 
-	public NCD_TB_HRP_data getHRP_NCD_TB_SuspectedStatus(Long benRegID, String authorization,
+	public NcdTbHrpData getHRP_NCD_TB_SuspectedStatus(Long benRegID, String authorization,
 			RMNCHMBeneficiarydetail benDetails) throws IEMRException {
-		NCD_TB_HRP_data response = null;
+		NcdTbHrpData response = null;
 		try {
 
 			if (benRegID != null) {
 				List<Object[]> obj = rMNCHCBACDetailsRepo.getVisitDetailsbyRegID(benRegID);
 				if (obj != null && obj.size() > 0) {
-					response = new NCD_TB_HRP_data();
+					response = new NcdTbHrpData();
 					Long visitCode = (((BigInteger) obj.get(0)[0])).longValue();
 					String visitCategory = (String) obj.get(0)[1];
 					switch (visitCategory) {
@@ -772,8 +772,8 @@ public String getConfirmedHRP(Long benRegID, Long visitCode, String authorizatio
 
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
@@ -829,8 +829,8 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) thr
 		return response;
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_Common(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_Common(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
@@ -888,8 +888,8 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_Common(Long benRegID, Long visitCode)
 		return response;
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
diff --git a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
index 2dd5bd9b..22eef2b7 100644
--- a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
+++ b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
@@ -428,7 +428,7 @@ public void getBeneficiariesPartialDeatilsByBenRegIdListTest1()
 			doReturn(benDetail).when(detailRepo).findPartialBeneficiaryDetailByBenRegId(Mockito.any(BigInteger.class));
 			BeneficiariesPartialDTO beneficiariesPartialDTO=new BeneficiariesPartialDTO();
 			beneficiariesPartialDTO.setBeneficiaryDetailsId(new BigInteger("202"));
-			doReturn(beneficiariesPartialDTO).when(partialMapper).MBeneficiarymappingToBeneficiariesPartialDTO(beneficiarymapping);
+			doReturn(beneficiariesPartialDTO).when(partialMapper).mBeneficiarymappingToBeneficiariesPartialDTO(beneficiarymapping);
 			
 			List<BeneficiariesPartialDTO> dtoList=identityService.getBeneficiariesPartialDeatilsByBenRegIdList(Mockito.anyListOf(BigInteger.class));
 			assertTrue(dtoList.size()>0);
@@ -483,7 +483,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			
 			mBeneficiarymapping.setMBeneficiarydetail(beneficiarydetail);
 			
-			doReturn(mBeneficiarydetail).when(editMapper).IdentityEditDTOToMBeneficiarydetail(Mockito.any());
+			doReturn(mBeneficiarydetail).when(editMapper).identityEditDTOToMBeneficiarydetail(Mockito.any());
 
 			doReturn(mBeneficiarydetail).when(beneficiarymapping).getMBeneficiarydetail();
 			doReturn(new BigInteger("250")).when(beneficiarydetail).getBeneficiaryDetailsId();
@@ -500,7 +500,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			mBeneficiaryaddressList.add(mBeneficiaryaddress);
 			
 
-			doReturn(mBeneficiaryaddress).when(editMapper).IdentityEditDTOToMBeneficiaryaddress(Mockito.any());
+			doReturn(mBeneficiaryaddress).when(editMapper).identityEditDTOToMBeneficiaryaddress(Mockito.any());
 			
 			
 			mBeneficiarymapping.setMBeneficiaryaddress(beneficiaryaddress);
@@ -514,7 +514,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			MBeneficiaryidentity mBeneficiaryidentity=new MBeneficiaryidentity();
 			mBeneficiaryidentity.setBenIdentityId(new BigInteger("786"));
 			identityList.add(mBeneficiaryidentity);
-			doReturn(identityList).when(editMapper).IdentityEditDTOListToMBeneficiaryidentityList(Mockito.anyListOf(Identity.class));
+			doReturn(identityList).when(editMapper).identityEditDTOListToMBeneficiaryidentityList(Mockito.anyListOf(Identity.class));
 			doReturn(identityList).when(identityRepo).save(mBeneficiaryidentity);
 			
 			identityEditDTO.setChangeInContacts(true);
@@ -523,7 +523,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			mBeneficiarymapping.setMBeneficiarycontact(contact);
 			doReturn(contact).when(beneficiarymapping).getMBeneficiarycontact();
 			doReturn(new BigInteger("901")).when(mBeneficiarycontact).getBenContactsID();
-			doReturn(contact).when(editMapper).IdentityEdiDTOToMBeneficiarycontact(Mockito.any());
+			doReturn(contact).when(editMapper).identityEdiDTOToMBeneficiarycontact(Mockito.any());
 			
 			identityEditDTO.setChangeInFamilyDetails(true);
 			List<MBeneficiaryfamilymapping> familyMappingList=Lists.newArrayList();

From 53a5cd348e1a83f98a439ccd3fc7401f1947f1cc Mon Sep 17 00:00:00 2001
From: Harimohan Rajamohanan <30436665+harimohanr@users.noreply.github.com>
Date: Wed, 21 Jun 2023 20:28:21 +0530
Subject: [PATCH 13/53] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb30a78d..98173c4d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # AMRIT - Identity Service 
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) 
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)  ![branch parameter](https://github.com/PSMRI/Identity-API/actions/workflows/sast-and-package.yml/badge.svg)
 
 Identity API is a microservice which is used for the creation and management of beneficaries.
 

From 15b53568bbea7054d5f38a5b41274af1ebe79196 Mon Sep 17 00:00:00 2001
From: swetatech24 <sweta.prakash@wipro.com>
Date: Thu, 22 Jun 2023 14:49:11 +0530
Subject: [PATCH 14/53] code smell fixes

---
 .../controller/IdentityController.java        |  14 +-
 ...NCD_TB_HRP_data.java => NcdTbHrpData.java} |   2 +-
 ...anceSearch.java => VBenAdvanceSearch.java} |   4 +-
 .../exception/SearchCriteriaException.java    |  27 ---
 .../identity/mapper/IdentityEditMapper.java   |  24 +--
 .../identity/mapper/IdentityMapper.java       |  16 +-
 .../mapper/IdentityPartialMapper.java         |   4 +-
 .../identity/mapper/IdentitySearchMapper.java |   6 +-
 .../common/identity/repo/BenAddressRepo.java  |   8 +-
 .../common/identity/repo/BenConsentRepo.java  |   2 +-
 .../common/identity/repo/BenContactRepo.java  |   6 +-
 .../common/identity/repo/BenDetailRepo.java   |   8 +-
 .../common/identity/repo/BenMappingRepo.java  |   6 +-
 .../identity/repo/BenMappingRepoCustom.java   |   4 +-
 .../identity/repo/BenMappingRepoImpl.java     |  10 +-
 .../identity/repo/BenRegIdMappingRepo.java    |   2 +-
 .../identity/repo/BenServiceMappingRepo.java  |  28 +--
 .../repo/MBeneficiaryAccountRepo.java         |   2 +-
 .../identity/repo/MBeneficiaryImageRepo.java  |   4 +-
 .../identity/repo/V_BenAdvanceSearchRepo.java |   8 +-
 .../repo/rmnch/RMNCHCBACDetailsRepo.java      |   2 +-
 .../identity/service/IdentityService.java     |  71 +++---
 .../rmnch/RmnchDataSyncServiceImpl.java       | 202 +++++++++---------
 .../identity/service/IdentityServiceTest.java |  26 +--
 24 files changed, 229 insertions(+), 257 deletions(-)
 rename src/main/java/com/iemr/common/identity/data/rmnch/{NCD_TB_HRP_data.java => NcdTbHrpData.java} (97%)
 rename src/main/java/com/iemr/common/identity/domain/{V_BenAdvanceSearch.java => VBenAdvanceSearch.java} (98%)
 delete mode 100644 src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 3cd6d75e..ff2f1327 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -231,7 +231,7 @@ public class IdentityController {
 
 			healthIDValue = healthID;
 
-			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthID_AbhaAddress(healthIDValue);
+			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthIDAbhaAddress(healthIDValue);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -264,7 +264,7 @@ public class IdentityController {
 
 			healthIDNoValue = healthIDNo;
 
-			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthIDNo_AbhaIdNo(healthIDNoValue);
+			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthIDNoAbhaIdNo(healthIDNoValue);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -707,7 +707,7 @@ public class IdentityController {
 	private String getSuccessResponseString(MBeneficiarymapping map, Integer statusCode, String statusMsg,
 			String methodName) {
 		logger.info("IdentityController.getResponseString of map parameter - start");
-		BeneficiariesDTO bdto = mapper.MBeneficiarymappingToBeneficiariesDTO(map);
+		BeneficiariesDTO bdto = mapper.mBeneficiarymappingToBeneficiariesDTO(map);
 		bdto.setBeneficiaryFamilyTags(
 				mapper.mBeneficiaryfamilymappingListToBenFamilyDTOList(map.getMBeneficiaryfamilymappings()));
 		bdto.setBeneficiaryIdentites(
@@ -1005,17 +1005,17 @@ public String getJsonAsString(Object obj) {
 					+ "        \"benIDRequired\": \"Integer\"\r\n" + "       }") @RequestBody String regIDList) {
 		com.iemr.common.identity.utils.response.OutputResponse response = new com.iemr.common.identity.utils.response.OutputResponse();
 		try {
-			BenIdImportDTO[] BenIdImportDTOArr = InputMapper.getInstance().gson().fromJson(regIDList,
+			BenIdImportDTO[] benIdImportDTOArr = InputMapper.getInstance().gson().fromJson(regIDList,
 					BenIdImportDTO[].class);
 
-			List<BenIdImportDTO> BenIdImportDTOList = Arrays.asList(BenIdImportDTOArr);
+			List<BenIdImportDTO> benIdImportDTOList = Arrays.asList(benIdImportDTOArr);
 
-			int i = svc.importBenIdToLocalServer(BenIdImportDTOList);
+			int i = svc.importBenIdToLocalServer(benIdImportDTOList);
 			if (i > 0)
 				response.setResponse(i + " Unique benid imported to local server");
 			else {
 				response.setResponse("Empty or invalid data");
-				logger.error("Empty or invalid data. Data Size is : " + BenIdImportDTOList.size());
+				logger.error("Empty or invalid data. Data Size is : " + benIdImportDTOList.size());
 			}
 		} catch (Exception e) {
 			logger.error("Exception in importing benID to local server : " + e);
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java b/src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
similarity index 97%
rename from src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
rename to src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
index 18ec46da..c86f6048 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
@@ -29,7 +29,7 @@
 import lombok.Data;
 
 @Data
-public class NCD_TB_HRP_data {
+public class NcdTbHrpData {
 
 	@Expose
 	private String confirmed_ncd;
diff --git a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java b/src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
similarity index 98%
rename from src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
rename to src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
index ea615acd..8134468a 100644
--- a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
+++ b/src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
@@ -33,7 +33,7 @@
 
 @Entity
 @Table(name = "v_benadvancesearch")
-public class V_BenAdvanceSearch {
+public class VBenAdvanceSearch {
 
 	@Id
 	@Expose
@@ -141,7 +141,7 @@ public void setHouseHoldID(Long houseHoldID) {
 		this.houseHoldID = houseHoldID;
 	}
 
-	public V_BenAdvanceSearch() {
+	public VBenAdvanceSearch() {
 		super();
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
deleted file mode 100644
index 6fee444f..00000000
--- a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.exception;
-
-public class SearchCriteriaException {
-	
-
-}
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
index 2f08bf4d..9b172375 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
@@ -57,7 +57,7 @@ public interface IdentityEditMapper {
 			@Mapping(source = "dto.eventTypeDate", target = "lastModDate")
 
 	})
-	MBeneficiarymapping IdentityEditDTOToMBeneficiarymapping(IdentityEditDTO dto);
+	MBeneficiarymapping identityEditDTOToMBeneficiarymapping(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "dto.currentAddress.addrLine1", target = "currAddrLine1"),
 			@Mapping(source = "dto.currentAddress.addrLine2", target = "currAddrLine2"),
@@ -141,7 +141,7 @@ public interface IdentityEditMapper {
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiaryaddress IdentityEditDTOToMBeneficiaryaddress(IdentityEditDTO dto);
+	MBeneficiaryaddress identityEditDTOToMBeneficiaryaddress(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "defaultNo", target = "shareAnonymousWithGovt"),
 			@Mapping(source = "defaultNo", target = "shareAnonymousWithMedicalCommunity"),
@@ -162,7 +162,7 @@ public interface IdentityEditMapper {
 			@Mapping(source = "defaultYes", target = "sharePersonalDetailsWithSpouse"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
 			@Mapping(source = "dto.eventTypeDate", target = "createdDate") })
-	MBeneficiaryconsent IdentityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO dto, Boolean defaultYes,
+	MBeneficiaryconsent identityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO dto, Boolean defaultYes,
 			Boolean defaultNo);
 
 	@Mappings({ @Mapping(source = "dto.contact.preferredPhoneNum", target = "preferredPhoneNum"),
@@ -188,7 +188,7 @@ MBeneficiaryconsent IdentityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiarycontact IdentityEdiDTOToMBeneficiarycontact(IdentityEditDTO dto);
+	MBeneficiarycontact identityEdiDTOToMBeneficiarycontact(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "dto.areaId", target = "areaId"),
 			@Mapping(source = "dto.beneficiaryRegId", target = "beneficiaryRegID"),
@@ -237,17 +237,17 @@ MBeneficiaryconsent IdentityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiarydetail IdentityEditDTOToMBeneficiarydetail(IdentityEditDTO dto);
+	MBeneficiarydetail identityEditDTOToMBeneficiarydetail(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "benFamilyDTO.isEmergencyContact", target = "isEmergencyContact"),
 			@Mapping(source = "benFamilyDTO.relationshipToSelf", target = "relationshipToSelf"),
 			@Mapping(source = "benFamilyDTO.associatedBenRegId", target = "associatedBenRegId"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
+	MBeneficiaryfamilymapping identityEditDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
 			Timestamp createdDate);
 
-	List<MBeneficiaryfamilymapping> IdentityEditDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
+	List<MBeneficiaryfamilymapping> identityEditDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
 
 	@Mappings({ @Mapping(source = "identity.identityNo", target = "identityNo"),
 			@Mapping(source = "identity.identityName", target = "identityName"),
@@ -258,9 +258,9 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "identity.identityFilePath", target = "identityFilePath"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryidentity IdentityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
+	MBeneficiaryidentity identityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
 
-	List<MBeneficiaryidentity> IdentityEditDTOListToMBeneficiaryidentityList(List<Identity> list);
+	List<MBeneficiaryidentity> identityEditDTOListToMBeneficiaryidentityList(List<Identity> list);
 
 	@Mappings({ @Mapping(source = "dto.serviceId", target = "serviceId"),
 			@Mapping(source = "dto.serviceName", target = "serviceName"),
@@ -274,7 +274,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "dto.eventTypeDate", target = "registeredDate"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
 			@Mapping(source = "dto.eventTypeDate", target = "createdDate") })
-	MBeneficiaryservicemapping IdentityEditDTOToMBeneficiaryservicemapping(IdentityEditDTO dto);
+	MBeneficiaryservicemapping identityEditDTOToMBeneficiaryservicemapping(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "beneficiaryDetailsId", target = "beneficiaryDetailsId"),
 			@Mapping(source = "areaId", target = "areaId"),
@@ -302,7 +302,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "sourceOfInfo", target = "sourceOfInfo"),
 			@Mapping(source = "spouseName", target = "spouseName"), @Mapping(source = "status", target = "status"),
 			@Mapping(source = "title", target = "title"), @Mapping(source = "zoneId", target = "zoneId") })
-	BenDetailDTO MBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
+	BenDetailDTO mBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
 
 	@Mappings({ @Mapping(source = "family.benFamilyMapId", target = "benFamilyMapId"),
 			@Mapping(source = "family.associatedBenRegId", target = "associatedBenRegId"),
@@ -313,7 +313,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "family.lastModDate", target = "lastModDate"),
 			@Mapping(source = "family.modifiedBy", target = "modifiedBy"),
 			@Mapping(source = "family.relationshipToSelf", target = "relationshipToSelf") })
-	BenFamilyDTO MBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
+	BenFamilyDTO mBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
 
 	List<BenFamilyDTO> mBeneficiaryfamilymappingListToBenFamilyDTOList(List<MBeneficiaryfamilymapping> families);
 
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
index 85e47c19..aaa690cb 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -262,10 +262,10 @@ public interface IdentityMapper {
 			@Mapping(source = "benFamilyDTO.associatedBenRegId", target = "associatedBenRegId"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
+	MBeneficiaryfamilymapping identityDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
 			Timestamp createdDate);
 
-	List<MBeneficiaryfamilymapping> IdentityDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
+	List<MBeneficiaryfamilymapping> identityDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
 
 	@Mappings({ @Mapping(source = "identity.identityNo", target = "identityNo"),
 			@Mapping(source = "identity.identityNameId", target = "identityNameId"),
@@ -278,9 +278,9 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "identity.identityFilePath", target = "identityFilePath"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryidentity IdentityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
+	MBeneficiaryidentity identityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
 
-	List<MBeneficiaryidentity> IdentityDTOListToMBeneficiaryidentityList(List<Identity> list);
+	List<MBeneficiaryidentity> identityDTOListToMBeneficiaryidentityList(List<Identity> list);
 
 	@Mappings({ @Mapping(source = "dto.serviceId", target = "serviceId"),
 			@Mapping(source = "dto.serviceName", target = "serviceName"),
@@ -483,10 +483,10 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			// End 1097
 
 	})
-	BeneficiariesDTO MBeneficiarymappingToBeneficiariesDTO(MBeneficiarymapping map);
+	BeneficiariesDTO mBeneficiarymappingToBeneficiariesDTO(MBeneficiarymapping map);
 
 	@IterableMapping(elementTargetType = BeneficiariesDTO.class)
-	List<BeneficiariesDTO> MBeneficiarymappingToBeneficiariesDTO(List<MBeneficiarymapping> map);
+	List<BeneficiariesDTO> mbeneficiarymappingToBeneficiariesDTO(List<MBeneficiarymapping> map);
 
 	@Mappings({ @Mapping(source = "beneficiaryDetailsId", target = "beneficiaryDetailsId"),
 			@Mapping(source = "areaId", target = "areaId"),
@@ -514,7 +514,7 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "spouseName", target = "spouseName"), @Mapping(source = "status", target = "status"),
 			@Mapping(source = "title", target = "title"), @Mapping(source = "zoneId", target = "zoneId"),
 			@Mapping(expression = "java(MBeneficiarydetail.getIsHIVPositive(detail.getIsHIVPositive()))", target = "isHIVPositive"), })
-	BenDetailDTO MBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
+	BenDetailDTO mBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
 
 	@Mappings({ @Mapping(source = "family.benFamilyMapId", target = "benFamilyMapId"),
 			@Mapping(source = "family.associatedBenRegId", target = "associatedBenRegId"),
@@ -525,7 +525,7 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "family.lastModDate", target = "lastModDate"),
 			@Mapping(source = "family.modifiedBy", target = "modifiedBy"),
 			@Mapping(source = "family.relationshipToSelf", target = "relationshipToSelf") })
-	BenFamilyDTO MBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
+	BenFamilyDTO mBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
 
 	List<BenFamilyDTO> mBeneficiaryfamilymappingListToBenFamilyDTOList(List<MBeneficiaryfamilymapping> families);
 
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
index befc03db..4696ae8f 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
@@ -47,9 +47,9 @@ public interface IdentityPartialMapper
 			@Mapping(target = "beneficiaryAge",
 					expression = "java(MBeneficiarydetail.calculateAge(map.getMBeneficiarydetail().getDob()))"), })
 
-	BeneficiariesPartialDTO MBeneficiarymappingToBeneficiariesPartialDTO(MBeneficiarymapping map);
+	BeneficiariesPartialDTO mBeneficiarymappingToBeneficiariesPartialDTO(MBeneficiarymapping map);
 
 	@Mappings({ @Mapping(target = "benId", source = "map.MBeneficiaryregidmapping.beneficiaryID"),
 			@Mapping(target = "benRegId", source = "map.MBeneficiaryregidmapping.benRegId") })
-	BeneficiaryCreateResp MBeneficiarymappingToBeneficiaryCreateResp(MBeneficiarymapping map);
+	BeneficiaryCreateResp mBeneficiarymappingToBeneficiaryCreateResp(MBeneficiarymapping map);
 }
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
index e8962e6e..03bd85b4 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
@@ -50,7 +50,7 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.spouseName", target = "spouseName")
 
 			})
-	MBeneficiarydetail IdentitySearchDTOMBeneficiarydetail(IdentitySearchDTO dto);
+	MBeneficiarydetail identitySearchDTOMBeneficiarydetail(IdentitySearchDTO dto);
 
 	@Mappings({
 
@@ -60,7 +60,7 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.currentAddress.district", target = "currDistrict"),
 			@Mapping(source = "dto.pinCode", target = "currPinCode") 
 			})
-	MBeneficiaryaddress IdentitySearchDTOToMBeneficiaryaddress(IdentitySearchDTO dto);
+	MBeneficiaryaddress identitySearchDTOToMBeneficiaryaddress(IdentitySearchDTO dto);
 
 	@Mappings({
 
@@ -71,5 +71,5 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.contactNumber", target = "phoneNum4"),
 			@Mapping(source = "dto.contactNumber", target = "phoneNum5")
 			})
-	MBeneficiarycontact IdentitySearchDTOToMBeneficiarycontact(IdentitySearchDTO dto);
+	MBeneficiarycontact identitySearchDTOToMBeneficiarycontact(IdentitySearchDTO dto);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
index 1c6d9906..d9339ab2 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
@@ -52,10 +52,10 @@ List<MBeneficiaryaddress> findByCurrStateIdAndCurrDistrictIdOrderByBenAddressIDA
 	List<MBeneficiaryaddress> findByPermStateIdAndPermDistrictIdOrderByBenAddressIDAsc(Integer permStateID,
 			Integer permDistID);
 
-	List<MBeneficiaryaddress> findByEmerStateAndEmerDistrictOrderByBenAddressIDAsc(String EmerState, String EmerDist);
+	List<MBeneficiaryaddress> findByEmerStateAndEmerDistrictOrderByBenAddressIDAsc(String emerState, String emerDist);
 
-	List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDAsc(Integer EmerStateID,
-			Integer EmerDistID);
+	List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDAsc(Integer emerStateID,
+			Integer emerDistID);
 
 	List<MBeneficiaryaddress> findByCreatedDateBetweenOrderByBenAddressIDAsc(Timestamp fromDate, Timestamp toDate);
 
@@ -72,6 +72,6 @@ List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDA
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryaddress a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryaddress getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryaddress getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
index f31ff771..9abb4cb8 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
@@ -46,6 +46,6 @@ public interface BenConsentRepo extends CrudRepository<MBeneficiaryconsent, BigI
 	int updateVanSerialNo(@Param("benConsentID") BigInteger benConsentID);
 
 	@Query("SELECT a FROM MBeneficiaryconsent a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryconsent getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryconsent getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
index b9ba6524..fdbda216 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
@@ -36,7 +36,7 @@
 
 @Repository
 public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigInteger> {
-	List<MBeneficiarycontact> findByBenContactsIDOrderByBenContactsIDAsc(BigInteger BenContactsID);
+	List<MBeneficiarycontact> findByBenContactsIDOrderByBenContactsIDAsc(BigInteger benContactsID);
 
 	List<MBeneficiarycontact> findByCreatedDateBetweenOrderByBenContactsIDAsc(Timestamp fromDate, Timestamp toDate);
 
@@ -46,7 +46,7 @@ public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigI
 
 	List<MBeneficiarycontact> findByPreferredPhoneNumOrderByBenContactsIDAsc(String phoneNum);
 
-	List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String SMSPhoneNum);
+	List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String smsPhoneNum);
 
 	
 	@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum ")
@@ -67,7 +67,7 @@ public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigI
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiarycontact a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiarycontact getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiarycontact getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
index af2998cd..8e5c9ea9 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
@@ -122,8 +122,8 @@ MBeneficiarydetail getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger va
 			+ " c.headOfFamily_Relation =:headofFamily_Relation,c.other =:other "
 			+ " WHERE c.vanSerialNo =:vanSerialNo AND c.vanID =:vanID ")
 	Integer updateFamilyDetails(@Param("familyId") String familyId,
-			@Param("headofFamily_RelationID") Integer headofFamily_RelationID,
-			@Param("headofFamily_Relation") String headofFamily_Relation, @Param("other") String other,
+			@Param("headofFamily_RelationID") Integer headofFamilyRelationID,
+			@Param("headofFamily_Relation") String headofFamilyRelation, @Param("other") String other,
 			@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Transactional
@@ -131,8 +131,8 @@ Integer updateFamilyDetails(@Param("familyId") String familyId,
 	@Query("UPDATE MBeneficiarydetail c SET c.headOfFamily_RelationID =:headofFamily_RelationID, "
 			+ " c.headOfFamily_Relation =:headofFamily_Relation,c.other =:other "
 			+ " WHERE c.vanSerialNo =:vanSerialNo AND c.vanID =:vanID AND c.familyId=:familyId ")
-	Integer editFamilyDetails(@Param("headofFamily_RelationID") Integer headofFamily_RelationID,
-			@Param("headofFamily_Relation") String headofFamily_Relation, @Param("other") String other,
+	Integer editFamilyDetails(@Param("headofFamily_RelationID") Integer headofFamilyRelationID,
+			@Param("headofFamily_Relation") String headofFamilyRelation, @Param("other") String other,
 			@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID,
 			@Param("familyId") String familyId);
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
index ceaca5de..b55a243c 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
@@ -43,16 +43,16 @@ public interface BenMappingRepo extends CrudRepository<MBeneficiarymapping, BigI
 
 	MBeneficiarymapping findByBenRegIdOrderByBenMapIdAsc(BigInteger benRegId);
 
-	MBeneficiarymapping findByMBeneficiarycontactOrderByBenMapIdAsc(MBeneficiarycontact MBeneficiarycontact);
+	MBeneficiarymapping findByMBeneficiarycontactOrderByBenMapIdAsc(MBeneficiarycontact mBeneficiarycontact);
 
 	List<MBeneficiarymapping> findByMBeneficiaryregidmappingOrderByBenMapIdAsc(
-			MBeneficiaryregidmapping MBeneficiaryregidmapping);
+			MBeneficiaryregidmapping mBeneficiaryregidmapping);
 
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailOrderByBenMapIdAsc(MBeneficiarydetail mBeneficiarydetail);
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressOrderByBenMapIdAsc(
-			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress MBeneficiaryaddress);
+			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress mBeneficiaryaddress);
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBeneficiarycontactOrderByBenMapIdAsc(
 			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress mBeneficiaryaddress,
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
index efffc666..43f92050 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 import com.iemr.common.identity.domain.MBeneficiarymapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.IdentityDTO;
 import com.iemr.common.identity.dto.IdentitySearchDTO;
 
@@ -41,5 +41,5 @@ public interface BenMappingRepoCustom {
 	 */
 	List<MBeneficiarymapping> finiteSearch(IdentityDTO identityDTO);
 
-	List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO);
+	List<VBenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
index ce01b507..0e7077ef 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
@@ -44,7 +44,7 @@
 import com.iemr.common.identity.domain.MBeneficiarycontact;
 import com.iemr.common.identity.domain.MBeneficiarydetail;
 import com.iemr.common.identity.domain.MBeneficiarymapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.IdentityDTO;
 import com.iemr.common.identity.dto.IdentitySearchDTO;
 import com.iemr.common.identity.mapper.IdentitySearchMapper;
@@ -347,10 +347,10 @@ public List<MBeneficiarymapping> finiteSearch(IdentityDTO identityDTO) {
 	}
 
 	@Override
-	public List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO) {
+	public List<VBenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO) {
 		CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
-		CriteriaQuery<V_BenAdvanceSearch> criteriaQuery = criteriaBuilder.createQuery(V_BenAdvanceSearch.class);
-		Root<V_BenAdvanceSearch> root = criteriaQuery.from(V_BenAdvanceSearch.class);
+		CriteriaQuery<VBenAdvanceSearch> criteriaQuery = criteriaBuilder.createQuery(VBenAdvanceSearch.class);
+		Root<VBenAdvanceSearch> root = criteriaQuery.from(VBenAdvanceSearch.class);
 		List<Predicate> predicateList = new ArrayList<Predicate>();
 
 		// if firstName is not null
@@ -412,7 +412,7 @@ public List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchD
 		}
 
 		criteriaQuery.select(root).where(predicateList.toArray(new Predicate[] {}));
-		TypedQuery<V_BenAdvanceSearch> typedQuery = entityManager.createQuery(criteriaQuery);
+		TypedQuery<VBenAdvanceSearch> typedQuery = entityManager.createQuery(criteriaQuery);
 		return typedQuery.getResultList();
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
index 830b0f41..9154ab87 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
@@ -68,7 +68,7 @@ public int unreserveBeneficiaryIds(@Param("providerServiceMapID") Integer provid
 			@Param("vehicalNo") String vehicalNo);
 
 	@Query("SELECT a FROM MBeneficiaryregidmapping a WHERE a.benRegId =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryregidmapping getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryregidmapping getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 	
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
index 761a5de9..15801662 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
@@ -41,40 +41,40 @@ public interface BenServiceMappingRepo extends CrudRepository<MBeneficiaryservic
 	List<MBeneficiaryservicemapping> findByProviderServiceMapId(Integer registeredProviderServiceMapId);
 
 	List<MBeneficiaryservicemapping> findByProviderServiceMapIdAndRegisteredDateBetween(
-			Integer registeredProviderServiceMapId, Timestamp from, Timestamp To);
+			Integer registeredProviderServiceMapId, Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByStateNameAndRegisteredDateBetween(String stateName, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId,
-			Timestamp from, Timestamp To);
+			Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName,
-			Timestamp from, Timestamp To);
+			Timestamp from, Timestamp to);
 
 	Long countByProviderServiceMapIdAndRegisteredDateBetween(Integer registeredProviderServiceMapId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
-	Long countByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from, Timestamp To);
+	Long countByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from, Timestamp to);
 
-	Long countByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from, Timestamp To);
+	Long countByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from, Timestamp to);
 
-	Long countByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from, Timestamp To);
+	Long countByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from, Timestamp to);
 
-	Long countByStateNameAndRegisteredDateBetween(String stateName, Timestamp from, Timestamp To);
+	Long countByStateNameAndRegisteredDateBetween(String stateName, Timestamp from, Timestamp to);
 
-	Long countByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId, Timestamp from, Timestamp To);
+	Long countByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId, Timestamp from, Timestamp to);
 
-	Long countByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName, Timestamp from, Timestamp To);
+	Long countByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName, Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByCreatedDateBetween(Timestamp fromDate, Timestamp toDate);
 
diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
index aaedeb1b..0df9d358 100644
--- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
@@ -41,7 +41,7 @@ public interface MBeneficiaryAccountRepo extends CrudRepository<MBeneficiaryAcco
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryAccount a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryAccount getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryAccount getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
index c1b5c415..2e2a162b 100644
--- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
@@ -36,12 +36,12 @@ public interface MBeneficiaryImageRepo extends CrudRepository<MBeneficiaryImage,
 	@Transactional
 	@Modifying
 	@Query(" UPDATE MBeneficiaryImage set vanSerialNo = :BenImageId WHERE BenImageId = :BenImageId")
-	int updateVanSerialNo(@Param("BenImageId") Long BenImageId);
+	int updateVanSerialNo(@Param("BenImageId") Long benImageId);
 
 	@Query("SELECT benImageId FROM MBeneficiaryImage WHERE vanSerialNo =:vanSerialNo AND vanID =:vanID ")
 	Long findIdByVanSerialNoAndVanID(@Param("vanSerialNo") Long vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryImage a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryImage getWith_vanSerialNo_vanID(@Param("vanSerialNo") Long vanSerialNo,
+	MBeneficiaryImage getWithVanSerialNoVanID(@Param("vanSerialNo") Long vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
index 3679f575..0be61bb0 100644
--- a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
@@ -29,10 +29,10 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 
 @Repository
-public interface V_BenAdvanceSearchRepo extends CrudRepository<V_BenAdvanceSearch, BigInteger> {
+public interface V_BenAdvanceSearchRepo extends CrudRepository<VBenAdvanceSearch, BigInteger> {
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID, HealthID, HealthIDNumber, AuthenticationMode, CreatedDate"
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE BeneficiaryRegID=:benRegID")
@@ -40,10 +40,10 @@ public interface V_BenAdvanceSearchRepo extends CrudRepository<V_BenAdvanceSearc
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID "
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE HealthID=:healthID AND BeneficiaryRegID is not null ")
-	List<BigInteger> getBenRegIDByHealthID_AbhaAddress(@Param("healthID") String healthID);
+	List<BigInteger> getBenRegIDByHealthIDAbhaAddress(@Param("healthID") String healthID);
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID "
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE HealthIDNumber=:healthIDNo  AND BeneficiaryRegID is not null ")
-	List<BigInteger> getBenRegIDByHealthIDNo_AbhaIdNo(@Param("healthIDNo") String healthIDNo);
+	List<BigInteger> getBenRegIDByHealthIDNoAbhaIdNo(@Param("healthIDNo") String healthIDNo);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
index 3d0e4968..2ac98a61 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
@@ -51,6 +51,6 @@ public List<Object> getDiagnosisProvidedCommon(@Param("benRegID") Long benRegID,
 	
 	@Query(value = "select NCD_Condition from db_iemr.t_ncddiagnosis where BeneficiaryRegID=:benRegID AND visitcode=:visitCode AND NCD_Condition is not null AND NCD_Condition <> '' "
 	, nativeQuery = true)
-	public List<Object> getDiagnosisProvidedNCD_Care(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);
+	public List<Object> getDiagnosisProvidedNCDCare(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);
 	
 }
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 40721cbf..9f925f64 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -58,7 +58,7 @@
 import com.iemr.common.identity.domain.MBeneficiarymapping;
 import com.iemr.common.identity.domain.MBeneficiaryregidmapping;
 import com.iemr.common.identity.domain.MBeneficiaryservicemapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.AbhaAddressDTO;
 import com.iemr.common.identity.dto.BenIdImportDTO;
 import com.iemr.common.identity.dto.BeneficiariesDTO;
@@ -293,8 +293,8 @@ public List<BeneficiariesDTO> getBeneficiaries(IdentitySearchDTO searchDTO)
 		/**
 		 * New logic for advance search, 03-10-2018
 		 */
-		List<V_BenAdvanceSearch> tmpList = mappingRepo.dynamicFilterSearchNew(searchDTO);
-		for (V_BenAdvanceSearch obj : tmpList) {
+		List<VBenAdvanceSearch> tmpList = mappingRepo.dynamicFilterSearchNew(searchDTO);
+		for (VBenAdvanceSearch obj : tmpList) {
 			list.add(this.getBeneficiariesDTO(this.getBeneficiariesDTONew1(obj)));
 			logger.debug("benMapId: " + obj.getBenMapID());
 		}
@@ -417,11 +417,11 @@ public List<BeneficiariesDTO> getBeneficiariesByPhoneNum(String phoneNum)
 	 * @throws Exception
 	 */
 
-	public List<BeneficiariesDTO> getBeneficiaryByHealthID_AbhaAddress(String healthID)
+	public List<BeneficiariesDTO> getBeneficiaryByHealthIDAbhaAddress(String healthID)
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();
 		try {
-			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthID_AbhaAddress(healthID);
+			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDAbhaAddress(healthID);
 			if (regIDList != null && regIDList.size() > 0) {
 				for (BigInteger benRegID : regIDList) {
 					if (benRegID != null) {
@@ -448,11 +448,11 @@ public List<BeneficiariesDTO> getBeneficiaryByHealthID_AbhaAddress(String health
 	 * @throws Exception
 	 */
 
-	public List<BeneficiariesDTO> getBeneficiaryByHealthIDNo_AbhaIdNo(String healthIDNo)
+	public List<BeneficiariesDTO> getBeneficiaryByHealthIDNoAbhaIdNo(String healthIDNo)
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();
 		try {
-			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDNo_AbhaIdNo(healthIDNo);
+			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDNoAbhaIdNo(healthIDNo);
 			if (regIDList != null && regIDList.size() > 0) {
 				for (BigInteger benRegID : regIDList) {
 					if (benRegID != null) {
@@ -559,19 +559,19 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {
 			}
 
 			benMapOBJ.setMBeneficiaryaddress(addressRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[1]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[1]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryconsent(consentRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[2]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[2]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiarycontact(contactRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[3]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[3]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiarydetail(detailRepo
 					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[4]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryImage(
-					imageRepo.getWith_vanSerialNo_vanID((Long) benMapArr[6], (Integer) benMapArr[8]));
+					imageRepo.getWithVanSerialNoVanID((Long) benMapArr[6], (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryAccount(accountRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]));
 
 			benMapOBJ.setMBeneficiaryfamilymappings(familyMapRepo.findByBenMapIdAndVanIDOrderByBenFamilyMapIdAsc(
 					getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]));
@@ -594,14 +594,14 @@ private MBeneficiarymapping getBeneficiariesDTONewPartial(Object[] benMapArr) {
 			benMapOBJ.setMBeneficiarydetail(detailRepo
 					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[4]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
 		}
 		return benMapOBJ;
 	}
 
 	// 03-10-2018
 	// get ben mapping object from v_benadvancesearch
-	private MBeneficiarymapping getBeneficiariesDTONew1(V_BenAdvanceSearch benAdvanceSearchOBJ) {
+	private MBeneficiarymapping getBeneficiariesDTONew1(VBenAdvanceSearch benAdvanceSearchOBJ) {
 		MBeneficiarymapping benMapOBJ = new MBeneficiarymapping();
 
 		// for createdBy & createdDate
@@ -621,18 +621,18 @@ private MBeneficiarymapping getBeneficiariesDTONew1(V_BenAdvanceSearch benAdvanc
 			benMapOBJ.setCreatedDate(benDetailsOBJ.getCreatedDate());
 
 			benMapOBJ.setMBeneficiaryaddress(addressRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenAddressID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenAddressID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiaryconsent(consentRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenConsentID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenConsentID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiarycontact(contactRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenContactID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenContactID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiarydetail(benDetailsOBJ);
-			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenRegID(),
+			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenRegID(),
 					benAdvanceSearchOBJ.getVanID()));
-			benMapOBJ.setMBeneficiaryImage(imageRepo.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenImageID(),
+			benMapOBJ.setMBeneficiaryImage(imageRepo.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenImageID(),
 					benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiaryAccount(accountRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenAccountID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenAccountID(), benAdvanceSearchOBJ.getVanID()));
 
 			benMapOBJ.setMBeneficiaryfamilymappings(
 					familyMapRepo.findByBenMapIdOrderByBenFamilyMapIdAsc(benAdvanceSearchOBJ.getVanSerialNo()));
@@ -691,7 +691,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 				|| Boolean.TRUE.equals(identity.getChangeInOtherDetails())
 				|| Boolean.TRUE.equals(identity.getChangeInAssociations())) {
 
-			MBeneficiarydetail mbDetl = editMapper.IdentityEditDTOToMBeneficiarydetail(identity);
+			MBeneficiarydetail mbDetl = editMapper.identityEditDTOToMBeneficiarydetail(identity);
 			/**
 			 * new logic for data sync, 26-09-2018
 			 */
@@ -724,7 +724,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 		logger.debug("identity.getChangeInAddress = " + identity.getChangeInAddress());
 		if (Boolean.TRUE.equals(identity.getChangeInAddress())) {
 
-			MBeneficiaryaddress mbAddr = editMapper.IdentityEditDTOToMBeneficiaryaddress(identity);
+			MBeneficiaryaddress mbAddr = editMapper.identityEditDTOToMBeneficiaryaddress(identity);
 
 			/**
 			 * new logic for data sync, 26-09-2018
@@ -751,7 +751,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 		logger.debug("identity.getChangeInContacts = " + identity.getChangeInContacts());
 		if (Boolean.TRUE.equals(identity.getChangeInContacts())) {
 
-			MBeneficiarycontact benCon = editMapper.IdentityEdiDTOToMBeneficiarycontact(identity);
+			MBeneficiarycontact benCon = editMapper.identityEdiDTOToMBeneficiarycontact(identity);
 
 			/**
 			 * new logic for data sync, 26-09-2018
@@ -780,7 +780,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 
 			MBeneficiaryidentity beneficiaryidentity;
 			List<MBeneficiaryidentity> identities = editMapper
-					.IdentityEditDTOListToMBeneficiaryidentityList(identity.getIdentities());
+					.identityEditDTOListToMBeneficiaryidentityList(identity.getIdentities());
 			logger.debug("identities to upsert = " + OutputMapper.gson().toJson(identities));
 
 			// new logic for getting beneficiary identities, 26-09-2018
@@ -821,7 +821,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 		logger.debug("identity.getChangeInFamilyDetails = " + identity.getChangeInFamilyDetails());
 		if (Boolean.TRUE.equals(identity.getChangeInFamilyDetails())) {
 			List<MBeneficiaryfamilymapping> fbMaps = editMapper
-					.IdentityEditDTOListToMBeneficiaryfamilymappingList(identity.getBenFamilyDTOs());
+					.identityEditDTOListToMBeneficiaryfamilymappingList(identity.getBenFamilyDTOs());
 
 			logger.debug("family map to upsert = " + OutputMapper.gson().toJson(fbMaps));
 
@@ -1043,7 +1043,7 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 
 		// new logic (18-09-2018, Neeraj kumar)
 		if (null != identity.getBenFamilyDTOs()) {
-			fIdenList = mapper.IdentityDTOListToMBeneficiaryfamilymappingList(identity.getBenFamilyDTOs());
+			fIdenList = mapper.identityDTOListToMBeneficiaryfamilymappingList(identity.getBenFamilyDTOs());
 			if (fIdenList != null) {
 				for (MBeneficiaryfamilymapping bfMapping : fIdenList) {
 					bfMapping.setBenMapId(benMapping2.getBenMapId());
@@ -1085,7 +1085,7 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		List<MBeneficiaryidentity> mIdenList2 = new ArrayList<MBeneficiaryidentity>();
 		if (null != identity.getIdentities()) {
 			List<MBeneficiaryidentity> mIdenList = mapper
-					.IdentityDTOListToMBeneficiaryidentityList(identity.getIdentities());
+					.identityDTOListToMBeneficiaryidentityList(identity.getIdentities());
 			mIdenList.forEach(mIden -> {
 				mIden.setBenMapId(benMapping2.getBenMapId());
 				mIden.setCreatedBy(identity.getAgentName());
@@ -1108,7 +1108,7 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		}
 
 		logger.info("IdentityService.createIdentity - end. id = " + benMapping.getBenMapId());
-		return partialMapper.MBeneficiarymappingToBeneficiaryCreateResp(benMapping);
+		return partialMapper.mBeneficiarymappingToBeneficiaryCreateResp(benMapping);
 	}
 
 	public String getReservedIdList() {
@@ -1171,7 +1171,7 @@ public List<BeneficiariesPartialDTO> getBeneficiariesPartialDeatilsByBenRegIdLis
 				for (Object[] objArr : benMapObjArr) {
 					MBeneficiarymapping benMap = this.getBeneficiariesDTONewPartial(objArr);
 
-					list.add(partialMapper.MBeneficiarymappingToBeneficiariesPartialDTO(benMap));
+					list.add(partialMapper.mBeneficiarymappingToBeneficiariesPartialDTO(benMap));
 				}
 			}
 			logger.info("benMap size" + (list.size() == 0 ? "No Beneficiary Found" : list.size()));
@@ -1187,22 +1187,21 @@ public List<BeneficiariesPartialDTO> getBeneficiariesPartialDeatilsByBenRegIdLis
 	 * Get partial details of beneficiaries (first name middle name and last name)
 	 * list on benId's list
 	 * 
-	 * @param BenRegIds
+	 * @param benRegIds
 	 * @return {@link List} Beneficiaries
 	 */
-	public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInteger> BenRegIds) {
+	public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInteger> benRegIds) {
 
 		logger.info("IdentityService.getBeneficiariesDeatilsByBenRegIdList - end");
 		List<BeneficiariesDTO> list = new ArrayList<BeneficiariesDTO>();
 
 		// new logic, 19-12-2018
 		List<Object[]> benMapObjArr = new ArrayList<>();
-		if (BenRegIds != null && BenRegIds.size() > 0) {
-			benMapObjArr = mappingRepo.getBenMappingByRegIDList(BenRegIds);
+		if (benRegIds != null && benRegIds.size() > 0) {
+			benMapObjArr = mappingRepo.getBenMappingByRegIDList(benRegIds);
 			if (benMapObjArr != null && benMapObjArr.size() > 0) {
 				for (Object[] objArr : benMapObjArr) {
 					MBeneficiarymapping benMap = this.getBeneficiariesDTONew(objArr);
-//					logger.info("benMap " + benMap);
 
 					list.add(this.getBeneficiariesDTO(benMap));
 				}
@@ -1224,7 +1223,7 @@ public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInte
 	 */
 	private BeneficiariesDTO getBeneficiariesDTO(MBeneficiarymapping benMap) {
 
-		BeneficiariesDTO bdto = mapper.MBeneficiarymappingToBeneficiariesDTO(benMap);
+		BeneficiariesDTO bdto = mapper.mBeneficiarymappingToBeneficiariesDTO(benMap);
 		bdto.setBeneficiaryFamilyTags(
 				mapper.mapToMBeneficiaryfamilymappingWithBenFamilyDTOList(benMap.getMBeneficiaryfamilymappings()));
 		bdto.setBeneficiaryIdentites(
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index ddeffe17..5c9bd728 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -51,7 +51,7 @@
 import com.iemr.common.identity.controller.rmnch.RmnchMobileAppController;
 import com.iemr.common.identity.data.rmnch.BenHealthIDDetails;
 import com.iemr.common.identity.data.rmnch.GetBenRequestHandler;
-import com.iemr.common.identity.data.rmnch.NCD_TB_HRP_data;
+import com.iemr.common.identity.data.rmnch.NcdTbHrpData;
 import com.iemr.common.identity.data.rmnch.RMNCHBeneficiaryDetailsRmnch;
 import com.iemr.common.identity.data.rmnch.RMNCHBornBirthDetails;
 import com.iemr.common.identity.data.rmnch.RMNCHCBACdetails;
@@ -337,10 +337,10 @@ public String getBenDataByAsha(String requestOBJ, String authorisation) throws E
 
 	private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressList, int totalPage,
 			String authorisation) {
-		RMNCHHouseHoldDetails benHouseHoldRMNCH_ROBJ;
-		RMNCHBeneficiaryDetailsRmnch benDetailsRMNCH_OBJ;
-		RMNCHBornBirthDetails benBotnBirthRMNCH_ROBJ;
-		RMNCHCBACdetails benCABCRMNCH_ROBJ;
+		RMNCHHouseHoldDetails benHouseHoldRMNCHROBJ;
+		RMNCHBeneficiaryDetailsRmnch benDetailsRMNCHOBJ;
+		RMNCHBornBirthDetails benBotnBirthRMNCHROBJ;
+		RMNCHCBACdetails benCABCRMNCHROBJ;
 
 		RMNCHMBeneficiarydetail benDetailsOBJ;
 		RMNCHMBeneficiaryAccount benAccountOBJ;
@@ -356,10 +356,10 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 			try {
 				RMNCHMBeneficiarymapping m = rMNCHMBenMappingRepo.getByAddressIDAndVanID(a.getId(), a.getVanID());
 				if (m != null) {
-					benHouseHoldRMNCH_ROBJ = new RMNCHHouseHoldDetails();
-					benDetailsRMNCH_OBJ = new RMNCHBeneficiaryDetailsRmnch();
-					benBotnBirthRMNCH_ROBJ = new RMNCHBornBirthDetails();
-					benCABCRMNCH_ROBJ = new RMNCHCBACdetails();
+					benHouseHoldRMNCHROBJ = new RMNCHHouseHoldDetails();
+					benDetailsRMNCHOBJ = new RMNCHBeneficiaryDetailsRmnch();
+					benBotnBirthRMNCHROBJ = new RMNCHBornBirthDetails();
+					benCABCRMNCHROBJ = new RMNCHCBACdetails();
 
 					benDetailsOBJ = new RMNCHMBeneficiarydetail();
 					benAccountOBJ = new RMNCHMBeneficiaryAccount();
@@ -388,105 +388,105 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 						benID = rMNCHMBenRegIdMapRepo.getBenIdFromRegID(m.getBenRegId().longValue());
 
 					if (m.getBenRegId() != null) {
-						benDetailsRMNCH_OBJ = rMNCHBeneficiaryDetailsRmnchRepo
+						benDetailsRMNCHOBJ = rMNCHBeneficiaryDetailsRmnchRepo
 								.getByRegID((m.getBenRegId()).longValue());
-						benBotnBirthRMNCH_ROBJ = rMNCHBornBirthDetailsRepo.getByRegID((m.getBenRegId()).longValue());
+						benBotnBirthRMNCHROBJ = rMNCHBornBirthDetailsRepo.getByRegID((m.getBenRegId()).longValue());
 
-						benCABCRMNCH_ROBJ = rMNCHCBACDetailsRepo.getByRegID((m.getBenRegId()).longValue());
+						benCABCRMNCHROBJ = rMNCHCBACDetailsRepo.getByRegID((m.getBenRegId()).longValue());
 						// 20-09-2021,start
-						NCD_TB_HRP_data res = getHRP_NCD_TB_SuspectedStatus(m.getBenRegId().longValue(), authorisation,
+						NcdTbHrpData res = getHRP_NCD_TB_SuspectedStatus(m.getBenRegId().longValue(), authorisation,
 								benDetailsOBJ);
-						if (res != null && benCABCRMNCH_ROBJ != null) {
+						if (res != null && benCABCRMNCHROBJ != null) {
 							if (res.getConfirmed_hrp() != null)
-								benCABCRMNCH_ROBJ.setConfirmed_hrp(res.getConfirmed_hrp());
+								benCABCRMNCHROBJ.setConfirmed_hrp(res.getConfirmed_hrp());
 							if (res.getConfirmed_ncd() != null)
-								benCABCRMNCH_ROBJ.setConfirmed_ncd(res.getConfirmed_ncd());
+								benCABCRMNCHROBJ.setConfirmed_ncd(res.getConfirmed_ncd());
 							if (res.getConfirmed_tb() != null)
-								benCABCRMNCH_ROBJ.setConfirmed_tb(res.getConfirmed_tb());
+								benCABCRMNCHROBJ.setConfirmed_tb(res.getConfirmed_tb());
 							if (res.getConfirmed_ncd_diseases() != null)
-								benCABCRMNCH_ROBJ.setConfirmed_ncd_diseases(res.getConfirmed_ncd_diseases());
+								benCABCRMNCHROBJ.setConfirmed_ncd_diseases(res.getConfirmed_ncd_diseases());
 							if (res.getDiagnosis_status() != null)
-								benCABCRMNCH_ROBJ.setDiagnosis_status(res.getDiagnosis_status());
-							benCABCRMNCH_ROBJ = rMNCHCBACDetailsRepo.save(benCABCRMNCH_ROBJ);
+								benCABCRMNCHROBJ.setDiagnosis_status(res.getDiagnosis_status());
+							benCABCRMNCHROBJ = rMNCHCBACDetailsRepo.save(benCABCRMNCHROBJ);
 
 						}
 
 						// 20-09-2021,end
-						if (benDetailsRMNCH_OBJ != null && benDetailsRMNCH_OBJ.getHouseoldId() != null)
-							benHouseHoldRMNCH_ROBJ = rMNCHHouseHoldDetailsRepo
-									.getByHouseHoldID(benDetailsRMNCH_OBJ.getHouseoldId());
+						if (benDetailsRMNCHOBJ != null && benDetailsRMNCHOBJ.getHouseoldId() != null)
+							benHouseHoldRMNCHROBJ = rMNCHHouseHoldDetailsRepo
+									.getByHouseHoldID(benDetailsRMNCHOBJ.getHouseoldId());
 
 					}
-					if (benDetailsRMNCH_OBJ == null)
-						benDetailsRMNCH_OBJ = new RMNCHBeneficiaryDetailsRmnch();
+					if (benDetailsRMNCHOBJ == null)
+						benDetailsRMNCHOBJ = new RMNCHBeneficiaryDetailsRmnch();
 
 					// new mapping 30-06-2021
 					if (benDetailsOBJ.getMotherName() != null)
-						benDetailsRMNCH_OBJ.setMotherName(benDetailsOBJ.getMotherName());
+						benDetailsRMNCHOBJ.setMotherName(benDetailsOBJ.getMotherName());
 					if (benDetailsOBJ.getLiteracyStatus() != null)
-						benDetailsRMNCH_OBJ.setLiteracyStatus(benDetailsOBJ.getLiteracyStatus());
+						benDetailsRMNCHOBJ.setLiteracyStatus(benDetailsOBJ.getLiteracyStatus());
 
 					// bank
 					if (benAccountOBJ.getNameOfBank() != null)
-						benDetailsRMNCH_OBJ.setNameOfBank(benAccountOBJ.getNameOfBank());
+						benDetailsRMNCHOBJ.setNameOfBank(benAccountOBJ.getNameOfBank());
 					if (benAccountOBJ.getBranchName() != null)
-						benDetailsRMNCH_OBJ.setBranchName(benAccountOBJ.getBranchName());
+						benDetailsRMNCHOBJ.setBranchName(benAccountOBJ.getBranchName());
 					if (benAccountOBJ.getIfscCode() != null)
-						benDetailsRMNCH_OBJ.setIfscCode(benAccountOBJ.getIfscCode());
+						benDetailsRMNCHOBJ.setIfscCode(benAccountOBJ.getIfscCode());
 					if (benAccountOBJ.getBankAccount() != null)
-						benDetailsRMNCH_OBJ.setBankAccount(benAccountOBJ.getBankAccount());
+						benDetailsRMNCHOBJ.setBankAccount(benAccountOBJ.getBankAccount());
 
 					// location
 					if (benAddressOBJ.getCountyid() != null)
-						benDetailsRMNCH_OBJ.setCountryId(benAddressOBJ.getCountyid());
+						benDetailsRMNCHOBJ.setCountryId(benAddressOBJ.getCountyid());
 					if (benAddressOBJ.getPermCountry() != null)
-						benDetailsRMNCH_OBJ.setCountryName(benAddressOBJ.getPermCountry());
+						benDetailsRMNCHOBJ.setCountryName(benAddressOBJ.getPermCountry());
 
 					if (benAddressOBJ.getStatePerm() != null)
-						benDetailsRMNCH_OBJ.setStateId(benAddressOBJ.getStatePerm());
+						benDetailsRMNCHOBJ.setStateId(benAddressOBJ.getStatePerm());
 					if (benAddressOBJ.getPermState() != null)
-						benDetailsRMNCH_OBJ.setStateName(benAddressOBJ.getPermState());
+						benDetailsRMNCHOBJ.setStateName(benAddressOBJ.getPermState());
 
 					if (benAddressOBJ.getDistrictidPerm() != null) {
-						benDetailsRMNCH_OBJ.setDistrictid(benAddressOBJ.getDistrictidPerm());
+						benDetailsRMNCHOBJ.setDistrictid(benAddressOBJ.getDistrictidPerm());
 
 					}
 					if (benAddressOBJ.getDistrictnamePerm() != null) {
-						benDetailsRMNCH_OBJ.setDistrictname(benAddressOBJ.getDistrictnamePerm());
+						benDetailsRMNCHOBJ.setDistrictname(benAddressOBJ.getDistrictnamePerm());
 
 					}
 
 					if (benAddressOBJ.getPermSubDistrictId() != null)
-						benDetailsRMNCH_OBJ.setBlockId(benAddressOBJ.getPermSubDistrictId());
+						benDetailsRMNCHOBJ.setBlockId(benAddressOBJ.getPermSubDistrictId());
 					if (benAddressOBJ.getPermSubDistrict() != null)
-						benDetailsRMNCH_OBJ.setBlockName(benAddressOBJ.getPermSubDistrict());
+						benDetailsRMNCHOBJ.setBlockName(benAddressOBJ.getPermSubDistrict());
 
 					if (benAddressOBJ.getVillageidPerm() != null)
-						benDetailsRMNCH_OBJ.setVillageId(benAddressOBJ.getVillageidPerm());
+						benDetailsRMNCHOBJ.setVillageId(benAddressOBJ.getVillageidPerm());
 					if (benAddressOBJ.getVillagenamePerm() != null)
-						benDetailsRMNCH_OBJ.setVillageName(benAddressOBJ.getVillagenamePerm());
+						benDetailsRMNCHOBJ.setVillageName(benAddressOBJ.getVillagenamePerm());
 
 					if (benAddressOBJ.getPermServicePointId() != null)
-						benDetailsRMNCH_OBJ.setServicePointID(benAddressOBJ.getPermServicePointId());
+						benDetailsRMNCHOBJ.setServicePointID(benAddressOBJ.getPermServicePointId());
 					if (benAddressOBJ.getPermServicePoint() != null)
-						benDetailsRMNCH_OBJ.setServicePointName(benAddressOBJ.getPermServicePoint());
+						benDetailsRMNCHOBJ.setServicePointName(benAddressOBJ.getPermServicePoint());
 
 					if (benAddressOBJ.getPermZoneID() != null)
-						benDetailsRMNCH_OBJ.setZoneID(benAddressOBJ.getPermZoneID());
+						benDetailsRMNCHOBJ.setZoneID(benAddressOBJ.getPermZoneID());
 					if (benAddressOBJ.getPermZone() != null)
-						benDetailsRMNCH_OBJ.setZoneName(benAddressOBJ.getPermZone());
+						benDetailsRMNCHOBJ.setZoneName(benAddressOBJ.getPermZone());
 
 					if (benAddressOBJ.getPermAddrLine1() != null)
-						benDetailsRMNCH_OBJ.setAddressLine1(benAddressOBJ.getPermAddrLine1());
+						benDetailsRMNCHOBJ.setAddressLine1(benAddressOBJ.getPermAddrLine1());
 					if (benAddressOBJ.getPermAddrLine2() != null)
-						benDetailsRMNCH_OBJ.setAddressLine2(benAddressOBJ.getPermAddrLine2());
+						benDetailsRMNCHOBJ.setAddressLine2(benAddressOBJ.getPermAddrLine2());
 					if (benAddressOBJ.getPermAddrLine3() != null)
-						benDetailsRMNCH_OBJ.setAddressLine3(benAddressOBJ.getPermAddrLine3());
+						benDetailsRMNCHOBJ.setAddressLine3(benAddressOBJ.getPermAddrLine3());
 
 					// related benids
-					if (benDetailsRMNCH_OBJ.getRelatedBeneficiaryIdsDB() != null) {
+					if (benDetailsRMNCHOBJ.getRelatedBeneficiaryIdsDB() != null) {
 
-						String[] relatedBenIDsString = benDetailsRMNCH_OBJ.getRelatedBeneficiaryIdsDB().split(",");
+						String[] relatedBenIDsString = benDetailsRMNCHOBJ.getRelatedBeneficiaryIdsDB().split(",");
 						Long[] relatedBenIDs = new Long[relatedBenIDsString.length];
 						int pointer = 0;
 						for (String s : relatedBenIDsString) {
@@ -494,59 +494,59 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 							pointer++;
 						}
 
-						benDetailsRMNCH_OBJ.setRelatedBeneficiaryIds(relatedBenIDs);
+						benDetailsRMNCHOBJ.setRelatedBeneficiaryIds(relatedBenIDs);
 					}
 
 					if (benDetailsOBJ.getCommunity() != null)
-						benDetailsRMNCH_OBJ.setCommunity(benDetailsOBJ.getCommunity());
+						benDetailsRMNCHOBJ.setCommunity(benDetailsOBJ.getCommunity());
 					if (benDetailsOBJ.getCommunityId() != null)
-						benDetailsRMNCH_OBJ.setCommunityId(benDetailsOBJ.getCommunityId());
+						benDetailsRMNCHOBJ.setCommunityId(benDetailsOBJ.getCommunityId());
 					if (benContactOBJ.getPreferredPhoneNum() != null)
-						benDetailsRMNCH_OBJ.setContact_number(benContactOBJ.getPreferredPhoneNum());
+						benDetailsRMNCHOBJ.setContact_number(benContactOBJ.getPreferredPhoneNum());
 
 					if (benDetailsOBJ.getDob() != null)
-						benDetailsRMNCH_OBJ.setDob(benDetailsOBJ.getDob());
+						benDetailsRMNCHOBJ.setDob(benDetailsOBJ.getDob());
 					if (benDetailsOBJ.getFatherName() != null)
-						benDetailsRMNCH_OBJ.setFatherName(benDetailsOBJ.getFatherName());
+						benDetailsRMNCHOBJ.setFatherName(benDetailsOBJ.getFatherName());
 					if (benDetailsOBJ.getFirstName() != null)
-						benDetailsRMNCH_OBJ.setFirstName(benDetailsOBJ.getFirstName());
+						benDetailsRMNCHOBJ.setFirstName(benDetailsOBJ.getFirstName());
 					if (benDetailsOBJ.getGender() != null)
-						benDetailsRMNCH_OBJ.setGender(benDetailsOBJ.getGender());
+						benDetailsRMNCHOBJ.setGender(benDetailsOBJ.getGender());
 					if (benDetailsOBJ.getGenderId() != null)
-						benDetailsRMNCH_OBJ.setGenderId(benDetailsOBJ.getGenderId());
+						benDetailsRMNCHOBJ.setGenderId(benDetailsOBJ.getGenderId());
 
 					if (benDetailsOBJ.getMaritalstatus() != null)
-						benDetailsRMNCH_OBJ.setMaritalstatus(benDetailsOBJ.getMaritalstatus());
+						benDetailsRMNCHOBJ.setMaritalstatus(benDetailsOBJ.getMaritalstatus());
 					if (benDetailsOBJ.getMaritalstatusId() != null)
-						benDetailsRMNCH_OBJ.setMaritalstatusId(benDetailsOBJ.getMaritalstatusId());
+						benDetailsRMNCHOBJ.setMaritalstatusId(benDetailsOBJ.getMaritalstatusId());
 					if (benDetailsOBJ.getMarriageDate() != null)
-						benDetailsRMNCH_OBJ.setMarriageDate(benDetailsOBJ.getMarriageDate());
+						benDetailsRMNCHOBJ.setMarriageDate(benDetailsOBJ.getMarriageDate());
 
 					if (benDetailsOBJ.getReligion() != null)
-						benDetailsRMNCH_OBJ.setReligion(benDetailsOBJ.getReligion());
+						benDetailsRMNCHOBJ.setReligion(benDetailsOBJ.getReligion());
 					if (benDetailsOBJ.getReligionID() != null)
-						benDetailsRMNCH_OBJ.setReligionID(benDetailsOBJ.getReligionID());
+						benDetailsRMNCHOBJ.setReligionID(benDetailsOBJ.getReligionID());
 					if (benDetailsOBJ.getSpousename() != null)
-						benDetailsRMNCH_OBJ.setSpousename(benDetailsOBJ.getSpousename());
+						benDetailsRMNCHOBJ.setSpousename(benDetailsOBJ.getSpousename());
 
 					if (benImageOBJ != null && benImageOBJ.getUser_image() != null)
-						benDetailsRMNCH_OBJ.setUser_image(benImageOBJ.getUser_image());
+						benDetailsRMNCHOBJ.setUser_image(benImageOBJ.getUser_image());
 
 					// new fields
-					benDetailsRMNCH_OBJ.setRegistrationDate(benDetailsOBJ.getCreatedDate());
+					benDetailsRMNCHOBJ.setRegistrationDate(benDetailsOBJ.getCreatedDate());
 					if (benID != null)
-						benDetailsRMNCH_OBJ.setBenficieryid(benID.longValue());
+						benDetailsRMNCHOBJ.setBenficieryid(benID.longValue());
 
 					if (benDetailsOBJ.getLastName() != null)
-						benDetailsRMNCH_OBJ.setLastName(benDetailsOBJ.getLastName());
+						benDetailsRMNCHOBJ.setLastName(benDetailsOBJ.getLastName());
 
-					if (benDetailsRMNCH_OBJ.getCreatedBy() == null)
+					if (benDetailsRMNCHOBJ.getCreatedBy() == null)
 						if (benDetailsOBJ.getCreatedBy() != null)
-							benDetailsRMNCH_OBJ.setCreatedBy(benDetailsOBJ.getCreatedBy());
+							benDetailsRMNCHOBJ.setCreatedBy(benDetailsOBJ.getCreatedBy());
 
 					// age calculation
 					String ageDetails = "";
-					int age_val = 0;
+					int ageVal = 0;
 					String ageUnit = null;
 					if (benDetailsOBJ.getDob() != null) {
 
@@ -569,47 +569,47 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 
 						if (y > 0) {
 							ageDetails = y + " years - " + mo + " months";
-							age_val = y;
-							ageUnit = (age_val > 1) ? "Years" : "Year";
+							ageVal = y;
+							ageUnit = (ageVal > 1) ? "Years" : "Year";
 						} else {
 							if (mo > 0) {
 								ageDetails = mo + " months - " + d + " days";
-								age_val = mo;
-								ageUnit = (age_val > 1) ? "Months" : "Month";
+								ageVal = mo;
+								ageUnit = (ageVal > 1) ? "Months" : "Month";
 							} else {
 								ageDetails = d + " days";
-								age_val = d;
-								ageUnit = (age_val > 1) ? "Days" : "Day";
+								ageVal = d;
+								ageUnit = (ageVal > 1) ? "Days" : "Day";
 							}
 						}
 
 					}
 
-					benDetailsRMNCH_OBJ.setAgeFull(ageDetails);
-					benDetailsRMNCH_OBJ.setAge(age_val);
+					benDetailsRMNCHOBJ.setAgeFull(ageDetails);
+					benDetailsRMNCHOBJ.setAge(ageVal);
 					if (ageUnit != null)
-						benDetailsRMNCH_OBJ.setAge_unit(ageUnit);
+						benDetailsRMNCHOBJ.setAge_unit(ageUnit);
 
 					resultMap = new HashMap<>();
-					if (benHouseHoldRMNCH_ROBJ != null)
-						resultMap.put("householdDetails", benHouseHoldRMNCH_ROBJ);
+					if (benHouseHoldRMNCHROBJ != null)
+						resultMap.put("householdDetails", benHouseHoldRMNCHROBJ);
 					else
 						resultMap.put("householdDetails", new HashMap<String, Object>());
 
-					if (benBotnBirthRMNCH_ROBJ != null)
-						resultMap.put("bornbirthDeatils", benBotnBirthRMNCH_ROBJ);
+					if (benBotnBirthRMNCHROBJ != null)
+						resultMap.put("bornbirthDeatils", benBotnBirthRMNCHROBJ);
 					else
 						resultMap.put("bornbirthDeatils", new HashMap<String, Object>());
 
-					if (benCABCRMNCH_ROBJ != null)
-						resultMap.put("cbacDetails", benCABCRMNCH_ROBJ);
+					if (benCABCRMNCHROBJ != null)
+						resultMap.put("cbacDetails", benCABCRMNCHROBJ);
 					else
 						resultMap.put("cbacDetails", new HashMap<String, Object>());
 
-					resultMap.put("beneficiaryDetails", benDetailsRMNCH_OBJ);
+					resultMap.put("beneficiaryDetails", benDetailsRMNCHOBJ);
 
-					resultMap.put("houseoldId", benDetailsRMNCH_OBJ.getHouseoldId());
-					resultMap.put("benficieryid", benDetailsRMNCH_OBJ.getBenficieryid());
+					resultMap.put("houseoldId", benDetailsRMNCHOBJ.getHouseoldId());
+					resultMap.put("benficieryid", benDetailsRMNCHOBJ.getBenficieryid());
 					resultMap.put("BenRegId", m.getBenRegId());
 
 					// adding asha id / created by - user id
@@ -624,7 +624,7 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 						if (healthID != null)
 							resultMap.put("HealthID", healthID);
 					}
-					resultMap.put("ProviderServiceMapID", benDetailsRMNCH_OBJ.getProviderServiceMapID());
+					resultMap.put("ProviderServiceMapID", benDetailsRMNCHOBJ.getProviderServiceMapID());
 					resultMap.put("VanID", m.getVanID());
 
 					resultList.add(resultMap);
@@ -680,15 +680,15 @@ public List<String> fetchHealthIdByBenRegID(Long benRegID, String authorization)
 
 	}
 
-	public NCD_TB_HRP_data getHRP_NCD_TB_SuspectedStatus(Long benRegID, String authorization,
+	public NcdTbHrpData getHRP_NCD_TB_SuspectedStatus(Long benRegID, String authorization,
 			RMNCHMBeneficiarydetail benDetails) throws IEMRException {
-		NCD_TB_HRP_data response = null;
+		NcdTbHrpData response = null;
 		try {
 
 			if (benRegID != null) {
 				List<Object[]> obj = rMNCHCBACDetailsRepo.getVisitDetailsbyRegID(benRegID);
 				if (obj != null && obj.size() > 0) {
-					response = new NCD_TB_HRP_data();
+					response = new NcdTbHrpData();
 					Long visitCode = (((BigInteger) obj.get(0)[0])).longValue();
 					String visitCategory = (String) obj.get(0)[1];
 					switch (visitCategory) {
@@ -772,8 +772,8 @@ public String getConfirmedHRP(Long benRegID, Long visitCode, String authorizatio
 
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
@@ -829,8 +829,8 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) thr
 		return response;
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_Common(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_Common(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
@@ -888,12 +888,12 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_Common(Long benRegID, Long visitCode)
 		return response;
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
-				List<Object> obj = rMNCHCBACDetailsRepo.getDiagnosisProvidedNCD_Care(benRegID, visitCode);
+				List<Object> obj = rMNCHCBACDetailsRepo.getDiagnosisProvidedNCDCare(benRegID, visitCode);
 				if (obj != null && obj.size() > 0 && obj.get(0) != null) {
 					dp = obj.get(0).toString();
 					if (dp != null) {
diff --git a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
index 2dd5bd9b..b349e113 100644
--- a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
+++ b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
@@ -183,7 +183,7 @@ public void getBeneficiariesTest() throws NoResultException, QueryTimeoutExcepti
 		BeneficiariesDTO dto = new BeneficiariesDTO();
 		dto.setBenId(new BigInteger("301"));
 
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 		List<BeneficiariesDTO> benDTOList=identityService.getBeneficiaries(Mockito.mock(IdentitySearchDTO.class));
 		assertTrue(benDTOList.size()>0);
 	}
@@ -219,7 +219,7 @@ public void getBeneficiariesBenRegIDTest() throws NoResultException, QueryTimeou
 		identitylist.add(identity);
 		mBeneficiarymapping.setMBeneficiaryidentities(identitylist);
 
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 		
 		doReturn(mBeneficiarymapping).when(benMappingRepo).findByBenRegIdOrderByBenMapIdAsc(Mockito.any(BigInteger.class));
 		List<BeneficiariesDTO> benDTOList=identityService.getBeneficiaries(identitySearchDTO);
@@ -248,7 +248,7 @@ public void getBeneficiariesBenConTest1() throws NoResultException, QueryTimeout
 		
 		BeneficiariesDTO dto = new BeneficiariesDTO();
 		dto.setBenId(new BigInteger("301"));
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 		
 		List<BeneficiariesDTO> benDTOList=identityService.getBeneficiaries(identitySearchDTO);
 		assertTrue(benDTOList.size()>0);
@@ -271,7 +271,7 @@ public void getBeneficiariesByBenIdTest() throws NoResultException, QueryTimeout
 
 		doReturn(mapping).when(benRegIdMappingRepo).findByBeneficiaryID(Mockito.any(BigInteger.class));
 		doReturn(benMapList).when(benMappingRepo).findByMBeneficiaryregidmappingOrderByBenMapIdAsc(anyObject());
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(Mbeneficiary);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(Mbeneficiary);
 
 		List<BeneficiariesDTO> bList = identityService.getBeneficiariesByBenId(Mockito.any(BigInteger.class));
 		
@@ -313,7 +313,7 @@ public void getBeneficiariesByPhoneNumTest() throws NoResultException, QueryTime
 		
 		BeneficiariesDTO dto = new BeneficiariesDTO();
 		dto.setBenId(new BigInteger("301"));
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 		List<BeneficiariesDTO> dtoList=identityService.getBeneficiariesByPhoneNum(Mockito.anyString());
 		assertTrue(dtoList.size() > 0);
 	}
@@ -428,7 +428,7 @@ public void getBeneficiariesPartialDeatilsByBenRegIdListTest1()
 			doReturn(benDetail).when(detailRepo).findPartialBeneficiaryDetailByBenRegId(Mockito.any(BigInteger.class));
 			BeneficiariesPartialDTO beneficiariesPartialDTO=new BeneficiariesPartialDTO();
 			beneficiariesPartialDTO.setBeneficiaryDetailsId(new BigInteger("202"));
-			doReturn(beneficiariesPartialDTO).when(partialMapper).MBeneficiarymappingToBeneficiariesPartialDTO(beneficiarymapping);
+			doReturn(beneficiariesPartialDTO).when(partialMapper).mBeneficiarymappingToBeneficiariesPartialDTO(beneficiarymapping);
 			
 			List<BeneficiariesPartialDTO> dtoList=identityService.getBeneficiariesPartialDeatilsByBenRegIdList(Mockito.anyListOf(BigInteger.class));
 			assertTrue(dtoList.size()>0);
@@ -483,7 +483,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			
 			mBeneficiarymapping.setMBeneficiarydetail(beneficiarydetail);
 			
-			doReturn(mBeneficiarydetail).when(editMapper).IdentityEditDTOToMBeneficiarydetail(Mockito.any());
+			doReturn(mBeneficiarydetail).when(editMapper).identityEditDTOToMBeneficiarydetail(Mockito.any());
 
 			doReturn(mBeneficiarydetail).when(beneficiarymapping).getMBeneficiarydetail();
 			doReturn(new BigInteger("250")).when(beneficiarydetail).getBeneficiaryDetailsId();
@@ -500,7 +500,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			mBeneficiaryaddressList.add(mBeneficiaryaddress);
 			
 
-			doReturn(mBeneficiaryaddress).when(editMapper).IdentityEditDTOToMBeneficiaryaddress(Mockito.any());
+			doReturn(mBeneficiaryaddress).when(editMapper).identityEditDTOToMBeneficiaryaddress(Mockito.any());
 			
 			
 			mBeneficiarymapping.setMBeneficiaryaddress(beneficiaryaddress);
@@ -514,7 +514,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			MBeneficiaryidentity mBeneficiaryidentity=new MBeneficiaryidentity();
 			mBeneficiaryidentity.setBenIdentityId(new BigInteger("786"));
 			identityList.add(mBeneficiaryidentity);
-			doReturn(identityList).when(editMapper).IdentityEditDTOListToMBeneficiaryidentityList(Mockito.anyListOf(Identity.class));
+			doReturn(identityList).when(editMapper).identityEditDTOListToMBeneficiaryidentityList(Mockito.anyListOf(Identity.class));
 			doReturn(identityList).when(identityRepo).save(mBeneficiaryidentity);
 			
 			identityEditDTO.setChangeInContacts(true);
@@ -523,14 +523,14 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			mBeneficiarymapping.setMBeneficiarycontact(contact);
 			doReturn(contact).when(beneficiarymapping).getMBeneficiarycontact();
 			doReturn(new BigInteger("901")).when(mBeneficiarycontact).getBenContactsID();
-			doReturn(contact).when(editMapper).IdentityEdiDTOToMBeneficiarycontact(Mockito.any());
+			doReturn(contact).when(editMapper).identityEdiDTOToMBeneficiarycontact(Mockito.any());
 			
 			identityEditDTO.setChangeInFamilyDetails(true);
 			List<MBeneficiaryfamilymapping> familyMappingList=Lists.newArrayList();
 			MBeneficiaryfamilymapping familyMap=new MBeneficiaryfamilymapping();
 			familyMap.setBenFamilyMapId(new BigInteger("303"));
 			familyMappingList.add(familyMap);
-			doReturn(familyMappingList).when(editMapper).IdentityEditDTOListToMBeneficiaryfamilymappingList(Mockito.anyListOf(BenFamilyDTO.class));
+			doReturn(familyMappingList).when(editMapper).identityEditDTOListToMBeneficiaryfamilymappingList(Mockito.anyListOf(BenFamilyDTO.class));
 			identityService.editIdentity(identityEditDTO);
 		}
 
@@ -546,7 +546,7 @@ public void getBeneficiariesByBenRegIdTest() throws NoResultException, QueryTime
 			
 			doReturn(mBeneficiarymapping).when(benMappingRepo).findByBenRegIdOrderByBenMapIdAsc(Mockito.any(BigInteger.class));
 			
-			doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+			doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 			
 			List<BeneficiariesDTO> dtoList=identityService.getBeneficiariesByBenRegId(Mockito.any(BigInteger.class));
 			assertTrue(dtoList.size() > 0);
@@ -563,7 +563,7 @@ public void getBeneficiariesDeatilsByBenRegIdListTest()
 			
 			BeneficiariesDTO dto = new BeneficiariesDTO();
 			dto.setBenId(new BigInteger("301"));
-			doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+			doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 			List<BeneficiariesDTO> dtoList=identityService.getBeneficiariesDeatilsByBenRegIdList(Mockito.anyListOf(BigInteger.class));
 			assertTrue(dtoList.size() > 0);
 		}

From 8a24b2fee9198eb20d24f513191d11e6f55cc0f5 Mon Sep 17 00:00:00 2001
From: Anjana <anjana.j28@wipro.com>
Date: Fri, 23 Jun 2023 21:03:16 +0530
Subject: [PATCH 15/53] Added environment variable

---
 .github/workflows/sast-and-package.yml | 2 ++
 pom.xml                                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
index 179a33b3..f62dfc64 100644
--- a/.github/workflows/sast-and-package.yml
+++ b/.github/workflows/sast-and-package.yml
@@ -27,6 +27,8 @@ jobs:
         languages: Java    
     - name: Build with Maven
       run: mvn clean install
+      env:
+        ENV_VAR: test
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
       with:
diff --git a/pom.xml b/pom.xml
index 019dca58..7fe31aa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
-		<environment>dev</environment>
+		<environment>${ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>

From d58d096f5a498e6cb8d20ee2f54c4c52f50e17dd Mon Sep 17 00:00:00 2001
From: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Date: Mon, 26 Jun 2023 09:38:44 +0530
Subject: [PATCH 16/53] Added password changes & edit environment variable
 (#16)

* Added environment variable

* Added password changes
---
 pom.xml                                       |  2 +-
 src/main/environment/common_test.properties   |  6 +-
 .../iemr/common/identity/config/DBConfig.java | 11 +--
 .../common/identity/utils/CryptoUtil.java     | 76 -------------------
 4 files changed, 7 insertions(+), 88 deletions(-)
 delete mode 100644 src/main/java/com/iemr/common/identity/utils/CryptoUtil.java

diff --git a/pom.xml b/pom.xml
index 7fe31aa3..4022d075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
-		<environment>${ENV_VAR}</environment>
+		<environment>${env.ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index 1bfacc2c..2cd539ec 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
-encDbPass=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
+spring.datasource.url=<Enter AMRIT DB URL here>
+encDbUserName=<Enter your AMRIT DB username>
+encDbPass=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/java/com/iemr/common/identity/config/DBConfig.java b/src/main/java/com/iemr/common/identity/config/DBConfig.java
index b61791c6..536992c0 100644
--- a/src/main/java/com/iemr/common/identity/config/DBConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/DBConfig.java
@@ -28,7 +28,6 @@
 import org.apache.tomcat.jdbc.pool.PoolProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
@@ -40,20 +39,16 @@
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import com.iemr.common.identity.utils.CryptoUtil;
 import com.iemr.common.identity.utils.config.ConfigProperties;
 
 @Configuration
 @EnableTransactionManagement
 @EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {
 		"com.iemr.common.identity.repo", "com.iemr.common.identity.repo.familyTag",
-		"com.iemr.common.identity.repo.rmnch" ,"com.iemr.common.identity.*"})
+		"com.iemr.common.identity.repo.rmnch", "com.iemr.common.identity.*" })
 
 public class DBConfig {
 	Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-	@Autowired
-	private CryptoUtil cryptoUtil;
 
 	@Primary
 	@Bean(name = "dataSource")
@@ -74,8 +69,8 @@ public DataSource dataSource() {
 		org.apache.tomcat.jdbc.pool.DataSource datasource = new org.apache.tomcat.jdbc.pool.DataSource();
 		datasource.setPoolProperties(p);
 
-		datasource.setUsername(cryptoUtil.decrypt(ConfigProperties.getPropertyByName("encDbUserName")));
-		datasource.setPassword(cryptoUtil.decrypt(ConfigProperties.getPropertyByName("encDbPass")));
+		datasource.setUsername(ConfigProperties.getPropertyByName("encDbUserName"));
+		datasource.setPassword(ConfigProperties.getPropertyByName("encDbPass"));
 
 		return datasource;
 	}
diff --git a/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java b/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java
deleted file mode 100644
index 88ebe994..00000000
--- a/src/main/java/com/iemr/common/identity/utils/CryptoUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.utils;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CryptoUtil {
-
-	private static final Logger logger = LoggerFactory.getLogger(CryptoUtil.class);
-	private static final String ALGORITHM = "AES";
-	private static final String SECRET_KEY = "dev-envro-secret";
-
-	public String encrypt(String value) throws Exception {
-		SecretKey secretKey = new SecretKeySpec(SECRET_KEY.getBytes(StandardCharsets.UTF_8), ALGORITHM);
-		Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-		cipher.init(Cipher.ENCRYPT_MODE, secretKey);
-		byte[] encryptedBytes = cipher.doFinal(addPadding(value).getBytes(StandardCharsets.UTF_8));
-		return Base64.getEncoder().encodeToString(encryptedBytes);
-	}
-
-	public String decrypt(String encryptedValue) {
-		try {
-			SecretKey secretKey = new SecretKeySpec(SECRET_KEY.getBytes(StandardCharsets.UTF_8), ALGORITHM);
-			Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-			cipher.init(Cipher.DECRYPT_MODE, secretKey);
-			byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedValue));
-			return removePadding(new String(decryptedBytes, StandardCharsets.UTF_8));
-		} catch (Exception e) {
-			logger.error("Exception while decrypting string. Intentionally throwing null pointer", e);
-			return null;
-		}
-	}
-
-	private String addPadding(String value) {
-		int paddingLength = 16 - (value.length() % 16);
-		StringBuilder paddedValue = new StringBuilder(value);
-		for (int i = 0; i < paddingLength; i++) {
-			paddedValue.append((char) paddingLength);
-		}
-		return paddedValue.toString();
-	}
-
-	private String removePadding(String value) {
-		int paddingLength = value.charAt(value.length() - 1);
-		return value.substring(0, value.length() - paddingLength);
-	}
-}

From 97d4b372891203e34c64b17fbcf180446e2615de Mon Sep 17 00:00:00 2001
From: Anjana <anjana.j28@wipro.com>
Date: Tue, 27 Jun 2023 19:21:13 +0530
Subject: [PATCH 17/53] Passing environment variable

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4022d075..ccfef639 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
-		<environment>${env.ENV_VAR}</environment>
+		<environment>${{env.ENV_VAR}}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>

From dc537c8ff8241c7935200ef3872c9eb4d49b3029 Mon Sep 17 00:00:00 2001
From: Anjana KJ <134688551+Anjana2310@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:24:28 +0530
Subject: [PATCH 18/53] Passing environment variable (#17)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4022d075..ccfef639 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
-		<environment>${env.ENV_VAR}</environment>
+		<environment>${{env.ENV_VAR}}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>

From 4c515e58a1b986baead5341d92637f3cc6089b5c Mon Sep 17 00:00:00 2001
From: Anjana <anjana.j28@wipro.com>
Date: Tue, 27 Jun 2023 20:04:49 +0530
Subject: [PATCH 19/53] Passing environment variable

---
 .github/workflows/sast-and-package.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
index f62dfc64..edffbb97 100644
--- a/.github/workflows/sast-and-package.yml
+++ b/.github/workflows/sast-and-package.yml
@@ -27,8 +27,8 @@ jobs:
         languages: Java    
     - name: Build with Maven
       run: mvn clean install
-      env:
-        ENV_VAR: test
+    - name: Set Variable
+      run: echo "ENV_VAR=test" >> $GITHUB_ENV
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
       with:

From f0851e137c1285d5717996f6aa044aabbf2d7651 Mon Sep 17 00:00:00 2001
From: Anjana KJ <134688551+Anjana2310@users.noreply.github.com>
Date: Tue, 27 Jun 2023 23:03:10 +0530
Subject: [PATCH 20/53] Passing environment variable (#19)

---
 .github/workflows/sast-and-package.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
index edffbb97..940a532a 100644
--- a/.github/workflows/sast-and-package.yml
+++ b/.github/workflows/sast-and-package.yml
@@ -25,10 +25,12 @@ jobs:
       uses: github/codeql-action/init@v2
       with:
         languages: Java    
-    - name: Build with Maven
-      run: mvn clean install
     - name: Set Variable
       run: echo "ENV_VAR=test" >> $GITHUB_ENV
+    - name: Build with Maven
+      run: mvn clean install
+      env:
+        ENV_VAR: ${{env.ENV_VAR}}
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
       with:

From 8e70c6e82120455ac79b6cdd1aed79014e4cca23 Mon Sep 17 00:00:00 2001
From: Anjana KJ <134688551+Anjana2310@users.noreply.github.com>
Date: Wed, 28 Jun 2023 09:01:36 +0530
Subject: [PATCH 21/53] Passing environment variable (#20)

* Passing environment variable

* Passing environment variable
---
 .github/workflows/sast-and-package.yml | 11 +++++------
 pom.xml                                |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
index 940a532a..f6c3f458 100644
--- a/.github/workflows/sast-and-package.yml
+++ b/.github/workflows/sast-and-package.yml
@@ -2,7 +2,10 @@ name: Static Code Analysis and Packaging
 on:
   push:
     branches: [ "master","develop" ]
-    
+
+env:
+  ENV_VAR: test
+   
 jobs:
   CodeQL:
     runs-on: ubuntu-latest
@@ -25,12 +28,8 @@ jobs:
       uses: github/codeql-action/init@v2
       with:
         languages: Java    
-    - name: Set Variable
-      run: echo "ENV_VAR=test" >> $GITHUB_ENV
     - name: Build with Maven
-      run: mvn clean install
-      env:
-        ENV_VAR: ${{env.ENV_VAR}}
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
       with:
diff --git a/pom.xml b/pom.xml
index ccfef639..7fe31aa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
-		<environment>${{env.ENV_VAR}}</environment>
+		<environment>${ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>

From 4762e25ec8f39db94215e8800cc7df5074dce997 Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Fri, 30 Jun 2023 11:09:05 +0530
Subject: [PATCH 22/53] Workflow change (#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml
---
 .github/workflows/sast-and-package-prod.yml | 2 +-
 .github/workflows/sast-and-package.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sast-and-package-prod.yml b/.github/workflows/sast-and-package-prod.yml
index fb4f1a4e..ce3c0f7b 100644
--- a/.github/workflows/sast-and-package-prod.yml
+++ b/.github/workflows/sast-and-package-prod.yml
@@ -1,7 +1,7 @@
 name: Static Code Analysis and Packaging Prod
 on:
   push:
-    branches: [ "master","develop" ]
+    branches: [ "master" ]
     
 jobs:
   CodeQL:
diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
index f6c3f458..af20ce2f 100644
--- a/.github/workflows/sast-and-package.yml
+++ b/.github/workflows/sast-and-package.yml
@@ -1,7 +1,7 @@
 name: Static Code Analysis and Packaging
 on:
   push:
-    branches: [ "master","develop" ]
+    branches: [ "develop" ]
 
 env:
   ENV_VAR: test

From 1fdeb9080882373e85dc10b9657471440326b31d Mon Sep 17 00:00:00 2001
From: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Date: Fri, 30 Jun 2023 17:31:17 +0530
Subject: [PATCH 23/53] CreatedDate filed for Identity (#22)

* CreatedDate filed for Identity

* removed uncommented code
---
 .../identity/domain/MBeneficiaryAccount.java  |  2 +-
 .../identity/domain/MBeneficiaryImage.java    |  2 +-
 .../identity/domain/MBeneficiaryaddress.java  |  2 +-
 .../identity/domain/MBeneficiaryconsent.java  |  2 +-
 .../identity/domain/MBeneficiarycontact.java  |  2 +-
 .../identity/domain/MBeneficiarydetail.java   |  2 +-
 .../identity/domain/MBeneficiarymapping.java  |  2 +-
 .../domain/MBeneficiaryregidmapping.java      |  2 +-
 .../iemr/common/identity/dto/IdentityDTO.java |  1 +
 .../identity/mapper/IdentityMapper.java       | 17 +++---
 .../identity/service/IdentityService.java     | 57 +++++++++++++++++++
 11 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
index eedd6f38..e5c89bad 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
@@ -66,7 +66,7 @@ public class MBeneficiaryAccount {
 	@Column(name = "CreatedBy", length = 50, updatable = false)
 	private String createdBy;
 
-	@Column(name = "CreatedDate", insertable = false, updatable = false)
+	@Column(name = "CreatedDate")
 	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 	private Timestamp createdDate;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
index a762f64d..aaa29a35 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
@@ -53,7 +53,7 @@ public class MBeneficiaryImage {
 	private String processed;
 	@Column(name = "CreatedBy", updatable = false)
 	private String createdBy;
-	@Column(name = "CreatedDate", insertable = false, updatable = false)
+	@Column(name = "CreatedDate")
 	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 	private Timestamp createdDate;
 	@Column(name = "Reserved")
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
index 3a3a8f99..c2d163e9 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
@@ -56,7 +56,7 @@ public class MBeneficiaryaddress implements Serializable {
 	@Column(nullable = false, length = 50)
 	private String createdBy;
 
-	@Column(name = "CreatedDate", insertable = false, updatable = false)
+	@Column(name = "CreatedDate")
 	private Timestamp createdDate;
 
 	@Column(length = 50)
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
index 9ca86f44..dc03f1e4 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
@@ -56,7 +56,7 @@ public class MBeneficiaryconsent implements Serializable {
 	@Column(nullable = false, length = 50)
 	private String createdBy;
 
-	@Column(name = "CreatedDate", insertable = false, updatable = false)
+	@Column(name = "CreatedDate")
 	private Timestamp createdDate;
 
 	private Boolean deleted = false;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
index 7850e137..ee5e745d 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
@@ -58,7 +58,7 @@ public class MBeneficiarycontact implements Serializable {
 	@Column(nullable = false, length = 50, updatable = false)
 	private String createdBy;
 
-	@Column(name = "CreatedDate", insertable = false, updatable = false)
+	@Column(name = "CreatedDate")
 	private Timestamp createdDate;
 
 	private Boolean deleted = false;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
index f9bd7858..e5017ff1 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -70,7 +70,7 @@ public class MBeneficiarydetail implements Serializable {
 	@Column(nullable = false, length = 50, updatable = false)
 	private String createdBy;
 
-	@Column(name = "CreatedDate", insertable = false, updatable = false)
+	@Column(name = "CreatedDate")
 	private Timestamp createdDate;
 
 	private Boolean deleted = false;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
index 944df5c7..0e8e5bd3 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
@@ -61,7 +61,7 @@ public class MBeneficiarymapping implements Serializable {
 	@Column(nullable = false, length = 50)
 	private String createdBy;
 
-	@Column(name = "CreatedDate", insertable = false, updatable = false)
+	@Column(name = "CreatedDate")
 	private Timestamp createdDate;
 
 	@Column(nullable = false)
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
index 0e15dfcd..8dc86918 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
@@ -59,7 +59,7 @@ public class MBeneficiaryregidmapping implements Serializable {
 	@Column(length = 30)
 	private String createdBy;
 
-	@Column(name = "CreatedDate", insertable = false, updatable = false)
+	@Column(name = "CreatedDate")
 	private Timestamp createdDate;
 
 	private Boolean deleted = false;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
index 590bbfa3..9d268130 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
@@ -47,6 +47,7 @@ public class IdentityDTO {
 	private Integer stateId;
 	private String stateName;
 	private Integer providerServiceMapId;
+	private Timestamp createdDate;
 
 	private Integer areaId;
 	private Integer beneficiaryId;
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
index aaa690cb..32aa198f 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -56,7 +56,7 @@ public interface IdentityMapper {
 	IdentityMapper INSTANCE = Mappers.getMapper(IdentityMapper.class);
 
 	@Mappings({ @Mapping(source = "dto.agentName", target = "createdBy"),
-			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			@Mapping(source = "dto.createdDate", target = "createdDate"),
 			// new mapping added for data sync(van ID & parking place ID)
 			// 17-09-2018
 			@Mapping(source = "dto.vanID", target = "vanID"),
@@ -112,7 +112,8 @@ public interface IdentityMapper {
 			@Mapping(source = "dto.permanentAddress.addressValue", target = "permAddressValue"),
 			@Mapping(source = "dto.permanentAddress.pinCode", target = "permPinCode"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
-			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			//@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			@Mapping(source = "dto.createdDate", target = "createdDate"),
 
 			/*
 			 * New columns added for MMU integration 09-04-2018
@@ -168,7 +169,7 @@ public interface IdentityMapper {
 			@Mapping(source = "defaultNo", target = "sharePersonalDetailsWithNGO"),
 			@Mapping(source = "defaultYes", target = "sharePersonalDetailsWithSpouse"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
-			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			@Mapping(source = "dto.createdDate", target = "createdDate"),
 			// new mapping added for data sync(van ID & parking place ID)
 			// 17-09-2018
 			@Mapping(source = "dto.vanID", target = "vanID"),
@@ -196,7 +197,7 @@ public interface IdentityMapper {
 			@Mapping(source = "dto.contact.phoneTyp5", target = "phoneTyp5"),
 			@Mapping(source = "dto.preferredEmailId", target = "emailId"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
-			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			@Mapping(source = "dto.createdDate", target = "createdDate"),
 			// new mapping added for data sync(van ID & parking place ID)
 			// 17-09-2018
 			@Mapping(source = "dto.vanID", target = "vanID"),
@@ -239,7 +240,7 @@ public interface IdentityMapper {
 			@Mapping(source = "dto.status", target = "status"), @Mapping(source = "dto.title", target = "title"),
 			@Mapping(source = "dto.titleId", target = "titleId"), @Mapping(source = "dto.zoneId", target = "zoneId"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
-			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			@Mapping(source = "dto.createdDate", target = "createdDate"),
 			@Mapping(target = "isHIVPositive", expression = "java(MBeneficiarydetail.setIsHIVPositive(dto.getIsHIVPositive()))"),
 			// Start MMU specific code
 			@Mapping(target = "ageAtMarriage", expression = "java(MBeneficiarydetail.getAgeAtMarriageCalc(dto.getDob(), dto.getMarriageDate(), "
@@ -293,7 +294,7 @@ MBeneficiaryfamilymapping identityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "dto.agentName", target = "registeredByName"),
 			@Mapping(source = "dto.eventTypeDate", target = "registeredDate"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
-			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			@Mapping(source = "dto.createdDate", target = "createdDate"),
 			@Mapping(source = "dto.vanID", target = "vanID"),
 			@Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID") })
 	MBeneficiaryservicemapping identityDTOToMBeneficiaryservicemapping(IdentityDTO dto);
@@ -583,7 +584,7 @@ List<BenFamilyDTO> mapToMBeneficiaryfamilymappingWithBenFamilyDTOList(
 			@Mapping(source = "dto.ifscCode", target = "ifscCode"),
 			@Mapping(source = "dto.accountNo", target = "accountNo"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
-			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			@Mapping(source = "dto.createdDate", target = "createdDate"),
 			@Mapping(source = "dto.vanID", target = "vanID"),
 			@Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// End
@@ -595,7 +596,7 @@ List<BenFamilyDTO> mapToMBeneficiaryfamilymappingWithBenFamilyDTOList(
 
 	@Mappings({ @Mapping(source = "dto.benImage", target = "benImage"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
-			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
+			@Mapping(source = "dto.createdDate", target = "createdDate"),
 			// new mapping added for data sync(van ID & parking place ID)
 			// 17-09-2018
 			@Mapping(source = "dto.vanID", target = "vanID"),
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 9f925f64..afb951ed 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -24,8 +24,11 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
@@ -937,6 +940,12 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 			regMap = queue.removeFirst();
 		}
 		regMap.setReserved(true);
+		if (regMap.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			regMap.setCreatedDate(ts);
+		}
 
 		regIdRepo.save(regMap);
 
@@ -967,6 +976,12 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 			logger.debug("identity.getPermanentAddress = " + identity.getPermanentAddress());
 			mAddr.setEmergencyAddress(identity.getPermanentAddress());
 		}
+		if (mAddr.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			mAddr.setCreatedDate(ts);
+		}
 
 		mAddr = addressRepo.save(mAddr);
 		logger.info("IdentityService.createIdentity - Address saved - id = " + mAddr.getBenAddressID());
@@ -976,6 +991,12 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 
 		MBeneficiaryconsent mConsnt = mapper.identityDTOToDefaultMBeneficiaryconsent(identity, true, false);
 		logger.info("IdentityService.createIdentity - saving Consent");
+		if (mConsnt.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			mConsnt.setCreatedDate(ts);
+		}
 		mConsnt = consentRepo.save(mConsnt);
 		logger.info("IdentityService.createIdentity - Consent saved - id = " + mConsnt.getBenConsentID());
 
@@ -984,6 +1005,12 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 
 		logger.info("IdentityService.createIdentity - saving Contacts");
 		MBeneficiarycontact mContc = mapper.identityDTOToMBeneficiarycontact(identity);
+		if (mContc.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			mContc.setCreatedDate(ts);
+		}
 		mContc = contactRepo.save(mContc);
 		logger.info("IdentityService.createIdentity - Contacts saved - id = " + mContc.getBenContactsID());
 
@@ -992,6 +1019,12 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 
 		logger.info("IdentityService.createIdentity - saving Details");
 		MBeneficiarydetail mDetl = mapper.identityDTOToMBeneficiarydetail(identity);
+		if (mDetl.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			mDetl.setCreatedDate(ts);
+		}
 		mDetl = detailRepo.save(mDetl);
 		logger.info("IdentityService.createIdentity - Details saved - id = " + mDetl.getBeneficiaryDetailsId());
 
@@ -999,11 +1032,23 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		int i3 = detailRepo.updateVanSerialNo(mDetl.getBeneficiaryDetailsId());
 
 		MBeneficiaryAccount bankOBJ = mapper.identityDTOToMBeneficiaryAccount(identity);
+		if (bankOBJ.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			bankOBJ.setCreatedDate(ts);
+		}
 		bankOBJ = accountRepo.save(bankOBJ);
 		// Update van serial no for data sync
 		int i4 = accountRepo.updateVanSerialNo(bankOBJ.getBenAccountID());
 
 		MBeneficiaryImage benImageOBJ = mapper.identityDTOToMBeneficiaryImage(identity);
+		if (benImageOBJ.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			benImageOBJ.setCreatedDate(ts);
+		}
 		benImageOBJ = imageRepo.save(benImageOBJ);
 
 		// Update van serial no for data sync
@@ -1031,6 +1076,12 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		// END
 
 		regIdRepo.save(regMap);
+		if (benMapping.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			benMapping.setCreatedDate(ts);
+		}
 
 		benMapping = mappingRepo.save(benMapping);
 		// Update van serial no for data sync
@@ -1073,6 +1124,12 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		logger.info("IdentityService.createIdentity - saving Service Map");
 		MBeneficiaryservicemapping sMap = mapper.identityDTOToMBeneficiaryservicemapping(identity);
 		sMap.setBenMapId(benMapping.getBenMapId());
+		if (sMap.getCreatedDate() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+			String DateToStoreInDataBase = sdf.format(new Date());
+			Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+			sMap.setCreatedDate(ts);
+		}
 		sMap = serviceMapRepo.save(sMap);
 		logger.info("IdentityService.createIdentity - ServiceMap saved  - id = " + sMap.getBenServiceMapID());
 

From 957e8ebf128ca27f32f8c4a8a7251c3a2d647197 Mon Sep 17 00:00:00 2001
From: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:36:25 +0530
Subject: [PATCH 24/53] Send SMS null Id issue (#23)

* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue
---
 .../iemr/common/identity/config/DBConfig.java | 93 -------------------
 .../identity/service/IdentityService.java     |  4 +-
 2 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 src/main/java/com/iemr/common/identity/config/DBConfig.java

diff --git a/src/main/java/com/iemr/common/identity/config/DBConfig.java b/src/main/java/com/iemr/common/identity/config/DBConfig.java
deleted file mode 100644
index 536992c0..00000000
--- a/src/main/java/com/iemr/common/identity/config/DBConfig.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.config;
-
-import javax.persistence.EntityManagerFactory;
-import javax.sql.DataSource;
-
-import org.apache.tomcat.jdbc.pool.PoolConfiguration;
-import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import com.iemr.common.identity.utils.config.ConfigProperties;
-
-@Configuration
-@EnableTransactionManagement
-@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {
-		"com.iemr.common.identity.repo", "com.iemr.common.identity.repo.familyTag",
-		"com.iemr.common.identity.repo.rmnch", "com.iemr.common.identity.*" })
-
-public class DBConfig {
-	Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-
-	@Primary
-	@Bean(name = "dataSource")
-	@ConfigurationProperties(prefix = "spring.datasource")
-	public DataSource dataSource() {
-		PoolConfiguration p = new PoolProperties();
-		p.setMaxActive(30);
-		p.setMaxIdle(15);
-		p.setMinIdle(5);
-		p.setInitialSize(5);
-		p.setMaxWait(10000);
-		p.setMinEvictableIdleTimeMillis(15000);
-		p.setRemoveAbandoned(true);
-		p.setLogAbandoned(true);
-		p.setRemoveAbandonedTimeout(600);
-		p.setTestOnBorrow(true);
-		p.setValidationQuery("SELECT 1");
-		org.apache.tomcat.jdbc.pool.DataSource datasource = new org.apache.tomcat.jdbc.pool.DataSource();
-		datasource.setPoolProperties(p);
-
-		datasource.setUsername(ConfigProperties.getPropertyByName("encDbUserName"));
-		datasource.setPassword(ConfigProperties.getPropertyByName("encDbPass"));
-
-		return datasource;
-	}
-
-	@Primary
-	@Bean(name = "entityManagerFactory")
-	public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder,
-			@Qualifier("dataSource") DataSource dataSource) {
-		return builder.dataSource(dataSource).packages("com.iemr.common.identity.*", "com.iemr.common.identity.data.*",
-				"com.iemr.common.identity.domain.*").persistenceUnit("db_identity").build();
-	}
-
-	@Primary
-	@Bean(name = "transactionManager")
-	public PlatformTransactionManager transactionManager(
-			@Qualifier("entityManagerFactory") EntityManagerFactory entityManagerFactory) {
-		return new JpaTransactionManager(entityManagerFactory);
-	}
-
-}
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index afb951ed..e50caa66 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -321,8 +321,8 @@ public List<BeneficiariesDTO> getBeneficiariesByBenId(BigInteger benId)
 		logger.info("IdentityService.getBeneficiariesByBenId - start, beneficiaryID : " + benId);
 		List<BeneficiariesDTO> list = new ArrayList<BeneficiariesDTO>();
 
-		MBeneficiaryregidmapping regId = regIdRepo.findByBeneficiaryID(benId);
-
+		//MBeneficiaryregidmapping regId = regIdRepo.findByBeneficiaryID(benId);
+		MBeneficiaryregidmapping regId=regIdRepo.findOne(benId);
 		if (regId != null && regId.getBenRegId() != null) {
 			List<Object[]> benMapObjArr = mappingRepo.getBenMappingByRegID(regId.getBenRegId());
 

From ff279d474b92a279e2e8a211b68adcbf04e547d7 Mon Sep 17 00:00:00 2001
From: Indrani Bandyopadhyay <IN40068837@wipro.com>
Date: Tue, 11 Jul 2023 20:25:37 +0530
Subject: [PATCH 25/53] mmu cr changes

---
 .../com/iemr/common/identity/domain/MBeneficiarydetail.java | 6 ++++++
 .../java/com/iemr/common/identity/dto/BenDetailDTO.java     | 1 +
 src/main/java/com/iemr/common/identity/dto/IdentityDTO.java | 1 +
 .../java/com/iemr/common/identity/dto/IdentityEditDTO.java  | 1 +
 .../com/iemr/common/identity/mapper/IdentityEditMapper.java | 1 +
 .../com/iemr/common/identity/mapper/IdentityMapper.java     | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
index e5017ff1..fa56e066 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -39,12 +39,15 @@
 
 import com.google.gson.annotations.Expose;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Table(name = "i_beneficiarydetails")
 @NamedQuery(name = "MBeneficiarydetail.findAll", query = "SELECT m FROM MBeneficiarydetail m order by beneficiaryDetailsId asc")
 @Data
+@AllArgsConstructor
 public class MBeneficiarydetail implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final int START_YEAR = 1970;
@@ -230,6 +233,9 @@ public class MBeneficiarydetail implements Serializable {
 	@Expose
 	@Column(name = "VanSerialNo", updatable = false)
 	private BigInteger vanSerialNo;
+	
+	@Column(name = "MonthlyFamilyIncome")
+	private String monthlyFamilyIncome;
 
 	public MBeneficiarydetail() {
 
diff --git a/src/main/java/com/iemr/common/identity/dto/BenDetailDTO.java b/src/main/java/com/iemr/common/identity/dto/BenDetailDTO.java
index 4eb761bf..e23e09c5 100644
--- a/src/main/java/com/iemr/common/identity/dto/BenDetailDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BenDetailDTO.java
@@ -73,6 +73,7 @@ public class BenDetailDTO implements Serializable {
 	private Integer titleId;
 	private Integer communityId;
 	private Integer educationId;
+	private String monthlyFamilyIncome;
 
 	// Start 1097
 	private Integer beneficiaryAge;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
index 9d268130..4201146b 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
@@ -120,6 +120,7 @@ public class IdentityDTO {
 	private Integer ageAtMarriage;
 	private Integer incomeStatusId;
 	private String incomeStatus;
+	private String monthlyFamilyIncome;
 
 	@Expose
 	private Integer vanID;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
index 5efb3c79..bf16e2d9 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
@@ -104,6 +104,7 @@ public class IdentityEditDTO {
 	private String placeOfWork;
 	private Integer healthCareWorkerId;
 	private String healthCareWorker;
+	private String monthlyFamilyIncome;
 
 	// family details
 	private Boolean changeInFamilyDetails = false;
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
index 9b172375..9b99d5c7 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
@@ -206,6 +206,7 @@ MBeneficiaryconsent identityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO
 			@Mapping(source = "dto.gender", target = "gender"), @Mapping(source = "dto.genderId", target = "genderId"),
 			@Mapping(source = "dto.incomeStatusId", target = "incomeStatusId"),
 			@Mapping(source = "dto.incomeStatus", target = "incomeStatus"),
+			@Mapping(source = "dto.monthlyFamilyIncome", target = "monthlyFamilyIncome"),
 			@Mapping(source = "dto.lastName", target = "lastName"),
 			@Mapping(source = "dto.maritalStatusId", target = "maritalStatusId"),
 			@Mapping(source = "dto.maritalStatus", target = "maritalStatus"),
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
index 32aa198f..2a89348d 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -221,6 +221,7 @@ public interface IdentityMapper {
 			@Mapping(source = "dto.firstName", target = "firstName"),
 			@Mapping(source = "dto.gender", target = "gender"), @Mapping(source = "dto.genderId", target = "genderId"),
 			@Mapping(source = "dto.incomeStatus", target = "incomeStatus"),
+			@Mapping(source = "dto.monthlyFamilyIncome", target = "monthlyFamilyIncome"),
 			@Mapping(source = "dto.incomeStatusId", target = "incomeStatusId"),
 			@Mapping(source = "dto.lastName", target = "lastName"),
 			@Mapping(source = "dto.maritalStatusId", target = "maritalStatusId"),
@@ -374,6 +375,7 @@ MBeneficiaryfamilymapping identityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(target = "beneficiaryDetails.firstName", source = "map.MBeneficiarydetail.firstName"),
 			@Mapping(target = "beneficiaryDetails.gender", source = "map.MBeneficiarydetail.gender"),
 			@Mapping(target = "beneficiaryDetails.incomeStatus", source = "map.MBeneficiarydetail.incomeStatus"),
+			@Mapping(target = "beneficiaryDetails.monthlyFamilyIncome", source = "map.MBeneficiarydetail.monthlyFamilyIncome"),
 			@Mapping(target = "beneficiaryDetails.lastModDate", source = "map.MBeneficiarydetail.lastModDate"),
 			@Mapping(target = "beneficiaryDetails.lastName", source = "map.MBeneficiarydetail.lastName"),
 			@Mapping(target = "beneficiaryDetails.maritalStatus", source = "map.MBeneficiarydetail.maritalStatus"),

From 8e2bb8a0bc02da4a1a9c94df341429adef1a646d Mon Sep 17 00:00:00 2001
From: Ravi Shanigarapu <ravi.shanigarapu@wipro.com>
Date: Wed, 12 Jul 2023 11:18:11 +0530
Subject: [PATCH 26/53] update changes

---
 .../com/iemr/common/identity/domain/MBeneficiaryAccount.java  | 2 +-
 .../com/iemr/common/identity/domain/MBeneficiaryImage.java    | 2 +-
 .../com/iemr/common/identity/domain/MBeneficiaryaddress.java  | 2 +-
 .../com/iemr/common/identity/domain/MBeneficiaryconsent.java  | 2 +-
 .../com/iemr/common/identity/domain/MBeneficiarycontact.java  | 2 +-
 .../com/iemr/common/identity/domain/MBeneficiarydetail.java   | 2 +-
 .../com/iemr/common/identity/domain/MBeneficiarymapping.java  | 2 +-
 .../iemr/common/identity/domain/MBeneficiaryregidmapping.java | 2 +-
 .../com/iemr/common/identity/repo/BenRegIdMappingRepo.java    | 4 ++--
 .../com/iemr/common/identity/service/IdentityService.java     | 3 +--
 10 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
index e5c89bad..c63c1996 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
@@ -66,7 +66,7 @@ public class MBeneficiaryAccount {
 	@Column(name = "CreatedBy", length = 50, updatable = false)
 	private String createdBy;
 
-	@Column(name = "CreatedDate")
+	@Column(name = "CreatedDate",updatable = false)
 	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 	private Timestamp createdDate;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
index aaa29a35..1559595e 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
@@ -53,7 +53,7 @@ public class MBeneficiaryImage {
 	private String processed;
 	@Column(name = "CreatedBy", updatable = false)
 	private String createdBy;
-	@Column(name = "CreatedDate")
+	@Column(name = "CreatedDate",updatable = false)
 	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 	private Timestamp createdDate;
 	@Column(name = "Reserved")
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
index c2d163e9..99bb215d 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
@@ -56,7 +56,7 @@ public class MBeneficiaryaddress implements Serializable {
 	@Column(nullable = false, length = 50)
 	private String createdBy;
 
-	@Column(name = "CreatedDate")
+	@Column(name = "CreatedDate",updatable = false)
 	private Timestamp createdDate;
 
 	@Column(length = 50)
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
index dc03f1e4..761f4d3f 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java
@@ -56,7 +56,7 @@ public class MBeneficiaryconsent implements Serializable {
 	@Column(nullable = false, length = 50)
 	private String createdBy;
 
-	@Column(name = "CreatedDate")
+	@Column(name = "CreatedDate",updatable = false)
 	private Timestamp createdDate;
 
 	private Boolean deleted = false;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
index ee5e745d..652a65fb 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java
@@ -58,7 +58,7 @@ public class MBeneficiarycontact implements Serializable {
 	@Column(nullable = false, length = 50, updatable = false)
 	private String createdBy;
 
-	@Column(name = "CreatedDate")
+	@Column(name = "CreatedDate",updatable = false)
 	private Timestamp createdDate;
 
 	private Boolean deleted = false;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
index e5017ff1..28134093 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -70,7 +70,7 @@ public class MBeneficiarydetail implements Serializable {
 	@Column(nullable = false, length = 50, updatable = false)
 	private String createdBy;
 
-	@Column(name = "CreatedDate")
+	@Column(name = "CreatedDate",updatable = false)
 	private Timestamp createdDate;
 
 	private Boolean deleted = false;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
index 0e8e5bd3..5c12bab3 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
@@ -61,7 +61,7 @@ public class MBeneficiarymapping implements Serializable {
 	@Column(nullable = false, length = 50)
 	private String createdBy;
 
-	@Column(name = "CreatedDate")
+	@Column(name = "CreatedDate",updatable = false)
 	private Timestamp createdDate;
 
 	@Column(nullable = false)
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
index 8dc86918..3cfa4974 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
@@ -59,7 +59,7 @@ public class MBeneficiaryregidmapping implements Serializable {
 	@Column(length = 30)
 	private String createdBy;
 
-	@Column(name = "CreatedDate")
+	@Column(name = "CreatedDate",updatable = false)
 	private Timestamp createdDate;
 
 	private Boolean deleted = false;
diff --git a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
index 9154ab87..4087fa66 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
@@ -38,8 +38,8 @@
 @Repository
 public interface BenRegIdMappingRepo extends CrudRepository<MBeneficiaryregidmapping, BigInteger> {
 	List<MBeneficiaryregidmapping> findByBenRegIdOrderByBenRegIdAsc(BigInteger benRegId);
-
-	MBeneficiaryregidmapping findByBeneficiaryID(BigInteger beneficiaryID);
+	@Query("SELECT a FROM MBeneficiaryregidmapping a WHERE a.beneficiaryID =:beneficiaryID")
+	MBeneficiaryregidmapping findByBeneficiaryID(@Param("beneficiaryID") BigInteger beneficiaryID);
 
 	List<MBeneficiaryregidmapping> findByCreatedDateBetweenOrderByBenRegIdAsc(Timestamp fromDate, Timestamp toDate);
 
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index e50caa66..911bd81b 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -321,8 +321,7 @@ public List<BeneficiariesDTO> getBeneficiariesByBenId(BigInteger benId)
 		logger.info("IdentityService.getBeneficiariesByBenId - start, beneficiaryID : " + benId);
 		List<BeneficiariesDTO> list = new ArrayList<BeneficiariesDTO>();
 
-		//MBeneficiaryregidmapping regId = regIdRepo.findByBeneficiaryID(benId);
-		MBeneficiaryregidmapping regId=regIdRepo.findOne(benId);
+		MBeneficiaryregidmapping regId = regIdRepo.findByBeneficiaryID(benId);
 		if (regId != null && regId.getBenRegId() != null) {
 			List<Object[]> benMapObjArr = mappingRepo.getBenMappingByRegID(regId.getBenRegId());
 

From 55922d57c545af003db6acb8a35d7a839eac376d Mon Sep 17 00:00:00 2001
From: Indrani Bandyopadhyay <IN40068837@wipro.com>
Date: Mon, 17 Jul 2023 21:02:08 +0530
Subject: [PATCH 27/53] changes mmu cr

---
 src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java | 1 +
 .../java/com/iemr/common/identity/mapper/IdentityMapper.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
index 456b8030..46df1fb9 100644
--- a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
@@ -79,6 +79,7 @@ public int compareTo(BeneficiariesDTO ben) {
 	private String incomeStatus;
 	private BigInteger religionId;
 	private String religion;
+	private String monthlyFamilyIncome;
 	// End Outreach
 
 	// Start 1097
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
index 2a89348d..e3f8f877 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -466,6 +466,7 @@ MBeneficiaryfamilymapping identityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "map.MBeneficiarydetail.occupationId", target = "occupationId"),
 			@Mapping(source = "map.MBeneficiarydetail.occupation", target = "occupation"),
 			@Mapping(source = "map.MBeneficiarydetail.incomeStatus", target = "incomeStatus"),
+			@Mapping(source = "map.MBeneficiarydetail.monthlyFamilyIncome", target = "monthlyFamilyIncome"),
 			@Mapping(source = "map.MBeneficiarydetail.religionId", target = "religionId"),
 			@Mapping(source = "map.MBeneficiarydetail.religion", target = "religion"),
 			// End

From 6bc0ead229bd98b1852c232458006bdc87755a74 Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Tue, 1 Aug 2023 09:14:09 +0530
Subject: [PATCH 28/53] Update sast-and-package-prod.yml (#26)

---
 .github/workflows/sast-and-package-prod.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sast-and-package-prod.yml b/.github/workflows/sast-and-package-prod.yml
index ce3c0f7b..87fa08e1 100644
--- a/.github/workflows/sast-and-package-prod.yml
+++ b/.github/workflows/sast-and-package-prod.yml
@@ -1,8 +1,11 @@
 name: Static Code Analysis and Packaging Prod
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master"]
     
+env:
+  ENV_VAR: prod
+        
 jobs:
   CodeQL:
     runs-on: ubuntu-latest
@@ -30,7 +33,7 @@ jobs:
         languages: Java    
 
     - name: Build with Maven
-      run: mvn clean install -Denvironment=prod
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} 
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

From 78290a024e2368ec22c2658b0cc94baeba1b0922 Mon Sep 17 00:00:00 2001
From: Indrani Bandyopadhyay <IN40068837@wipro.com>
Date: Thu, 3 Aug 2023 16:49:35 +0530
Subject: [PATCH 29/53] edit api changes

---
 .../com/iemr/common/identity/domain/MBeneficiarydetail.java  | 3 ++-
 .../java/com/iemr/common/identity/dto/IdentityEditDTO.java   | 1 +
 .../com/iemr/common/identity/service/IdentityService.java    | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
index 08eea68b..038f0332 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -82,7 +82,8 @@ public class MBeneficiarydetail implements Serializable {
 
 	@Column(length = 45)
 	private String education;
-
+    
+	@Column(name = "EmergencyRegistration")
 	private Boolean emergencyRegistration;
 
 	@Column(length = 50)
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
index bf16e2d9..6b87d8b6 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
@@ -145,4 +145,5 @@ public class IdentityEditDTO {
 
 	private Integer vanID;
 	private Integer parkingPlaceId;
+	private boolean emergencyRegistration;
 }
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 911bd81b..fa3a42ac 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -719,6 +719,11 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			 */
 
 			logger.debug("Beneficiary details to update = " + new OutputMapper().gson().toJson(mbDetl));
+			if(benDetails.getEmergencyRegistration() != null && benDetails.getEmergencyRegistration()) {
+				mbDetl.setEmergencyRegistration(true);
+			}else {
+				mbDetl.setEmergencyRegistration(false);
+			}
 			detailRepo.save(mbDetl);
 		}
 

From 5b754e8d201e511c64a29628949e079ed114c79c Mon Sep 17 00:00:00 2001
From: Anjana <anjana.j28@wipro.com>
Date: Fri, 4 Aug 2023 19:26:45 +0530
Subject: [PATCH 30/53] Identity API cleanup and password masking

---
 src/main/environment/1097_dev.properties      |  6 ++---
 src/main/environment/1097_local.properties    |  6 ++---
 src/main/environment/1097_test.properties     |  6 ++---
 src/main/environment/1097_uat.properties      |  6 ++---
 src/main/environment/common_dev.properties    |  6 ++---
 src/main/environment/common_local.properties  |  6 ++---
 src/main/environment/common_test.properties   |  4 +--
 src/main/environment/common_uat.properties    |  6 ++---
 .../common/identity/config/SwaggerConfig.java |  2 +-
 .../controller/IdentityController.java        | 25 ++++++++++++++-----
 .../FamilyTaggingController.java              |  8 +++---
 ...ler.java => RMNCHMobileAppController.java} | 10 +++-----
 .../controller/version/VersionController.java |  3 +++
 .../rmnch/RmnchDataSyncServiceImpl.java       |  4 +--
 14 files changed, 56 insertions(+), 42 deletions(-)
 rename src/main/java/com/iemr/common/identity/controller/rmnch/{RmnchMobileAppController.java => RMNCHMobileAppController.java} (97%)

diff --git a/src/main/environment/1097_dev.properties b/src/main/environment/1097_dev.properties
index a18bb2fa..c168f8ac 100644
--- a/src/main/environment/1097_dev.properties
+++ b/src/main/environment/1097_dev.properties
@@ -1,8 +1,8 @@
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://10.208.122.32:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT 1097 DB URL here>
+spring.datasource.username=<Enter your AMRIT 1097 DB username>
+spring.datasource.password=<Enter your AMRIT 1097 DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/1097_local.properties b/src/main/environment/1097_local.properties
index 9081e012..bcaa98f8 100644
--- a/src/main/environment/1097_local.properties
+++ b/src/main/environment/1097_local.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://localhost:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=DSekNOtG9a+qythoUDNKuw==
-encDbPass=DSekNOtG9a+qythoUDNKuw==
+spring.datasource.url=<Enter AMRIT 1097 DB URL here>
+spring.datasource.username=<Enter your AMRIT 1097 DB username>
+spring.datasource.password=<Enter your AMRIT 1097 DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/1097_test.properties b/src/main/environment/1097_test.properties
index ea15db01..c168f8ac 100644
--- a/src/main/environment/1097_test.properties
+++ b/src/main/environment/1097_test.properties
@@ -1,8 +1,8 @@
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT 1097 DB URL here>
+spring.datasource.username=<Enter your AMRIT 1097 DB username>
+spring.datasource.password=<Enter your AMRIT 1097 DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/1097_uat.properties b/src/main/environment/1097_uat.properties
index 661eae9a..bcaa98f8 100644
--- a/src/main/environment/1097_uat.properties
+++ b/src/main/environment/1097_uat.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://172.16.19.43:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT 1097 DB URL here>
+spring.datasource.username=<Enter your AMRIT 1097 DB username>
+spring.datasource.password=<Enter your AMRIT 1097 DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
index 4ab76d99..91e41673 100644
--- a/src/main/environment/common_dev.properties
+++ b/src/main/environment/common_dev.properties
@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://10.208.122.32:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT DB URL here>
+spring.datasource.username=<Enter your AMRIT DB username>
+spring.datasource.password=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties
index 2ac89c9e..cf922ff1 100644
--- a/src/main/environment/common_local.properties
+++ b/src/main/environment/common_local.properties
@@ -1,5 +1,5 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://localhost:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=DSekNOtG9a+qythoUDNKuw==
-encDbPass=DSekNOtG9a+qythoUDNKuw==
+spring.datasource.url=<Enter AMRIT DB URL here>
+spring.datasource.username=<Enter your AMRIT DB username>
+spring.datasource.password=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index 2cd539ec..91e41673 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
 spring.datasource.url=<Enter AMRIT DB URL here>
-encDbUserName=<Enter your AMRIT DB username>
-encDbPass=<Enter your AMRIT DB password>
+spring.datasource.username=<Enter your AMRIT DB username>
+spring.datasource.password=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
index 055b485d..0f550fa5 100644
--- a/src/main/environment/common_uat.properties
+++ b/src/main/environment/common_uat.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://172.16.19.43:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT DB URL here>
+spring.datasource.username=<Enter your AMRIT DB username>
+spring.datasource.password=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
diff --git a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
index d16305ff..29f966b3 100644
--- a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
@@ -47,7 +47,7 @@ private ApiInfo metaData()
 	{
 		ApiInfoBuilder builder = new ApiInfoBuilder();
 		builder.contact(new Contact("AMRIT", "https://psmri.github.io/PSMRI/", "amrit@piramalswasthya.org"));
-		builder.description("A microservice for the creation and management of beneficaries.");
+		builder.description("A microservice for the creation and management of beneficiaries.");
 		builder.version("1.0");
 		builder.title("Identity API");
 		return builder.build();
diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index ff2f1327..274d0d05 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -83,6 +83,7 @@ public class IdentityController {
 	IdentityMapper mapper;
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get beneficiaries by advance search")
 	@PostMapping(path = "/advanceSearch", headers = "Authorization")
 	public @ResponseBody String getBeneficiaries(
 			@ApiParam(value = "{\"firstName\":\"String\",\"genderId\":\"Integer\",\"fatherName\":\"String\","
@@ -111,6 +112,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on beneficiary registration id")
 	@PostMapping(path = "/getByBenRegId", headers = "Authorization")
 	public @ResponseBody String getBeneficiariesByBeneficiaryRegId(
 			@ApiParam(value = "\"Integer\"") @RequestParam String benRegId) {
@@ -147,6 +149,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search identity based on beneficiary registration id")
 	@PostMapping(path = "/getByBenId", headers = "Authorization")
 	public @ResponseBody String getBeneficiariesByBeneficiaryId(
 			@ApiParam(value = "\"Integer\"") @RequestParam String benId) {
@@ -183,6 +186,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on phone number")
 	@PostMapping(path = "/getByPhoneNum", headers = "Authorization")
 	public @ResponseBody String getBeneficiariesByPhoneNum(
 			@ApiParam(value = "\"String\"") @RequestParam String phoneNum) {
@@ -213,8 +217,8 @@ public class IdentityController {
 		return response;
 	}
 
-	// search beneficiary by healthid / ABHA_Address
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on health ID / ABHA Address")
 	@PostMapping(path = "/getByAbhaAddress", headers = "Authorization")
 	public @ResponseBody String searhBeneficiaryByABHAAddress(
 			@ApiParam(value = "\"String\"") @RequestParam String healthID) {
@@ -246,8 +250,8 @@ public class IdentityController {
 		return response;
 	}
 
-	// search beneficiary by healthid / ABHA_Address
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on health ID number / ABHA ID number")
 	@PostMapping(path = "/getByAbhaIdNo", headers = "Authorization")
 	public @ResponseBody String searhBeneficiaryByABHAIdNo(
 			@ApiParam(value = "\"String\"") @RequestParam String healthIDNo) {
@@ -279,8 +283,8 @@ public class IdentityController {
 		return response;
 	}
 
-	// search beneficiary by family id
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on family id")
 	@PostMapping(path = "/searchByFamilyId", headers = "Authorization")
 	public @ResponseBody String searhBeneficiaryByFamilyId(
 			@ApiParam(value = "\"String\"") @RequestParam String familyId) {
@@ -309,8 +313,8 @@ public class IdentityController {
 		return response;
 	}
 
-	// search beneficiary by gov identity - aadhar, pan, voter id etc
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on government identity number")
 	@PostMapping(path = "/searhByGovIdentity", headers = "Authorization")
 	public @ResponseBody String searhBeneficiaryByGovIdentity(
 			@ApiParam(value = "\"String\"") @RequestParam String identity) {
@@ -345,6 +349,7 @@ public class IdentityController {
 	 * @return
 	 */
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Edit identity by agent")
 	@PostMapping(path = "/edit", headers = "Authorization")
 	public @ResponseBody String editIdentity(@ApiParam(value = "{\r\n" + "  \"eventTypeName\": \"String\",\r\n"
 			+ "  \"eventTypeDate\": \"Timestamp\",\r\n" + "  \"agentId\": \"Integer\",\r\n"
@@ -477,6 +482,7 @@ public class IdentityController {
 	 * @return
 	 */
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Create identity by agent")
 	@PostMapping(path = "/create", headers = "Authorization")
 	public @ResponseBody String createIdentity(@ApiParam(value = "{\r\n" + "  \"eventTypeName\": \"String\",\r\n"
 			+ "  \"eventTypeDate\": \"Timestamp\",\r\n" + "  \"agentId\": \"Integer\",\r\n"
@@ -595,6 +601,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Reserve identity by agent")
 	@PostMapping(path = "/reserve", headers = "Authorization")
 	public @ResponseBody String reserveIdentity(@RequestBody String reserveIdentity) {
 		logger.info("IdentityController.reserveIdentity - start");
@@ -615,6 +622,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Unreserve identity by agent")
 	@PostMapping(path = "/unreserve", headers = "Authorization")
 	public @ResponseBody String unreserveIdentity(@RequestBody String unreserve) {
 		logger.info("IdentityController.unreserveIdentity - start");
@@ -641,6 +649,7 @@ public class IdentityController {
 	 * @return
 	 */
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get beneficiaries partial details by beneficiary registration id list")
 	@PostMapping(path = "/getByPartialBenRegIdList", headers = "Authorization")
 	public @ResponseBody String getPartialBeneficiariesByBenRegIds(
 			@ApiParam(value = "[Integer,Integer…..(array of benRegId)]") @RequestBody String benRegIds) {
@@ -673,6 +682,7 @@ public class IdentityController {
 	 * @return
 	 */
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get beneficiaries by beneficiary registration id")
 	@PostMapping(path = "/getByBenRegIdList", headers = "Authorization")
 	public @ResponseBody String getBeneficiariesByBenRegIds(
 			@ApiParam(value = " {\"beneficiaryRegID\": \"Long\"}") @RequestBody String benRegIds) {
@@ -812,6 +822,7 @@ public String getJsonAsString(Object obj) {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get finite beneficiaries")
 	@PostMapping(path = "/finiteSearch", headers = "Authorization")
 	public @ResponseBody String getFiniteBeneficiaries(@RequestBody String searchFilter) {
 		logger.info("IdentityController.getFiniteBeneficiaries - start");
@@ -842,6 +853,7 @@ public String getJsonAsString(Object obj) {
 
 	// New API for getting beneficiary image only.
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get beneficiary image by beneficiary registration id")
 	@PostMapping(path = "/benImageByBenRegID", headers = "Authorization")
 	public @ResponseBody String getBeneficiaryImageByBenRegID(@RequestBody String identityData) {
 		String benImage = null;
@@ -856,6 +868,7 @@ public String getJsonAsString(Object obj) {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Edit education or community by agent")
 	@PostMapping(path = "/editEducationOrCommunity", headers = "Authorization")
 	public @ResponseBody String editIdentityEducationOrCommunity(@ApiParam(value = "{\r\n"
 			+ "  \"eventTypeName\": \"String\",\r\n" + "  \"eventTypeDate\": \"Timestamp\",\r\n"
@@ -983,7 +996,7 @@ public String getJsonAsString(Object obj) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Check available BENID in local", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Check available beneficary id in local server", consumes = "application/json", produces = "application/json")
 	@GetMapping(path = "/checkAvailablBenIDLocalServer", headers = "Authorization")
 	public @ResponseBody String checkAvailablBenIDLocalServer() {
 		com.iemr.common.identity.utils.response.OutputResponse response = new com.iemr.common.identity.utils.response.OutputResponse();
@@ -998,7 +1011,7 @@ public String getJsonAsString(Object obj) {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
-	@ApiOperation(value = "Save Server generated BeneficiaryID & BenRegID to local server", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Save server generated beneficiary ID & beneficiary registration ID to local server", consumes = "application/json", produces = "application/json")
 	@PostMapping(path = "/saveGeneratedBenIDToLocalServer", headers = "Authorization")
 	public @ResponseBody String saveGeneratedBenIDToLocalServer(
 			@ApiParam(value = "{\r\n" + "        \"vanID\": \"Integer\",\r\n"
diff --git a/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java b/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
index 702bc992..f3c54bc2 100644
--- a/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
+++ b/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
@@ -44,7 +44,7 @@ public class FamilyTaggingController {
 	private FamilyTagService familyTagService;
 
 	@CrossOrigin()
-	@ApiOperation(value = "Create and Modify family tagging", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Create and modify family tagging", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/addTag" }, method = { RequestMethod.POST })
 	public String saveFamilyTagging(@RequestBody String comingReq) {
 		String s;
@@ -60,7 +60,7 @@ public String saveFamilyTagging(@RequestBody String comingReq) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Create Family", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Create family", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/createFamily" }, method = { RequestMethod.POST })
 	public String createFamily(@RequestBody String comingReq) {
 		String s;
@@ -76,7 +76,7 @@ public String createFamily(@RequestBody String comingReq) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Search Family", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Search family", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/searchFamily" }, method = { RequestMethod.POST })
 	public String searchFamily(@RequestBody String comingReq) {
 		String s;
@@ -124,7 +124,7 @@ public String untagFamily(@RequestBody String comingReq) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "edit beneficiary family details", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Edit beneficiary family details", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/editFamilyTagging" }, method = { RequestMethod.POST })
 	public String editFamilyDetails(@RequestBody String comingReq) {
 		String s;
diff --git a/src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java b/src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java
similarity index 97%
rename from src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java
rename to src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java
index 0d98327e..33fbc9cb 100644
--- a/src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java
+++ b/src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java
@@ -40,23 +40,21 @@
 import io.swagger.annotations.ApiParam;
 
 /**
- * @date : 13-02-2019,
  * @apiNote API will be exposed to public domain for RMNCH mobile data sync to
  *          AMRIT platform
- * @author NE298657
  */
 @RestController
 @RequestMapping(value = "/rmnch", headers = "Authorization")
-public class RmnchMobileAppController {
+public class RMNCHMobileAppController {
 
-	private Logger logger = LoggerFactory.getLogger(RmnchMobileAppController.class);
+	private Logger logger = LoggerFactory.getLogger(RMNCHMobileAppController.class);
 
 	@Autowired
 	@Qualifier("rmnchServiceImpl")
 	RmnchDataSyncService rmnchDataSyncService;
 
 	@RequestMapping(value = "/syncDataToAmrit", method = RequestMethod.POST)
-	@ApiOperation(value = "sync data to amrit for already regestered beneficiary with AMRIT beneficiary id ", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Sync data to AMRIT for already regestered beneficiary with AMRIT beneficiary id ", consumes = "application/json", produces = "application/json")
 	public String syncDataToAmrit(@ApiParam(value = "{\r\n" + "  \"beneficiaryDetails\": [\r\n" + "    {\r\n"
 			+ "      \"BenRegId\": \"Long\",\r\n" + "      \"Countyid\": \"Integer\",\r\n"
 			+ "      \"Processed\": \"String\",\r\n" + "      \"ProviderServiceMapID\": \"Integer\",\r\n"
@@ -136,7 +134,7 @@ public String syncDataToAmrit(@ApiParam(value = "{\r\n" + "  \"beneficiaryDetail
 
 //	@Deprecated
 	@RequestMapping(value = "/getBeneficiaryDataForVillage", method = RequestMethod.POST)
-	@ApiOperation(value = "get beneficiary data for given village ", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Get beneficiary data for given village ", consumes = "application/json", produces = "application/json")
 	public String getBeneficiaryData(
 			@ApiParam(value = "{\r\n" + "\"villageID\":\"Integer\",\r\n" + "\"fromDate\":\"DateTime\",\r\n"
 					+ "\"toDate\":\"DateTime\",\r\n" + "\"pageNo\":\"Integer\"\r\n"
diff --git a/src/main/java/com/iemr/common/identity/controller/version/VersionController.java b/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
index afe82114..a8fed993 100644
--- a/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
+++ b/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
@@ -35,12 +35,15 @@
 
 import com.iemr.common.identity.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @RestController
 public class VersionController {
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 	
 	@CrossOrigin()
+	@ApiOperation(value = "Get version information", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = "/version", method = { RequestMethod.GET })
 	public String versionInformation() {
 		OutputResponse output = new OutputResponse();
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index 5c9bd728..6f5ed7a3 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -48,7 +48,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.iemr.common.identity.controller.rmnch.RmnchMobileAppController;
+import com.iemr.common.identity.controller.rmnch.RMNCHMobileAppController;
 import com.iemr.common.identity.data.rmnch.BenHealthIDDetails;
 import com.iemr.common.identity.data.rmnch.GetBenRequestHandler;
 import com.iemr.common.identity.data.rmnch.NcdTbHrpData;
@@ -83,7 +83,7 @@
 @PropertySource("classpath:application.properties")
 public class RmnchDataSyncServiceImpl implements RmnchDataSyncService {
 
-	private Logger logger = LoggerFactory.getLogger(RmnchMobileAppController.class);
+	private Logger logger = LoggerFactory.getLogger(RMNCHMobileAppController.class);
 	private ConfigProperties properties;
 	@Value("${door-to-door-page-size}")
 	private String door_to_door_page_size;

From 8b4e2fdaa642fd2a91622e49f888d15a915673e7 Mon Sep 17 00:00:00 2001
From: Sunil GV <sunil.g@beehyv.com>
Date: Tue, 8 Aug 2023 11:32:03 +0530
Subject: [PATCH 31/53] Updated the language option for codeql and added maven
 test

---
 .github/workflows/sast-and-package.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
index af20ce2f..22b61c19 100644
--- a/.github/workflows/sast-and-package.yml
+++ b/.github/workflows/sast-and-package.yml
@@ -32,8 +32,6 @@ jobs:
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
-      with:
-        languages: Java   
     
   Packaging:
     needs: codeql
@@ -46,6 +44,8 @@ jobs:
       with:
         java-version: 8
         distribution: 'adopt'
+    - name: Test with maven
+      run: mvn test
     - name: Create WAR file 
       run: mvn -B package --file pom.xml
     - name: Upload WAR file as artifact

From cf0d92eea392f699321527475a109ca6fce969cc Mon Sep 17 00:00:00 2001
From: Sunil GV <sunil.g@beehyv.com>
Date: Tue, 8 Aug 2023 11:37:28 +0530
Subject: [PATCH 32/53] Added CodeQl tool to do static code analysis on pull
 request

---
 .github/workflows/build-on-pull-request.yml | 43 +++++++++++++--------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
index 4c88df3e..07e011e8 100644
--- a/.github/workflows/build-on-pull-request.yml
+++ b/.github/workflows/build-on-pull-request.yml
@@ -1,22 +1,33 @@
-name: Build On Pull Request
+name: Build and Static Code Analysis On Pull Request
 on:
   pull_request:
-    branches: [ "master","develop" ]
-    
+    branches: [ "develop" ]
 jobs:
-  Build:
+  Build_and_analyse:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.ref }}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-      - name: Setup JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'adopt'
-      - name: Build with Maven  
-        run: mvn clean install
\ No newline at end of file
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Test with Maven
+      run: mvn test
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: Java        
+
+    - name: Build with Maven
+      run: mvn clean install
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
\ No newline at end of file

From 67fc78b397931868553554b01a9d27ffe59dc86b Mon Sep 17 00:00:00 2001
From: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Date: Fri, 11 Aug 2023 03:29:38 +0000
Subject: [PATCH 33/53] Implementing Basic reverse sync operation

---
 .../controller/IdentityController.java        | 36 ++++++++++++++-----
 .../common/identity/dto/SearchSyncDTO.java    | 32 +++++++++++++++++
 .../common/identity/repo/BenMappingRepo.java  |  7 ++++
 .../identity/service/IdentityService.java     | 23 ++++++++++++
 4 files changed, 90 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/iemr/common/identity/dto/SearchSyncDTO.java

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index ff2f1327..c5d30f5a 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -23,6 +23,7 @@
 
 import java.lang.reflect.Type;
 import java.math.BigInteger;
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -31,6 +32,7 @@
 import javax.persistence.NoResultException;
 import javax.persistence.QueryTimeoutException;
 
+import com.iemr.common.identity.dto.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,14 +54,6 @@
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
 import com.iemr.common.identity.domain.MBeneficiarymapping;
-import com.iemr.common.identity.dto.BenIdImportDTO;
-import com.iemr.common.identity.dto.BeneficiariesDTO;
-import com.iemr.common.identity.dto.BeneficiariesPartialDTO;
-import com.iemr.common.identity.dto.BeneficiaryCreateResp;
-import com.iemr.common.identity.dto.IdentityDTO;
-import com.iemr.common.identity.dto.IdentityEditDTO;
-import com.iemr.common.identity.dto.IdentitySearchDTO;
-import com.iemr.common.identity.dto.ReserveIdentityDTO;
 import com.iemr.common.identity.exception.MissingMandatoryFieldsException;
 import com.iemr.common.identity.mapper.IdentityMapper;
 import com.iemr.common.identity.mapper.InputMapper;
@@ -309,6 +303,32 @@ public class IdentityController {
 		return response;
 	}
 
+	// search beneficiary by lastModDate and districtID
+	@CrossOrigin(origins = { "*commonapi*" })
+//	@PostMapping(path = "/searchByDistrictId", headers = "Authorization")
+	@PostMapping(path = "/searchByDistrictId")
+	public @ResponseBody String searchBeneficiaryByBlockIdAndLastModDate(
+			@ApiParam(value = "\"String\"") @RequestBody String object) {
+		logger.info("IdentityController.getBeneficiary - start. family id = " + object);
+		String response;
+		try {
+
+			JsonElement json = new JsonParser().parse(object);
+
+			SearchSyncDTO search = InputMapper.getInstance().gson().fromJson(json, SearchSyncDTO.class);
+			List<BeneficiariesDTO> list = svc.searchBeneficiaryByBlockIdAndLastModifyDate(search.getBlockID(), new Timestamp(search.getLastModifDate()));
+
+			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
+
+			logger.info("IdentityController.getBeneficiary - end");
+		} catch (Exception e) {
+			logger.error("error in beneficiary search by Family Id : " + e.getLocalizedMessage());
+			response = getErrorResponseString("error in beneficiary search by Family Id  : " + e.getLocalizedMessage(),
+					5000, "failure", "");
+		}
+		return response;
+	}
+
 	// search beneficiary by gov identity - aadhar, pan, voter id etc
 	@CrossOrigin(origins = { "*commonapi*" })
 	@PostMapping(path = "/searhByGovIdentity", headers = "Authorization")
diff --git a/src/main/java/com/iemr/common/identity/dto/SearchSyncDTO.java b/src/main/java/com/iemr/common/identity/dto/SearchSyncDTO.java
new file mode 100644
index 00000000..b224159b
--- /dev/null
+++ b/src/main/java/com/iemr/common/identity/dto/SearchSyncDTO.java
@@ -0,0 +1,32 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.identity.dto;
+
+import lombok.Data;
+
+@Data
+public class SearchSyncDTO {
+
+	private Long lastModifDate;
+	private Integer blockID;
+
+}
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
index b55a243c..3154b69f 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
@@ -22,6 +22,7 @@
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
+import java.sql.Timestamp;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.Modifying;
@@ -125,4 +126,10 @@ public List<Object[]> getBenMappingByBenDetailsIds(@Param("benDetailsIds") List<
 	public List<Object[]> getBenMappingByVanSerialNo(@Param("benMapIds") BigInteger benMapIds,
 			@Param("vanID") Integer vanID);
 
+	@Query(value = "select m from MBeneficiarymapping m where m.mBeneficiaryaddress.permVillageId = :blockID and (m.mBeneficiaryAccount.lastModDate > :lastModDate "
+			+ "or m.mBeneficiaryaddress.lastModDate > :lastModDate or m.mBeneficiaryconsent.lastModDate > :lastModDate "
+			+ "or m.mBeneficiarycontact.lastModDate > :lastModDate or m.mBeneficiarydetail.lastModDate > :lastModDate ) "
+			+ "order by m.benMapId Desc")
+	List<MBeneficiarymapping> findByBeneficiaryDetailsByBlockIDAndLastModifyDate(@Param("blockID") int blockID, @Param("lastModDate") Timestamp lastModDate);
+
 }
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 911bd81b..8564022e 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -508,6 +508,29 @@ public List<BeneficiariesDTO> searhBeneficiaryByFamilyId(String familyId)
 		return beneficiaryList;
 	}
 
+	public List<BeneficiariesDTO> searchBeneficiaryByBlockIdAndLastModifyDate(Integer blockID, Timestamp lastModDate) {
+
+		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();
+		try {
+			// find benmap ids
+			List<MBeneficiarymapping> benMappingsList = mappingRepo.findByBeneficiaryDetailsByBlockIDAndLastModifyDate(blockID, lastModDate);
+			if (benMappingsList == null || benMappingsList.size() == 0){
+				return beneficiaryList;
+			}
+			else {
+				for (MBeneficiarymapping benMapOBJ : benMappingsList) {
+					beneficiaryList.add(this.getBeneficiariesDTO(benMapOBJ));
+				}
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error(
+					"error in beneficiary search for familyId : " + blockID + " error : " + e.getLocalizedMessage());
+		}
+		return beneficiaryList;
+	}
+
 	public List<BeneficiariesDTO> searhBeneficiaryByGovIdentity(String identity)
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();

From c3611d96797bdfcb4c120c8abc4a780853d68c27 Mon Sep 17 00:00:00 2001
From: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Date: Wed, 16 Aug 2023 11:21:08 +0000
Subject: [PATCH 34/53] Fix issue on controller

---
 .../iemr/common/identity/controller/IdentityController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index c5d30f5a..ef914fa7 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -309,7 +309,7 @@ public class IdentityController {
 	@PostMapping(path = "/searchByDistrictId")
 	public @ResponseBody String searchBeneficiaryByBlockIdAndLastModDate(
 			@ApiParam(value = "\"String\"") @RequestBody String object) {
-		logger.info("IdentityController.getBeneficiary - start. family id = " + object);
+		logger.info("IdentityController.getBeneficiary - start. search object = " + object);
 		String response;
 		try {
 
@@ -323,7 +323,7 @@ public class IdentityController {
 			logger.info("IdentityController.getBeneficiary - end");
 		} catch (Exception e) {
 			logger.error("error in beneficiary search by Family Id : " + e.getLocalizedMessage());
-			response = getErrorResponseString("error in beneficiary search by Family Id  : " + e.getLocalizedMessage(),
+			response = getErrorResponseString("error in beneficiary search by block Id  : " + e.getLocalizedMessage(),
 					5000, "failure", "");
 		}
 		return response;

From 8d6a700f604b68e7346dacc13c19f513828ac7ee Mon Sep 17 00:00:00 2001
From: Sunil GV <sunil.g@beehyv.com>
Date: Tue, 8 Aug 2023 11:32:03 +0530
Subject: [PATCH 35/53] Updated the language option for codeql and added maven
 test

---
 .github/workflows/sast-and-package.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
index af20ce2f..22b61c19 100644
--- a/.github/workflows/sast-and-package.yml
+++ b/.github/workflows/sast-and-package.yml
@@ -32,8 +32,6 @@ jobs:
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
-      with:
-        languages: Java   
     
   Packaging:
     needs: codeql
@@ -46,6 +44,8 @@ jobs:
       with:
         java-version: 8
         distribution: 'adopt'
+    - name: Test with maven
+      run: mvn test
     - name: Create WAR file 
       run: mvn -B package --file pom.xml
     - name: Upload WAR file as artifact

From 6a9f5d8f655028b4107e08b31d151f33cb802f17 Mon Sep 17 00:00:00 2001
From: Sunil GV <sunil.g@beehyv.com>
Date: Tue, 8 Aug 2023 11:37:28 +0530
Subject: [PATCH 36/53] Added CodeQl tool to do static code analysis on pull
 request

---
 .github/workflows/build-on-pull-request.yml | 43 +++++++++++++--------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
index 4c88df3e..07e011e8 100644
--- a/.github/workflows/build-on-pull-request.yml
+++ b/.github/workflows/build-on-pull-request.yml
@@ -1,22 +1,33 @@
-name: Build On Pull Request
+name: Build and Static Code Analysis On Pull Request
 on:
   pull_request:
-    branches: [ "master","develop" ]
-    
+    branches: [ "develop" ]
 jobs:
-  Build:
+  Build_and_analyse:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.ref }}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-      - name: Setup JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'adopt'
-      - name: Build with Maven  
-        run: mvn clean install
\ No newline at end of file
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Test with Maven
+      run: mvn test
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: Java        
+
+    - name: Build with Maven
+      run: mvn clean install
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
\ No newline at end of file

From 65a25fb93c631d31abef4d51981c7dceb4af7acc Mon Sep 17 00:00:00 2001
From: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Date: Fri, 11 Aug 2023 03:29:38 +0000
Subject: [PATCH 37/53] Implementing Basic reverse sync operation

---
 .../controller/IdentityController.java        | 28 ++++++++++++++++
 .../common/identity/dto/SearchSyncDTO.java    | 32 +++++++++++++++++++
 .../common/identity/repo/BenMappingRepo.java  |  7 ++++
 .../identity/service/IdentityService.java     | 23 +++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 src/main/java/com/iemr/common/identity/dto/SearchSyncDTO.java

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 274d0d05..27978eca 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -23,6 +23,7 @@
 
 import java.lang.reflect.Type;
 import java.math.BigInteger;
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -31,6 +32,7 @@
 import javax.persistence.NoResultException;
 import javax.persistence.QueryTimeoutException;
 
+import com.iemr.common.identity.dto.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -313,6 +315,32 @@ public class IdentityController {
 		return response;
 	}
 
+	// search beneficiary by lastModDate and districtID
+	@CrossOrigin(origins = { "*commonapi*" })
+//	@PostMapping(path = "/searchByDistrictId", headers = "Authorization")
+	@PostMapping(path = "/searchByDistrictId")
+	public @ResponseBody String searchBeneficiaryByBlockIdAndLastModDate(
+			@ApiParam(value = "\"String\"") @RequestBody String object) {
+		logger.info("IdentityController.getBeneficiary - start. family id = " + object);
+		String response;
+		try {
+
+			JsonElement json = new JsonParser().parse(object);
+
+			SearchSyncDTO search = InputMapper.getInstance().gson().fromJson(json, SearchSyncDTO.class);
+			List<BeneficiariesDTO> list = svc.searchBeneficiaryByBlockIdAndLastModifyDate(search.getBlockID(), new Timestamp(search.getLastModifDate()));
+
+			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
+
+			logger.info("IdentityController.getBeneficiary - end");
+		} catch (Exception e) {
+			logger.error("error in beneficiary search by Family Id : " + e.getLocalizedMessage());
+			response = getErrorResponseString("error in beneficiary search by Family Id  : " + e.getLocalizedMessage(),
+					5000, "failure", "");
+		}
+		return response;
+	}
+
 	@CrossOrigin(origins = { "*commonapi*" })
 	@ApiOperation(value = "Search beneficiary based on government identity number")
 	@PostMapping(path = "/searhByGovIdentity", headers = "Authorization")
diff --git a/src/main/java/com/iemr/common/identity/dto/SearchSyncDTO.java b/src/main/java/com/iemr/common/identity/dto/SearchSyncDTO.java
new file mode 100644
index 00000000..b224159b
--- /dev/null
+++ b/src/main/java/com/iemr/common/identity/dto/SearchSyncDTO.java
@@ -0,0 +1,32 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.identity.dto;
+
+import lombok.Data;
+
+@Data
+public class SearchSyncDTO {
+
+	private Long lastModifDate;
+	private Integer blockID;
+
+}
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
index b55a243c..3154b69f 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
@@ -22,6 +22,7 @@
 package com.iemr.common.identity.repo;
 
 import java.math.BigInteger;
+import java.sql.Timestamp;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.Modifying;
@@ -125,4 +126,10 @@ public List<Object[]> getBenMappingByBenDetailsIds(@Param("benDetailsIds") List<
 	public List<Object[]> getBenMappingByVanSerialNo(@Param("benMapIds") BigInteger benMapIds,
 			@Param("vanID") Integer vanID);
 
+	@Query(value = "select m from MBeneficiarymapping m where m.mBeneficiaryaddress.permVillageId = :blockID and (m.mBeneficiaryAccount.lastModDate > :lastModDate "
+			+ "or m.mBeneficiaryaddress.lastModDate > :lastModDate or m.mBeneficiaryconsent.lastModDate > :lastModDate "
+			+ "or m.mBeneficiarycontact.lastModDate > :lastModDate or m.mBeneficiarydetail.lastModDate > :lastModDate ) "
+			+ "order by m.benMapId Desc")
+	List<MBeneficiarymapping> findByBeneficiaryDetailsByBlockIDAndLastModifyDate(@Param("blockID") int blockID, @Param("lastModDate") Timestamp lastModDate);
+
 }
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index fa3a42ac..b63ea4ea 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -508,6 +508,29 @@ public List<BeneficiariesDTO> searhBeneficiaryByFamilyId(String familyId)
 		return beneficiaryList;
 	}
 
+	public List<BeneficiariesDTO> searchBeneficiaryByBlockIdAndLastModifyDate(Integer blockID, Timestamp lastModDate) {
+
+		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();
+		try {
+			// find benmap ids
+			List<MBeneficiarymapping> benMappingsList = mappingRepo.findByBeneficiaryDetailsByBlockIDAndLastModifyDate(blockID, lastModDate);
+			if (benMappingsList == null || benMappingsList.size() == 0){
+				return beneficiaryList;
+			}
+			else {
+				for (MBeneficiarymapping benMapOBJ : benMappingsList) {
+					beneficiaryList.add(this.getBeneficiariesDTO(benMapOBJ));
+				}
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error(
+					"error in beneficiary search for familyId : " + blockID + " error : " + e.getLocalizedMessage());
+		}
+		return beneficiaryList;
+	}
+
 	public List<BeneficiariesDTO> searhBeneficiaryByGovIdentity(String identity)
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();

From b32ed990834ab09d0fb12a85cbd794b71e196d67 Mon Sep 17 00:00:00 2001
From: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Date: Wed, 16 Aug 2023 11:21:08 +0000
Subject: [PATCH 38/53] Fix issue on controller

---
 .../iemr/common/identity/controller/IdentityController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 27978eca..79e68f60 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -321,7 +321,7 @@ public class IdentityController {
 	@PostMapping(path = "/searchByDistrictId")
 	public @ResponseBody String searchBeneficiaryByBlockIdAndLastModDate(
 			@ApiParam(value = "\"String\"") @RequestBody String object) {
-		logger.info("IdentityController.getBeneficiary - start. family id = " + object);
+		logger.info("IdentityController.getBeneficiary - start. search object = " + object);
 		String response;
 		try {
 
@@ -335,7 +335,7 @@ public class IdentityController {
 			logger.info("IdentityController.getBeneficiary - end");
 		} catch (Exception e) {
 			logger.error("error in beneficiary search by Family Id : " + e.getLocalizedMessage());
-			response = getErrorResponseString("error in beneficiary search by Family Id  : " + e.getLocalizedMessage(),
+			response = getErrorResponseString("error in beneficiary search by block Id  : " + e.getLocalizedMessage(),
 					5000, "failure", "");
 		}
 		return response;

From 21b700f886aaf8482fe5cf03588dc2d1ad4ba4a8 Mon Sep 17 00:00:00 2001
From: Anjana <anjana.j28@wipro.com>
Date: Fri, 4 Aug 2023 19:26:45 +0530
Subject: [PATCH 39/53] Identity API cleanup and password masking

---
 src/main/environment/1097_dev.properties      |  6 ++--
 src/main/environment/1097_local.properties    |  6 ++--
 src/main/environment/1097_test.properties     |  6 ++--
 src/main/environment/1097_uat.properties      |  6 ++--
 src/main/environment/common_dev.properties    |  6 ++--
 src/main/environment/common_local.properties  |  6 ++--
 src/main/environment/common_test.properties   |  4 +--
 src/main/environment/common_uat.properties    |  6 ++--
 .../common/identity/config/SwaggerConfig.java |  2 +-
 .../controller/IdentityController.java        | 33 +++++++++++++++----
 .../FamilyTaggingController.java              |  8 ++---
 ...ler.java => RMNCHMobileAppController.java} | 10 +++---
 .../controller/version/VersionController.java |  3 ++
 .../rmnch/RmnchDataSyncServiceImpl.java       |  4 +--
 14 files changed, 64 insertions(+), 42 deletions(-)
 rename src/main/java/com/iemr/common/identity/controller/rmnch/{RmnchMobileAppController.java => RMNCHMobileAppController.java} (97%)

diff --git a/src/main/environment/1097_dev.properties b/src/main/environment/1097_dev.properties
index a18bb2fa..c168f8ac 100644
--- a/src/main/environment/1097_dev.properties
+++ b/src/main/environment/1097_dev.properties
@@ -1,8 +1,8 @@
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://10.208.122.32:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT 1097 DB URL here>
+spring.datasource.username=<Enter your AMRIT 1097 DB username>
+spring.datasource.password=<Enter your AMRIT 1097 DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/1097_local.properties b/src/main/environment/1097_local.properties
index 9081e012..bcaa98f8 100644
--- a/src/main/environment/1097_local.properties
+++ b/src/main/environment/1097_local.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://localhost:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=DSekNOtG9a+qythoUDNKuw==
-encDbPass=DSekNOtG9a+qythoUDNKuw==
+spring.datasource.url=<Enter AMRIT 1097 DB URL here>
+spring.datasource.username=<Enter your AMRIT 1097 DB username>
+spring.datasource.password=<Enter your AMRIT 1097 DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/1097_test.properties b/src/main/environment/1097_test.properties
index ea15db01..c168f8ac 100644
--- a/src/main/environment/1097_test.properties
+++ b/src/main/environment/1097_test.properties
@@ -1,8 +1,8 @@
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT 1097 DB URL here>
+spring.datasource.username=<Enter your AMRIT 1097 DB username>
+spring.datasource.password=<Enter your AMRIT 1097 DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/1097_uat.properties b/src/main/environment/1097_uat.properties
index 661eae9a..bcaa98f8 100644
--- a/src/main/environment/1097_uat.properties
+++ b/src/main/environment/1097_uat.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://172.16.19.43:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT 1097 DB URL here>
+spring.datasource.username=<Enter your AMRIT 1097 DB username>
+spring.datasource.password=<Enter your AMRIT 1097 DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
index 4ab76d99..91e41673 100644
--- a/src/main/environment/common_dev.properties
+++ b/src/main/environment/common_dev.properties
@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://10.208.122.32:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT DB URL here>
+spring.datasource.username=<Enter your AMRIT DB username>
+spring.datasource.password=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties
index 2ac89c9e..cf922ff1 100644
--- a/src/main/environment/common_local.properties
+++ b/src/main/environment/common_local.properties
@@ -1,5 +1,5 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://localhost:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=DSekNOtG9a+qythoUDNKuw==
-encDbPass=DSekNOtG9a+qythoUDNKuw==
+spring.datasource.url=<Enter AMRIT DB URL here>
+spring.datasource.username=<Enter your AMRIT DB username>
+spring.datasource.password=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index 2cd539ec..91e41673 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
 spring.datasource.url=<Enter AMRIT DB URL here>
-encDbUserName=<Enter your AMRIT DB username>
-encDbPass=<Enter your AMRIT DB password>
+spring.datasource.username=<Enter your AMRIT DB username>
+spring.datasource.password=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
index 055b485d..0f550fa5 100644
--- a/src/main/environment/common_uat.properties
+++ b/src/main/environment/common_uat.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://172.16.19.43:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT DB URL here>
+spring.datasource.username=<Enter your AMRIT DB username>
+spring.datasource.password=<Enter your AMRIT DB password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
diff --git a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
index d16305ff..29f966b3 100644
--- a/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/SwaggerConfig.java
@@ -47,7 +47,7 @@ private ApiInfo metaData()
 	{
 		ApiInfoBuilder builder = new ApiInfoBuilder();
 		builder.contact(new Contact("AMRIT", "https://psmri.github.io/PSMRI/", "amrit@piramalswasthya.org"));
-		builder.description("A microservice for the creation and management of beneficaries.");
+		builder.description("A microservice for the creation and management of beneficiaries.");
 		builder.version("1.0");
 		builder.title("Identity API");
 		return builder.build();
diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index ef914fa7..79e68f60 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -54,6 +54,14 @@
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
 import com.iemr.common.identity.domain.MBeneficiarymapping;
+import com.iemr.common.identity.dto.BenIdImportDTO;
+import com.iemr.common.identity.dto.BeneficiariesDTO;
+import com.iemr.common.identity.dto.BeneficiariesPartialDTO;
+import com.iemr.common.identity.dto.BeneficiaryCreateResp;
+import com.iemr.common.identity.dto.IdentityDTO;
+import com.iemr.common.identity.dto.IdentityEditDTO;
+import com.iemr.common.identity.dto.IdentitySearchDTO;
+import com.iemr.common.identity.dto.ReserveIdentityDTO;
 import com.iemr.common.identity.exception.MissingMandatoryFieldsException;
 import com.iemr.common.identity.mapper.IdentityMapper;
 import com.iemr.common.identity.mapper.InputMapper;
@@ -77,6 +85,7 @@ public class IdentityController {
 	IdentityMapper mapper;
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get beneficiaries by advance search")
 	@PostMapping(path = "/advanceSearch", headers = "Authorization")
 	public @ResponseBody String getBeneficiaries(
 			@ApiParam(value = "{\"firstName\":\"String\",\"genderId\":\"Integer\",\"fatherName\":\"String\","
@@ -105,6 +114,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on beneficiary registration id")
 	@PostMapping(path = "/getByBenRegId", headers = "Authorization")
 	public @ResponseBody String getBeneficiariesByBeneficiaryRegId(
 			@ApiParam(value = "\"Integer\"") @RequestParam String benRegId) {
@@ -141,6 +151,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search identity based on beneficiary registration id")
 	@PostMapping(path = "/getByBenId", headers = "Authorization")
 	public @ResponseBody String getBeneficiariesByBeneficiaryId(
 			@ApiParam(value = "\"Integer\"") @RequestParam String benId) {
@@ -177,6 +188,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on phone number")
 	@PostMapping(path = "/getByPhoneNum", headers = "Authorization")
 	public @ResponseBody String getBeneficiariesByPhoneNum(
 			@ApiParam(value = "\"String\"") @RequestParam String phoneNum) {
@@ -207,8 +219,8 @@ public class IdentityController {
 		return response;
 	}
 
-	// search beneficiary by healthid / ABHA_Address
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on health ID / ABHA Address")
 	@PostMapping(path = "/getByAbhaAddress", headers = "Authorization")
 	public @ResponseBody String searhBeneficiaryByABHAAddress(
 			@ApiParam(value = "\"String\"") @RequestParam String healthID) {
@@ -240,8 +252,8 @@ public class IdentityController {
 		return response;
 	}
 
-	// search beneficiary by healthid / ABHA_Address
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on health ID number / ABHA ID number")
 	@PostMapping(path = "/getByAbhaIdNo", headers = "Authorization")
 	public @ResponseBody String searhBeneficiaryByABHAIdNo(
 			@ApiParam(value = "\"String\"") @RequestParam String healthIDNo) {
@@ -273,8 +285,8 @@ public class IdentityController {
 		return response;
 	}
 
-	// search beneficiary by family id
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on family id")
 	@PostMapping(path = "/searchByFamilyId", headers = "Authorization")
 	public @ResponseBody String searhBeneficiaryByFamilyId(
 			@ApiParam(value = "\"String\"") @RequestParam String familyId) {
@@ -329,8 +341,8 @@ public class IdentityController {
 		return response;
 	}
 
-	// search beneficiary by gov identity - aadhar, pan, voter id etc
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Search beneficiary based on government identity number")
 	@PostMapping(path = "/searhByGovIdentity", headers = "Authorization")
 	public @ResponseBody String searhBeneficiaryByGovIdentity(
 			@ApiParam(value = "\"String\"") @RequestParam String identity) {
@@ -365,6 +377,7 @@ public class IdentityController {
 	 * @return
 	 */
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Edit identity by agent")
 	@PostMapping(path = "/edit", headers = "Authorization")
 	public @ResponseBody String editIdentity(@ApiParam(value = "{\r\n" + "  \"eventTypeName\": \"String\",\r\n"
 			+ "  \"eventTypeDate\": \"Timestamp\",\r\n" + "  \"agentId\": \"Integer\",\r\n"
@@ -497,6 +510,7 @@ public class IdentityController {
 	 * @return
 	 */
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Create identity by agent")
 	@PostMapping(path = "/create", headers = "Authorization")
 	public @ResponseBody String createIdentity(@ApiParam(value = "{\r\n" + "  \"eventTypeName\": \"String\",\r\n"
 			+ "  \"eventTypeDate\": \"Timestamp\",\r\n" + "  \"agentId\": \"Integer\",\r\n"
@@ -615,6 +629,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Reserve identity by agent")
 	@PostMapping(path = "/reserve", headers = "Authorization")
 	public @ResponseBody String reserveIdentity(@RequestBody String reserveIdentity) {
 		logger.info("IdentityController.reserveIdentity - start");
@@ -635,6 +650,7 @@ public class IdentityController {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Unreserve identity by agent")
 	@PostMapping(path = "/unreserve", headers = "Authorization")
 	public @ResponseBody String unreserveIdentity(@RequestBody String unreserve) {
 		logger.info("IdentityController.unreserveIdentity - start");
@@ -661,6 +677,7 @@ public class IdentityController {
 	 * @return
 	 */
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get beneficiaries partial details by beneficiary registration id list")
 	@PostMapping(path = "/getByPartialBenRegIdList", headers = "Authorization")
 	public @ResponseBody String getPartialBeneficiariesByBenRegIds(
 			@ApiParam(value = "[Integer,Integer…..(array of benRegId)]") @RequestBody String benRegIds) {
@@ -693,6 +710,7 @@ public class IdentityController {
 	 * @return
 	 */
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get beneficiaries by beneficiary registration id")
 	@PostMapping(path = "/getByBenRegIdList", headers = "Authorization")
 	public @ResponseBody String getBeneficiariesByBenRegIds(
 			@ApiParam(value = " {\"beneficiaryRegID\": \"Long\"}") @RequestBody String benRegIds) {
@@ -832,6 +850,7 @@ public String getJsonAsString(Object obj) {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get finite beneficiaries")
 	@PostMapping(path = "/finiteSearch", headers = "Authorization")
 	public @ResponseBody String getFiniteBeneficiaries(@RequestBody String searchFilter) {
 		logger.info("IdentityController.getFiniteBeneficiaries - start");
@@ -862,6 +881,7 @@ public String getJsonAsString(Object obj) {
 
 	// New API for getting beneficiary image only.
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Get beneficiary image by beneficiary registration id")
 	@PostMapping(path = "/benImageByBenRegID", headers = "Authorization")
 	public @ResponseBody String getBeneficiaryImageByBenRegID(@RequestBody String identityData) {
 		String benImage = null;
@@ -876,6 +896,7 @@ public String getJsonAsString(Object obj) {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value = "Edit education or community by agent")
 	@PostMapping(path = "/editEducationOrCommunity", headers = "Authorization")
 	public @ResponseBody String editIdentityEducationOrCommunity(@ApiParam(value = "{\r\n"
 			+ "  \"eventTypeName\": \"String\",\r\n" + "  \"eventTypeDate\": \"Timestamp\",\r\n"
@@ -1003,7 +1024,7 @@ public String getJsonAsString(Object obj) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Check available BENID in local", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Check available beneficary id in local server", consumes = "application/json", produces = "application/json")
 	@GetMapping(path = "/checkAvailablBenIDLocalServer", headers = "Authorization")
 	public @ResponseBody String checkAvailablBenIDLocalServer() {
 		com.iemr.common.identity.utils.response.OutputResponse response = new com.iemr.common.identity.utils.response.OutputResponse();
@@ -1018,7 +1039,7 @@ public String getJsonAsString(Object obj) {
 	}
 
 	@CrossOrigin(origins = { "*commonapi*" })
-	@ApiOperation(value = "Save Server generated BeneficiaryID & BenRegID to local server", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Save server generated beneficiary ID & beneficiary registration ID to local server", consumes = "application/json", produces = "application/json")
 	@PostMapping(path = "/saveGeneratedBenIDToLocalServer", headers = "Authorization")
 	public @ResponseBody String saveGeneratedBenIDToLocalServer(
 			@ApiParam(value = "{\r\n" + "        \"vanID\": \"Integer\",\r\n"
diff --git a/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java b/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
index 702bc992..f3c54bc2 100644
--- a/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
+++ b/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
@@ -44,7 +44,7 @@ public class FamilyTaggingController {
 	private FamilyTagService familyTagService;
 
 	@CrossOrigin()
-	@ApiOperation(value = "Create and Modify family tagging", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Create and modify family tagging", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/addTag" }, method = { RequestMethod.POST })
 	public String saveFamilyTagging(@RequestBody String comingReq) {
 		String s;
@@ -60,7 +60,7 @@ public String saveFamilyTagging(@RequestBody String comingReq) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Create Family", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Create family", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/createFamily" }, method = { RequestMethod.POST })
 	public String createFamily(@RequestBody String comingReq) {
 		String s;
@@ -76,7 +76,7 @@ public String createFamily(@RequestBody String comingReq) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Search Family", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Search family", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/searchFamily" }, method = { RequestMethod.POST })
 	public String searchFamily(@RequestBody String comingReq) {
 		String s;
@@ -124,7 +124,7 @@ public String untagFamily(@RequestBody String comingReq) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "edit beneficiary family details", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Edit beneficiary family details", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/editFamilyTagging" }, method = { RequestMethod.POST })
 	public String editFamilyDetails(@RequestBody String comingReq) {
 		String s;
diff --git a/src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java b/src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java
similarity index 97%
rename from src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java
rename to src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java
index 0d98327e..33fbc9cb 100644
--- a/src/main/java/com/iemr/common/identity/controller/rmnch/RmnchMobileAppController.java
+++ b/src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java
@@ -40,23 +40,21 @@
 import io.swagger.annotations.ApiParam;
 
 /**
- * @date : 13-02-2019,
  * @apiNote API will be exposed to public domain for RMNCH mobile data sync to
  *          AMRIT platform
- * @author NE298657
  */
 @RestController
 @RequestMapping(value = "/rmnch", headers = "Authorization")
-public class RmnchMobileAppController {
+public class RMNCHMobileAppController {
 
-	private Logger logger = LoggerFactory.getLogger(RmnchMobileAppController.class);
+	private Logger logger = LoggerFactory.getLogger(RMNCHMobileAppController.class);
 
 	@Autowired
 	@Qualifier("rmnchServiceImpl")
 	RmnchDataSyncService rmnchDataSyncService;
 
 	@RequestMapping(value = "/syncDataToAmrit", method = RequestMethod.POST)
-	@ApiOperation(value = "sync data to amrit for already regestered beneficiary with AMRIT beneficiary id ", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Sync data to AMRIT for already regestered beneficiary with AMRIT beneficiary id ", consumes = "application/json", produces = "application/json")
 	public String syncDataToAmrit(@ApiParam(value = "{\r\n" + "  \"beneficiaryDetails\": [\r\n" + "    {\r\n"
 			+ "      \"BenRegId\": \"Long\",\r\n" + "      \"Countyid\": \"Integer\",\r\n"
 			+ "      \"Processed\": \"String\",\r\n" + "      \"ProviderServiceMapID\": \"Integer\",\r\n"
@@ -136,7 +134,7 @@ public String syncDataToAmrit(@ApiParam(value = "{\r\n" + "  \"beneficiaryDetail
 
 //	@Deprecated
 	@RequestMapping(value = "/getBeneficiaryDataForVillage", method = RequestMethod.POST)
-	@ApiOperation(value = "get beneficiary data for given village ", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Get beneficiary data for given village ", consumes = "application/json", produces = "application/json")
 	public String getBeneficiaryData(
 			@ApiParam(value = "{\r\n" + "\"villageID\":\"Integer\",\r\n" + "\"fromDate\":\"DateTime\",\r\n"
 					+ "\"toDate\":\"DateTime\",\r\n" + "\"pageNo\":\"Integer\"\r\n"
diff --git a/src/main/java/com/iemr/common/identity/controller/version/VersionController.java b/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
index afe82114..a8fed993 100644
--- a/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
+++ b/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
@@ -35,12 +35,15 @@
 
 import com.iemr.common.identity.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @RestController
 public class VersionController {
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 	
 	@CrossOrigin()
+	@ApiOperation(value = "Get version information", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = "/version", method = { RequestMethod.GET })
 	public String versionInformation() {
 		OutputResponse output = new OutputResponse();
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index 5c9bd728..6f5ed7a3 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -48,7 +48,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.iemr.common.identity.controller.rmnch.RmnchMobileAppController;
+import com.iemr.common.identity.controller.rmnch.RMNCHMobileAppController;
 import com.iemr.common.identity.data.rmnch.BenHealthIDDetails;
 import com.iemr.common.identity.data.rmnch.GetBenRequestHandler;
 import com.iemr.common.identity.data.rmnch.NcdTbHrpData;
@@ -83,7 +83,7 @@
 @PropertySource("classpath:application.properties")
 public class RmnchDataSyncServiceImpl implements RmnchDataSyncService {
 
-	private Logger logger = LoggerFactory.getLogger(RmnchMobileAppController.class);
+	private Logger logger = LoggerFactory.getLogger(RMNCHMobileAppController.class);
 	private ConfigProperties properties;
 	@Value("${door-to-door-page-size}")
 	private String door_to_door_page_size;

From c4824714b58e87a31e02097670697558923d8d99 Mon Sep 17 00:00:00 2001
From: Indrani Bandyopadhyay <IN40068837@wipro.com>
Date: Thu, 3 Aug 2023 16:49:35 +0530
Subject: [PATCH 40/53] edit api changes

---
 .../com/iemr/common/identity/domain/MBeneficiarydetail.java  | 3 ++-
 .../java/com/iemr/common/identity/dto/IdentityEditDTO.java   | 1 +
 .../com/iemr/common/identity/service/IdentityService.java    | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
index 08eea68b..038f0332 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -82,7 +82,8 @@ public class MBeneficiarydetail implements Serializable {
 
 	@Column(length = 45)
 	private String education;
-
+    
+	@Column(name = "EmergencyRegistration")
 	private Boolean emergencyRegistration;
 
 	@Column(length = 50)
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
index bf16e2d9..6b87d8b6 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
@@ -145,4 +145,5 @@ public class IdentityEditDTO {
 
 	private Integer vanID;
 	private Integer parkingPlaceId;
+	private boolean emergencyRegistration;
 }
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 8564022e..b63ea4ea 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -742,6 +742,11 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 			 */
 
 			logger.debug("Beneficiary details to update = " + new OutputMapper().gson().toJson(mbDetl));
+			if(benDetails.getEmergencyRegistration() != null && benDetails.getEmergencyRegistration()) {
+				mbDetl.setEmergencyRegistration(true);
+			}else {
+				mbDetl.setEmergencyRegistration(false);
+			}
 			detailRepo.save(mbDetl);
 		}
 

From 1d442c30125bf0bf9eb6706a055ac034c429cc82 Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Mon, 4 Sep 2023 13:53:23 +0530
Subject: [PATCH 41/53] change made in description of identity controller (#30)

---
 .../com/iemr/common/identity/controller/IdentityController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 79e68f60..e256fd11 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -317,7 +317,7 @@ public class IdentityController {
 
 	// search beneficiary by lastModDate and districtID
 	@CrossOrigin(origins = { "*commonapi*" })
-//	@PostMapping(path = "/searchByDistrictId", headers = "Authorization")
+	@ApiOperation(value ="Search beneficiary by blockId and last modified date")
 	@PostMapping(path = "/searchByDistrictId")
 	public @ResponseBody String searchBeneficiaryByBlockIdAndLastModDate(
 			@ApiParam(value = "\"String\"") @RequestBody String object) {

From c371f5f5264b7b1fc472e4d02be4653d7c32fea6 Mon Sep 17 00:00:00 2001
From: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com>
Date: Tue, 12 Sep 2023 14:57:41 +0530
Subject: [PATCH 42/53] Multiple beneficiaries sync issue changes for FLW (#31)

Co-authored-by: Devika <de40034072@wipro.com>
---
 .../data/rmnch/RMNCHBornBirthDetails.java       |  2 +-
 .../identity/data/rmnch/RMNCHCBACdetails.java   |  2 +-
 .../service/rmnch/RmnchDataSyncServiceImpl.java | 17 +++++++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java
index 44232d12..468a025a 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java
@@ -57,7 +57,7 @@ public class RMNCHBornBirthDetails {
 
 	@Expose
 	@Column(name = "beneficiaryId")
-	private Integer beneficiaryId;
+	private Long benficieryid;
 
 	@Expose
 	@Column(name = "countryid")
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java
index 6f9bdf38..806822c8 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java
@@ -380,7 +380,7 @@ public class RMNCHCBACdetails {
 
 	@Expose
 	@Column(name = "beneficiaryId")
-	private Integer beneficiaryid;
+	private Long benficieryid;
 
 	// new fields, 16-09-2021
 	@Expose
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index 6f5ed7a3..ff4b24ec 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -141,10 +141,12 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 					List<RMNCHBeneficiaryDetailsRmnch> benDetailsExtraList = Arrays.asList(objArr);
 
 					if (benDetailsExtraList != null && benDetailsExtraList.size() > 0) {
-						benRegID = rMNCHMBenRegIdMapRepo.getRegID(benDetailsExtraList.get(0).getBenficieryid());
-
-						if (benRegID != null) {
+//						benRegID = rMNCHMBenRegIdMapRepo.getRegID(benDetailsExtraList.get(0).getBenficieryid());
+//
+//						if (benRegID != null) {
+						
 							for (RMNCHBeneficiaryDetailsRmnch obj : benDetailsExtraList) {
+								benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid());
 								obj.setBenRegId(benRegID);
 								RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
 										.getByRegID(benRegID);
@@ -164,6 +166,7 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 									}
 									obj.setRelatedBeneficiaryIdsDB(sb.toString());
 								}
+							
 
 							}
 
@@ -171,15 +174,16 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 									.save(benDetailsExtraList);
 
 							benDetailsExtraList.forEach((n) -> beneficiaryDetailsIds.add(n.getId()));
-						} else
-							throw new Exception("invalid/empty beneficiary request data.");
+//						} else
+//							throw new Exception("invalid/empty beneficiary request data.");
 
 						// born birth details
-						if (jsnOBJ != null && jsnOBJ.has("bornBirthDeatils") && benRegID != null) {
+						if (jsnOBJ != null && jsnOBJ.has("bornBirthDeatils")) {
 							RMNCHBornBirthDetails[] objArr1 = InputMapper.gson()
 									.fromJson(jsnOBJ.get("bornBirthDeatils"), RMNCHBornBirthDetails[].class);
 							List<RMNCHBornBirthDetails> bornBirthList = Arrays.asList(objArr1);
 							for (RMNCHBornBirthDetails obj : bornBirthList) {
+								benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid());
 								obj.setBenRegId(benRegID);
 								RMNCHBornBirthDetails temp = rMNCHBornBirthDetailsRepo.getByRegID(benRegID);
 								if (temp != null)
@@ -197,6 +201,7 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 							List<RMNCHCBACdetails> cbacList = Arrays.asList(objArr2);
 
 							for (RMNCHCBACdetails obj : cbacList) {
+								benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid());
 								obj.setBenRegId(benRegID);
 								obj.setConfirmed_hrp("Not checked");
 								obj.setConfirmed_ncd("Not checked");

From 841b5c4deb7b6ab374ddf8dfbce28470e9a883b2 Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:15:30 +0530
Subject: [PATCH 43/53] Delete .github/workflows/sast-and-package-prod.yml

---
 .github/workflows/sast-and-package-prod.yml | 64 ---------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 .github/workflows/sast-and-package-prod.yml

diff --git a/.github/workflows/sast-and-package-prod.yml b/.github/workflows/sast-and-package-prod.yml
deleted file mode 100644
index 87fa08e1..00000000
--- a/.github/workflows/sast-and-package-prod.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Static Code Analysis and Packaging Prod
-on:
-  push:
-    branches: [ "master"]
-    
-env:
-  ENV_VAR: prod
-        
-jobs:
-  CodeQL:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-    steps:
-
-    - name: Checkout code 
-      uses: actions/checkout@v2
-
-    - name: Setup JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: 8
-        distribution: 'adopt'
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: Java    
-
-    - name: Build with Maven
-      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} 
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        languages: Java   
-    
-  Packaging:
-    needs: codeql
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Setup JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: 8
-        distribution: 'adopt'
-
-    - name: Create WAR file 
-      run: mvn -B package --file pom.xml
-
-    - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v2 
-      with:
-        name: Identity-API
-        path: target/identity-0.0.1.war  

From 6f7f089d1420f66e8e14680638542cd7c782942f Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:15:44 +0530
Subject: [PATCH 44/53] Delete .github/workflows/sast-and-package.yml

---
 .github/workflows/sast-and-package.yml | 55 --------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 .github/workflows/sast-and-package.yml

diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
deleted file mode 100644
index 22b61c19..00000000
--- a/.github/workflows/sast-and-package.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Static Code Analysis and Packaging
-on:
-  push:
-    branches: [ "develop" ]
-
-env:
-  ENV_VAR: test
-   
-jobs:
-  CodeQL:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-    steps:
-    - name: Checkout code 
-      uses: actions/checkout@v2
-    - name: Setup JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: 8
-        distribution: 'adopt'
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: Java    
-    - name: Build with Maven
-      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-    
-  Packaging:
-    needs: codeql
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-    - name: Setup JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: 8
-        distribution: 'adopt'
-    - name: Test with maven
-      run: mvn test
-    - name: Create WAR file 
-      run: mvn -B package --file pom.xml
-    - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v2 
-      with:
-        name: Identity-API
-        path: target/identity-0.0.1.war  

From f1973f3429ca51fd96fb6014729afd23f15c0202 Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:18:32 +0530
Subject: [PATCH 45/53] Create package-prod.yml

---
 .github/workflows/package-prod.yml | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/workflows/package-prod.yml

diff --git a/.github/workflows/package-prod.yml b/.github/workflows/package-prod.yml
new file mode 100644
index 00000000..38b13cee
--- /dev/null
+++ b/.github/workflows/package-prod.yml
@@ -0,0 +1,41 @@
+name: Package-prod
+
+on:
+  push:
+    branches: [ "master"]
+    paths-ignore:
+     - target/**
+     
+  pull_request:
+     branches: [ "master" ]
+     paths-ignore:
+     - target/**
+     
+env:
+  ENV_VAR: prod
+
+jobs:
+  Package-prod:
+    runs-on: ubuntu-latest
+    steps:
+    
+    - name: Checkout code
+      uses: actions/checkout@v3
+      
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+        
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+      
+    - name: Create WAR file 
+      run: mvn -B package --file pom.xml
+      
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Identity-API
+        path: target/identity-0.0.1.war  

From d5a3d4054f95bc5ebeae2ecf5be6046be4aa267e Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:19:34 +0530
Subject: [PATCH 46/53] Create package.yml

---
 .github/workflows/package.yml | 41 +++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/workflows/package.yml

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
new file mode 100644
index 00000000..3c909711
--- /dev/null
+++ b/.github/workflows/package.yml
@@ -0,0 +1,41 @@
+name: Package
+
+on:
+  push:
+    branches: [ "develop"]
+    paths-ignore:
+     - target/**
+     
+  pull_request:
+     branches: [ "develop" ]
+     paths-ignore:
+     - target/**
+     
+env:
+  ENV_VAR: test
+
+jobs:
+  Package-test:
+    runs-on: ubuntu-latest
+    steps:
+    
+    - name: Checkout code 
+      uses: actions/checkout@v2
+      
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+        
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+      
+    - name: Build WAR file
+      run: mvn -B package --file pom.xml
+      
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Identity-API
+        path: target/identity-0.0.1.war  

From 05eaa5f3e83249ab3f11a8808043dc5b2046a052 Mon Sep 17 00:00:00 2001
From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:21:08 +0530
Subject: [PATCH 47/53] Create sast.yml

---
 .github/workflows/sast.yml | 52 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .github/workflows/sast.yml

diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml
new file mode 100644
index 00000000..1b3793bc
--- /dev/null
+++ b/.github/workflows/sast.yml
@@ -0,0 +1,52 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [ "develop" ]
+    paths-ignore:
+     - target/**
+     
+  pull_request:
+    branches: [ "develop" ]
+    paths-ignore:
+     - target/**
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+       
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+          java-version: 8
+          distribution: 'adopt'
+       
+    - name: Build with Maven
+      run: mvn clean install
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

From c808596abebbf6756774afd330fbfb4cb309e666 Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Thu, 5 Oct 2023 06:33:32 -0400
Subject: [PATCH 48/53] Use a logger to log this exception (#32)

---
 .../java/com/iemr/common/identity/service/IdentityService.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index b63ea4ea..dce6bd25 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -524,7 +524,6 @@ public List<BeneficiariesDTO> searchBeneficiaryByBlockIdAndLastModifyDate(Intege
 			}
 
 		} catch (Exception e) {
-			e.printStackTrace();
 			logger.error(
 					"error in beneficiary search for familyId : " + blockID + " error : " + e.getLocalizedMessage());
 		}

From 7f09523f671bce145593d14cfe8afbcd060f1b9b Mon Sep 17 00:00:00 2001
From: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Date: Fri, 6 Oct 2023 11:50:13 -0400
Subject: [PATCH 49/53] Added Pull Request template, added placeholders in
 properties file, and added admin_local to git ignore (#33)

---
 .github/PULL_REQUEST_TEMPLATE.md             | 30 ++++++++++++++++++++
 .gitignore                                   |  4 +++
 src/main/environment/1097_dev.properties     |  6 ++--
 src/main/environment/1097_local.properties   |  6 ++--
 src/main/environment/1097_test.properties    |  6 ++--
 src/main/environment/1097_uat.properties     |  6 ++--
 src/main/environment/common_dev.properties   |  6 ++--
 src/main/environment/common_local.properties |  6 ++--
 src/main/environment/common_test.properties  |  6 ++--
 src/main/environment/common_uat.properties   |  6 ++--
 10 files changed, 58 insertions(+), 24 deletions(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..58bdec2c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,30 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.  
+
+# Type of change  
+
+- [ ] Bug fix  
+- [ ] New feature  
+- [ ] Enhancement  
+- [ ] Refactoring  
+- [ ] Documentation  
+- [ ] Other ( please specify )  
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
+
+- [ ] Test A
+- [ ] Test B
+
+# Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] Any dependent changes have been merged and published in downstream modules
+
+
diff --git a/.gitignore b/.gitignore
index 7a81f181..a40a0fb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,7 @@ nbdist/
 mvnw
 mvnw.cmd
 .mvn
+
+# Properties
+src/main/environment/1097_local.properties
+src/main/environment/common_local.properties
\ No newline at end of file
diff --git a/src/main/environment/1097_dev.properties b/src/main/environment/1097_dev.properties
index c168f8ac..65d30eff 100644
--- a/src/main/environment/1097_dev.properties
+++ b/src/main/environment/1097_dev.properties
@@ -1,8 +1,8 @@
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=<Enter AMRIT 1097 DB URL here>
-spring.datasource.username=<Enter your AMRIT 1097 DB username>
-spring.datasource.password=<Enter your AMRIT 1097 DB password>
+spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/1097_local.properties b/src/main/environment/1097_local.properties
index bcaa98f8..10335c6c 100644
--- a/src/main/environment/1097_local.properties
+++ b/src/main/environment/1097_local.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=<Enter AMRIT 1097 DB URL here>
-spring.datasource.username=<Enter your AMRIT 1097 DB username>
-spring.datasource.password=<Enter your AMRIT 1097 DB password>
+spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/1097_test.properties b/src/main/environment/1097_test.properties
index c168f8ac..65d30eff 100644
--- a/src/main/environment/1097_test.properties
+++ b/src/main/environment/1097_test.properties
@@ -1,8 +1,8 @@
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=<Enter AMRIT 1097 DB URL here>
-spring.datasource.username=<Enter your AMRIT 1097 DB username>
-spring.datasource.password=<Enter your AMRIT 1097 DB password>
+spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/1097_uat.properties b/src/main/environment/1097_uat.properties
index bcaa98f8..10335c6c 100644
--- a/src/main/environment/1097_uat.properties
+++ b/src/main/environment/1097_uat.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=<Enter AMRIT 1097 DB URL here>
-spring.datasource.username=<Enter your AMRIT 1097 DB username>
-spring.datasource.password=<Enter your AMRIT 1097 DB password>
+spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
index 91e41673..be3ba54b 100644
--- a/src/main/environment/common_dev.properties
+++ b/src/main/environment/common_dev.properties
@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=<Enter AMRIT DB URL here>
-spring.datasource.username=<Enter your AMRIT DB username>
-spring.datasource.password=<Enter your AMRIT DB password>
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties
index cf922ff1..2792334a 100644
--- a/src/main/environment/common_local.properties
+++ b/src/main/environment/common_local.properties
@@ -1,5 +1,5 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=<Enter AMRIT DB URL here>
-spring.datasource.username=<Enter your AMRIT DB username>
-spring.datasource.password=<Enter your AMRIT DB password>
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index 91e41673..be3ba54b 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=<Enter AMRIT DB URL here>
-spring.datasource.username=<Enter your AMRIT DB username>
-spring.datasource.password=<Enter your AMRIT DB password>
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
index 0f550fa5..386548ec 100644
--- a/src/main/environment/common_uat.properties
+++ b/src/main/environment/common_uat.properties
@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=<Enter AMRIT DB URL here>
-spring.datasource.username=<Enter your AMRIT DB username>
-spring.datasource.password=<Enter your AMRIT DB password>
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 

From 4d125dccc6eb7346814469fcfe95b797ad7a424f Mon Sep 17 00:00:00 2001
From: Mithun James <drtechie@users.noreply.github.com>
Date: Thu, 19 Oct 2023 18:12:24 +0530
Subject: [PATCH 50/53] Add CI build properties, add pom.xml plugins to tweak
 build process (#34)

* Add CI build properties, add pom.xml plugins to tweak build process

* Correct .gitignore file names
---
 .gitignore                                    |  2 +-
 .java-version                                 |  1 +
 README.md                                     |  7 +++
 pom.xml                                       | 50 ++++++++++++++++---
 src/main/environment/1097_ci.properties       |  5 ++
 ...cal.properties => 1097_example.properties} |  0
 src/main/environment/common_ci.properties     |  5 ++
 ...l.properties => common_example.properties} |  0
 8 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 .java-version
 create mode 100644 src/main/environment/1097_ci.properties
 rename src/main/environment/{1097_local.properties => 1097_example.properties} (100%)
 create mode 100644 src/main/environment/common_ci.properties
 rename src/main/environment/{common_local.properties => common_example.properties} (100%)

diff --git a/.gitignore b/.gitignore
index a40a0fb7..6a8f7aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,4 @@ mvnw.cmd
 
 # Properties
 src/main/environment/1097_local.properties
-src/main/environment/common_local.properties
\ No newline at end of file
+src/main/environment/common_local.properties
diff --git a/.java-version b/.java-version
new file mode 100644
index 00000000..62593409
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+1.8
diff --git a/README.md b/README.md
index 98173c4d..0d4c562f 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,15 @@ This service has been tested on Wildfly as the application server.
 * Redis
 * MySQL Database
 
+## Environment and setup
+
+1. Install dependencies `mvn clean install`
+2. You can copy `common_example.properties` to `common_local.properties` and edit the file accordingly. The file is under `src/main/environment` folder.
+3. Run the spring server with local configuration `mvn spring-boot:run -DENV_VAR=local`
+
 ## Integrations
 * RMNCH (Reproductive, Maternal, Newborn, and Child Health)
+
 ## Usage
 All features have been exposed as REST endpoints. Refer to the SWAGGER API specification for details.
 
diff --git a/pom.xml b/pom.xml
index 7fe31aa3..4c914458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
 		<environment>${ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
-		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
+		<source-properties>target/classes/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>
 		<sonar.java.binaries>target</sonar.java.binaries>
 	</properties>
@@ -211,7 +211,7 @@
 			<properties>
 				<final-name>1097identityapi-v1.0</final-name>
 				<target-properties>target/classes/application.properties</target-properties>
-				<source-properties>src/main/environment/1097_${environment}.properties</source-properties>
+				<source-properties>target/classes/1097_${environment}.properties</source-properties>
 			</properties>
 			<build>
 				<finalName>1097identityapi-v1.0</finalName>
@@ -219,8 +219,6 @@
 		</profile>
 	</profiles>
 
-
-
 	<build>
 		<finalName>identity-0.0.1</finalName>
 		<plugins>
@@ -255,6 +253,32 @@
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>filter-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+						<configuration>
+							<delimiters>@</delimiters>
+							<useDefaultDelimiters>false</useDefaultDelimiters>
+							<resources>
+								<resource>
+									<directory>src/main/environment</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>common_${environment}.properties</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
@@ -265,11 +289,11 @@
 						<goals>
 							<goal>run</goal>
 						</goals>
-						<id>properties-updated</id>
+						<id>merge-properties</id>
 						<configuration>
 							<target>
 								<echo>
-									concatinating properties file ${target-properties} and
+									concatenating properties file ${target-properties} and
 									${source-properties}
 								</echo>
 								<concat destfile="${target-properties}" append="yes"
@@ -280,6 +304,20 @@
 							</target>
 						</configuration>
 					</execution>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<id>clean-property-files</id>
+						<configuration>
+							<tasks>
+								<delete>
+									<file file="${source-properties}"/>
+								</delete>
+							</tasks>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
diff --git a/src/main/environment/1097_ci.properties b/src/main/environment/1097_ci.properties
new file mode 100644
index 00000000..11418e69
--- /dev/null
+++ b/src/main/environment/1097_ci.properties
@@ -0,0 +1,5 @@
+# DataSource settings: set here your own configurations for the database
+spring.datasource.url=@env.DATABASE_URL@
+spring.datasource.username=@env.DATABASE_USERNAME@
+spring.datasource.password=@env.DATABASE_PASSWORD@
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/1097_local.properties b/src/main/environment/1097_example.properties
similarity index 100%
rename from src/main/environment/1097_local.properties
rename to src/main/environment/1097_example.properties
diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
new file mode 100644
index 00000000..11418e69
--- /dev/null
+++ b/src/main/environment/common_ci.properties
@@ -0,0 +1,5 @@
+# DataSource settings: set here your own configurations for the database
+spring.datasource.url=@env.DATABASE_URL@
+spring.datasource.username=@env.DATABASE_USERNAME@
+spring.datasource.password=@env.DATABASE_PASSWORD@
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_example.properties
similarity index 100%
rename from src/main/environment/common_local.properties
rename to src/main/environment/common_example.properties

From 2ed416897ccf74ea1dacd87af46dcdbf6099997c Mon Sep 17 00:00:00 2001
From: bshivani7 <133210639+bshivani7@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:39:26 +0530
Subject: [PATCH 51/53] http insecure changes (#39)

Co-authored-by: Burdhi. Shivani <BU40088124@wipro.com>
---
 .../config/BlockingHttpMethodInterceptor.java | 36 +++++++++++++++++++
 .../identity/config/InterceptorConfig.java    |  9 ++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/iemr/common/identity/config/BlockingHttpMethodInterceptor.java

diff --git a/src/main/java/com/iemr/common/identity/config/BlockingHttpMethodInterceptor.java b/src/main/java/com/iemr/common/identity/config/BlockingHttpMethodInterceptor.java
new file mode 100644
index 00000000..6f42d8b9
--- /dev/null
+++ b/src/main/java/com/iemr/common/identity/config/BlockingHttpMethodInterceptor.java
@@ -0,0 +1,36 @@
+package com.iemr.common.identity.config;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+public class BlockingHttpMethodInterceptor implements HandlerInterceptor {
+	@Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String method = request.getMethod();
+        if (!("GET".equals(method) || "POST".equals(method))) {
+            response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+            return false;
+        }
+        return true;
+}
+
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+			ModelAndView modelAndView) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+}
diff --git a/src/main/java/com/iemr/common/identity/config/InterceptorConfig.java b/src/main/java/com/iemr/common/identity/config/InterceptorConfig.java
index f94c2dd1..1a271529 100644
--- a/src/main/java/com/iemr/common/identity/config/InterceptorConfig.java
+++ b/src/main/java/com/iemr/common/identity/config/InterceptorConfig.java
@@ -35,9 +35,16 @@ public class InterceptorConfig extends WebMvcConfigurerAdapter
 	@Autowired
 	HTTPRequestInterceptor requestInterceptor;
 
+//	@Override
+//	public void addInterceptors(InterceptorRegistry registry)
+//	{
+//		registry.addInterceptor(requestInterceptor);
+//	}
+	
 	@Override
 	public void addInterceptors(InterceptorRegistry registry)
 	{
-		registry.addInterceptor(requestInterceptor);
+		 registry.addInterceptor(new BlockingHttpMethodInterceptor())
+         .addPathPatterns("/**"); 
 	}
 }
\ No newline at end of file

From c5e2d35d0c8c907e47aff7c26e528ab92a78a657 Mon Sep 17 00:00:00 2001
From: Helen Grace Karyamsetty
 <133211481+helenKaryamsetty@users.noreply.github.com>
Date: Thu, 14 Dec 2023 16:13:47 +0530
Subject: [PATCH 52/53] Merge branch 'master'  (#40)

* Merge branch 'master' of
https://github.com/helenKaryamsetty/Identity-API

* Delete src/main/java/com/iemr/common/identity/utils/CryptoUtil.java

---------

Co-authored-by: KA40094929 <KA40094929@L-158018332.wipro.com>
Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
---
 .github/workflows/build-on-pull-request.yml |  3 +-
 .github/workflows/package.yml               |  8 +++-
 .github/workflows/sast-and-package.yml      | 47 +++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/sast-and-package.yml

diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
index 07e011e8..e85afa86 100644
--- a/.github/workflows/build-on-pull-request.yml
+++ b/.github/workflows/build-on-pull-request.yml
@@ -30,4 +30,5 @@ jobs:
       run: mvn clean install
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
\ No newline at end of file
+      uses: github/codeql-action/analyze@v2
+
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 3c909711..97b4a174 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -17,11 +17,17 @@ env:
 jobs:
   Package-test:
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
     steps:
     
     - name: Checkout code 
       uses: actions/checkout@v2
-      
     - name: Setup JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
new file mode 100644
index 00000000..97b4a174
--- /dev/null
+++ b/.github/workflows/sast-and-package.yml
@@ -0,0 +1,47 @@
+name: Package
+
+on:
+  push:
+    branches: [ "develop"]
+    paths-ignore:
+     - target/**
+     
+  pull_request:
+     branches: [ "develop" ]
+     paths-ignore:
+     - target/**
+     
+env:
+  ENV_VAR: test
+
+jobs:
+  Package-test:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+    steps:
+    
+    - name: Checkout code 
+      uses: actions/checkout@v2
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+        
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+      
+    - name: Build WAR file
+      run: mvn -B package --file pom.xml
+      
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Identity-API
+        path: target/identity-0.0.1.war  

From ca41970805d6116040b1e4e407aa1a7b29293f3c Mon Sep 17 00:00:00 2001
From: Harimohan Rajamohanan <harimohan.rajamohanan@wipro.com>
Date: Thu, 14 Dec 2023 16:51:36 +0530
Subject: [PATCH 53/53] Merge conflict resolution prior to develop -> master
 merge (#42)

* Develop branch merge to master (#5)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>

* Feature/dev tomaster (#36)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

* code smell fixes (#6)

* Added copyright text (#7)

Co-authored-by: Anjana K J <an356996@wipro.com>

* code smell fix (#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties

* Swagger changes (#9)

* Swagger changes

* Swagger changes

* Code smell fix (#10)

* code smell fixes (#11)

* Create sast-and-package-prod.yml (#12)

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml

* Code smell changes (#13)

* Update README.md

* code smell fixes

* Added environment variable

* Added password changes & edit environment variable (#16)

* Added environment variable

* Added password changes

* Passing environment variable

* Passing environment variable (#17)

* Passing environment variable

* Passing environment variable (#19)

* Passing environment variable (#20)

* Passing environment variable

* Passing environment variable

* Workflow change (#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* CreatedDate filed for Identity (#22)

* CreatedDate filed for Identity

* removed uncommented code

* Send SMS null Id issue (#23)

* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue

* mmu cr changes

* update changes

* changes mmu cr

* Update sast-and-package-prod.yml (#26)

* edit api changes

* Identity API cleanup and password masking

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Identity API cleanup and password masking

* edit api changes

* change made in description of identity controller (#30)

* Multiple beneficiaries sync issue changes for FLW (#31)

Co-authored-by: Devika <de40034072@wipro.com>

* Delete .github/workflows/sast-and-package-prod.yml

* Delete .github/workflows/sast-and-package.yml

* Create package-prod.yml

* Create package.yml

* Create sast.yml

* Use a logger to log this exception (#32)

* Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (#33)

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Co-authored-by: Anjana K J <an356996@wipro.com>
Co-authored-by: Harimohan Rajamohanan <30436665+harimohanr@users.noreply.github.com>
Co-authored-by: swetatech24 <sweta.prakash@wipro.com>
Co-authored-by: Anjana <anjana.j28@wipro.com>
Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com>
Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com>
Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com>
Co-authored-by: Sunil GV <sunil.g@beehyv.com>
Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com>
Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com>
Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Co-authored-by: Devika <de40034072@wipro.com>

* Resolved a merge conflict

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Co-authored-by: Anjana K J <an356996@wipro.com>
Co-authored-by: swetatech24 <sweta.prakash@wipro.com>
Co-authored-by: Anjana <anjana.j28@wipro.com>
Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com>
Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com>
Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com>
Co-authored-by: Sunil GV <sunil.g@beehyv.com>
Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com>
Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com>
Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Co-authored-by: Devika <de40034072@wipro.com>
---
 .github/workflows/build-on-pull-request.yml  | 1 -
 .github/workflows/package.yml                | 1 +
 src/main/environment/common_local.properties | 5 +++++
 src/main/environment/common_test.properties  | 4 +---
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 src/main/environment/common_local.properties

diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
index e85afa86..8970ea82 100644
--- a/.github/workflows/build-on-pull-request.yml
+++ b/.github/workflows/build-on-pull-request.yml
@@ -31,4 +31,3 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
-
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 97b4a174..c1dfbc44 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -33,6 +33,7 @@ jobs:
       with:
         java-version: 8
         distribution: 'adopt'
+
         
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties
new file mode 100644
index 00000000..2473a727
--- /dev/null
+++ b/src/main/environment/common_local.properties
@@ -0,0 +1,5 @@
+# DataSource settings: set here your own configurations for the database
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
\ No newline at end of file
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index be3ba54b..2473a727 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -2,6 +2,4 @@
 spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
 spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
\ No newline at end of file
