revert some unnecessary param naming changes

pmanko2 · Jun 9, 2022 · adeaf83 · adeaf83
1 parent 21013a1
commit adeaf83
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/api/src/main/java/org/openmrs/module/fhir2/api/search/SearchQueryInclude.java b/api/src/main/java/org/openmrs/module/fhir2/api/search/SearchQueryInclude.java
@@ -217,14 +217,14 @@ private IBundleProvider handleLocationReverseInclude(ReferenceAndListParam param
 		return null;
 	}
 
-	private IBundleProvider handleObservationReverseInclude(ReferenceAndListParam param, String targetType) {
+	private IBundleProvider handleObservationReverseInclude(ReferenceAndListParam params, String targetType) {
 		switch (targetType) {
 			case FhirConstants.OBSERVATION:
 				ObservationSearchParams observationSearchParams = new ObservationSearchParams();
-				observationSearchParams.setHasMember(param);
+				observationSearchParams.setHasMember(params);
 				return observationService.searchForObservations(observationSearchParams);
 			case FhirConstants.DIAGNOSTIC_REPORT:
-				return diagnosticReportService.searchForDiagnosticReports(null, null, null, null, param, null, null, null,
+				return diagnosticReportService.searchForDiagnosticReports(null, null, null, null, params, null, null, null,
 				    null);
 		}
 
@@ -248,21 +248,21 @@ private IBundleProvider handlePractitionerReverseInclude(ReferenceAndListParam p
 		return null;
 	}
 
-	private IBundleProvider handleEncounterReverseInclude(ReferenceAndListParam encounterParam, String targetType) {
+	private IBundleProvider handleEncounterReverseInclude(ReferenceAndListParam params, String targetType) {
 		switch (targetType) {
 			case FhirConstants.OBSERVATION:
 				ObservationSearchParams observationSearchParams = new ObservationSearchParams();
-				observationSearchParams.setEncounter(encounterParam);
+				observationSearchParams.setEncounter(params);
 				return observationService.searchForObservations(observationSearchParams);
 			case FhirConstants.DIAGNOSTIC_REPORT:
-				return diagnosticReportService.searchForDiagnosticReports(encounterParam, null, null, null, null, null, null,
+				return diagnosticReportService.searchForDiagnosticReports(params, null, null, null, null, null, null,
 				    null, null);
 			case FhirConstants.MEDICATION_REQUEST:
-				return medicationRequestService.searchForMedicationRequests(null, encounterParam, null, null, null, null,
+				return medicationRequestService.searchForMedicationRequests(null, params, null, null, null, null,
 				    null, null);
 			case FhirConstants.PROCEDURE_REQUEST:
 			case FhirConstants.SERVICE_REQUEST:
-				return serviceRequestService.searchForServiceRequests(null, null, encounterParam, null, null, null, null,
+				return serviceRequestService.searchForServiceRequests(null, null, params, null, null, null, null,
 				    null);
 		}
 
@@ -279,28 +279,28 @@ private IBundleProvider handleMedicationReverseInclude(ReferenceAndListParam par
 		return null;
 	}
 
-	private IBundleProvider handlePatientReverseInclude(ReferenceAndListParam patientParam, String targetType) {
+	private IBundleProvider handlePatientReverseInclude(ReferenceAndListParam params, String targetType) {
 		switch (targetType) {
 			case FhirConstants.OBSERVATION:
 				ObservationSearchParams observationSearchParams = new ObservationSearchParams();
-				observationSearchParams.setPatient(patientParam);
+				observationSearchParams.setPatient(params);
 				return observationService.searchForObservations(observationSearchParams);
 			case FhirConstants.DIAGNOSTIC_REPORT:
-				return diagnosticReportService.searchForDiagnosticReports(null, patientParam, null, null, null, null, null,
+				return diagnosticReportService.searchForDiagnosticReports(null, params, null, null, null, null, null,
 				    null, null);
 			case FhirConstants.ALLERGY_INTOLERANCE:
-				return allergyIntoleranceService.searchForAllergies(patientParam, null, null, null, null, null, null, null,
+				return allergyIntoleranceService.searchForAllergies(params, null, null, null, null, null, null, null,
 				    null, null);
 			case FhirConstants.ENCOUNTER:
 				EncounterSearchParams encounterSearchParams = new EncounterSearchParams();
-				encounterSearchParams.setSubject(patientParam);
+				encounterSearchParams.setSubject(params);
 				return encounterService.searchForEncounters(encounterSearchParams);
 			case FhirConstants.MEDICATION_REQUEST:
-				return medicationRequestService.searchForMedicationRequests(patientParam, null, null, null, null, null, null,
+				return medicationRequestService.searchForMedicationRequests(params, null, null, null, null, null, null,
 				    null);
 			case FhirConstants.SERVICE_REQUEST:
 			case FhirConstants.PROCEDURE_REQUEST:
-				return serviceRequestService.searchForServiceRequests(patientParam, null, null, null, null, null, null,
+				return serviceRequestService.searchForServiceRequests(params, null, null, null, null, null, null,
 				    null);
 		}