Fixed variable name mismatch with endpoints (#579)

cqframework · Aug 1, 2022 · 2e7a748 · 2e7a748
1 parent cd045cf
commit 2e7a748
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/dstu3/provider/CqlExecutionProvider.java b/plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/dstu3/provider/CqlExecutionProvider.java
@@ -185,9 +185,9 @@ public Parameters evaluate(
 		@OperationParam(name = "content", max = 1) String content) {
 
 		EndpointInfo remoteData = dataEndpoint != null
-				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(contentEndpoint) : null;
-		EndpointInfo remoteContent = contentEndpoint != null
 				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(dataEndpoint) : null;
+		EndpointInfo remoteContent = contentEndpoint != null
+				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(contentEndpoint) : null;
 		EndpointInfo remoteTerminology = terminologyEndpoint != null
 				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(terminologyEndpoint) : null;
 		LibraryContentProvider contentProvider = remoteContent != null

diff --git a/...cpg/src/main/java/org/opencds/cqf/ruler/cpg/dstu3/provider/LibraryEvaluationProvider.java b/...cpg/src/main/java/org/opencds/cqf/ruler/cpg/dstu3/provider/LibraryEvaluationProvider.java
@@ -129,9 +129,9 @@ public Parameters evaluate(
 		@OperationParam(name = "terminologyEndpoint") Endpoint terminologyEndpoint) {
 
 		EndpointInfo remoteData = dataEndpoint != null
-				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(contentEndpoint) : null;
-		EndpointInfo remoteContent = contentEndpoint != null
 				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(dataEndpoint) : null;
+		EndpointInfo remoteContent = contentEndpoint != null
+				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(contentEndpoint) : null;
 		EndpointInfo remoteTerminology = terminologyEndpoint != null
 				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(terminologyEndpoint) : null;
 		LibraryContentProvider contentProvider = remoteContent != null

diff --git a/plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/r4/provider/CqlExecutionProvider.java b/plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/r4/provider/CqlExecutionProvider.java
@@ -190,9 +190,9 @@ public Parameters evaluate(
 		@OperationParam(name = "content", max = 1) String content) {
 
 		EndpointInfo remoteData = dataEndpoint != null
-				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(contentEndpoint) : null;
-		EndpointInfo remoteContent = contentEndpoint != null
 				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(dataEndpoint) : null;
+		EndpointInfo remoteContent = contentEndpoint != null
+				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(contentEndpoint) : null;
 		EndpointInfo remoteTerminology = terminologyEndpoint != null
 				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(terminologyEndpoint) : null;
 		LibraryContentProvider contentProvider = remoteContent != null

diff --git a/...in/cpg/src/main/java/org/opencds/cqf/ruler/cpg/r4/provider/LibraryEvaluationProvider.java b/...in/cpg/src/main/java/org/opencds/cqf/ruler/cpg/r4/provider/LibraryEvaluationProvider.java
@@ -129,9 +129,9 @@ public Parameters evaluate(
 		@OperationParam(name = "terminologyEndpoint") Endpoint terminologyEndpoint) {
 
 		EndpointInfo remoteData = dataEndpoint != null
-				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(contentEndpoint) : null;
-		EndpointInfo remoteContent = contentEndpoint != null
 				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(dataEndpoint) : null;
+		EndpointInfo remoteContent = contentEndpoint != null
+				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(contentEndpoint) : null;
 		EndpointInfo remoteTerminology = terminologyEndpoint != null
 				? new EndpointConverter(new AdapterFactory()).getEndpointInfo(terminologyEndpoint) : null;
 		LibraryContentProvider contentProvider = remoteContent != null