Rename to extractItemDependentVariables (#2501)

google · Mar 28, 2024 · ae5a2ec · ae5a2ec
1 parent b157fd4
commit ae5a2ec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...ain/java/com/google/android/fhir/datacapture/expressions/EnabledAnswerOptionsEvaluator.kt b/...ain/java/com/google/android/fhir/datacapture/expressions/EnabledAnswerOptionsEvaluator.kt
@@ -204,7 +204,7 @@ internal class EnabledAnswerOptionsEvaluator(
  checkNotNull(xFhirQueryResolver) {
  "XFhirQueryResolver cannot be null. Please provide the XFhirQueryResolver via DataCaptureConfig."
  }
- val variablesMap = expressionEvaluator.extractDependentVariables(answerExpression, item)
+ val variablesMap = expressionEvaluator.extractItemDependentVariables(answerExpression, item)
  val xFhirExpressionString =
  expressionEvaluator.createXFhirQueryFromExpression(answerExpression, variablesMap)
  if (answerExpressionMap.containsKey(xFhirExpressionString)) {

diff --git a/...capture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt b/...capture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
@@ -154,7 +154,7 @@ internal class ExpressionEvaluator(
  questionnaireResponseItem: QuestionnaireResponseItemComponent?,
  expression: Expression,
  ): List<Base> {
- val appContext = extractDependentVariables(expression, questionnaireItem)
+ val appContext = extractItemDependentVariables(expression, questionnaireItem)
  return evaluateToBase(
  questionnaireResponse,
  questionnaireResponseItem,
@@ -244,7 +244,7 @@ internal class ExpressionEvaluator(
  ) {
  "The expression should come from the same questionnaire item"
  }
- extractDependentVariables(
+ extractItemDependentVariables(
  expression,
  questionnaireItem,
  variablesMap,
@@ -265,7 +265,7 @@ internal class ExpressionEvaluator(
  * @param variablesMap the [Map<String, Base>] of variables, the default value is empty map is
  * defined
  */
- internal suspend fun extractDependentVariables(
+ internal suspend fun extractItemDependentVariables(
  expression: Expression,
  questionnaireItem: QuestionnaireItemComponent,
  variablesMap: MutableMap<String, Base?> = mutableMapOf(),

diff --git a/...ure/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt b/...ure/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt
@@ -1155,7 +1155,7 @@ class ExpressionEvaluatorTest {
 
  runBlocking {
  val variablesMap =
- expressionEvaluator.extractDependentVariables(
+ expressionEvaluator.extractItemDependentVariables(
  questionnaire.item[0].item[0].answerExpression!!,
  questionnaire.item[0],
  )
@@ -1230,7 +1230,7 @@ class ExpressionEvaluatorTest {
 
  runBlocking {
  val variablesMap =
- expressionEvaluator.extractDependentVariables(
+ expressionEvaluator.extractItemDependentVariables(
  questionnaire.item[0].item[0].answerExpression!!,
  questionnaire.item[0],
  )