Merge conflict resolution prior to develop -> master merge (PSMRI#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 (PSMRI#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 (PSMRI#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties

* Swagger changes (PSMRI#9)

* Swagger changes

* Swagger changes

* Code smell fix (PSMRI#10)

* code smell fixes (PSMRI#11)

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

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml

* Code smell changes (PSMRI#13)

* Update README.md

* code smell fixes

* Added environment variable

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

* Added environment variable

* Added password changes

* Passing environment variable

* Passing environment variable (PSMRI#17)

* Passing environment variable

* Passing environment variable (PSMRI#19)

* Passing environment variable (PSMRI#20)

* Passing environment variable

* Passing environment variable

* Workflow change (PSMRI#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* CreatedDate filed for Identity (PSMRI#22)

* CreatedDate filed for Identity

* removed uncommented code

* Send SMS null Id issue (PSMRI#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 (PSMRI#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 (PSMRI#30)

* Multiple beneficiaries sync issue changes for FLW (PSMRI#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 (PSMRI#32)

* Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (PSMRI#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>

Author: 16 people

.github/workflows/build-on-pull-request.yml

@@ -31,4 +31,3 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
-

.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 }}

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

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