Merge pull request #51 from ravishanigarapu/develop

CI CD Test

Author: devikasuresh20

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

@@ -13,10 +13,10 @@ jobs:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-      - name: Setup JDK 8
+      - name: Setup JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'adopt'
       - name: Build with Maven  
         run: mvn clean install

.github/workflows/package.yml

@@ -22,10 +22,10 @@ jobs:
     - name: Checkout code 
       uses: actions/checkout@v2
 
-    - name: Setup JDK 8
+    - name: Setup JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: 8
+        java-version: 17
         distribution: 'adopt'
 
     - name: Build with Maven
@@ -35,7 +35,7 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v2 
+      uses: actions/upload-artifact@v3 
       with:
         name: TM-API
         path: target/tmapi-v1.0.war

.github/workflows/sast.yml

@@ -37,10 +37,10 @@ jobs:
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
 
-    - name: Setup JDK 8
+    - name: Setup JDK 17
       uses: actions/setup-java@v2
       with:
-          java-version: 8
+          java-version: 17
           distribution: 'adopt'
 
     - name: Build with Maven

src/main/java/com/iemr/tm/controller/patientApp/master/PatientAppCommonMasterController.java

@@ -49,10 +49,13 @@
 
 public class PatientAppCommonMasterController {
 
-	private Logger logger = LoggerFactory.getLogger(CommonMasterController.class);
-	@Autowired
+	private Logger logger = LoggerFactory.getLogger(PatientAppCommonMasterController.class);
 	private CommonPatientAppMasterService commonPatientAppMasterService;
 
+	@Autowired
+	public void setCommonPatientAppMasterService(CommonPatientAppMasterService commonPatientAppMasterService) {
+		this.commonPatientAppMasterService = commonPatientAppMasterService;
+	}
 	/**
 	 * @param visitCategoryID
 	 * @return nurse master data for the provided visitCategoryID