Fix compile and startup errors. Relax validation.

hapifhir · Jan 30, 2025 · 4d000c4 · 4d000c4
1 parent da05e9d
commit 4d000c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/EmbeddedOperationUtils.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/EmbeddedOperationUtils.java
@@ -271,12 +271,14 @@ private static void validateGenericTypes(
 				final Type parameterTypeArgumentAtIndex = parameterTypeArguments[index];
 				final Type fieldTypeArgumentAtIndex = fieldTypeArguments[index];
 
-				if (!parameterTypeArgumentAtIndex.equals(fieldTypeArgumentAtIndex)) {
-					final String error = String.format(
-							"Generic type argument does not match constructor: %s, field: %s for class: %s",
-							parameterTypeArgumentAtIndex, fieldTypeArgumentAtIndex, theDeclaringClass);
-					throw new ConfigurationException(error);
-				}
+				// LUKETODO:  this causes errors if we pass in a generic type with one type of generic parameter (String)
+				// and convert it to another (StringType)
+//				if (!parameterTypeArgumentAtIndex.equals(fieldTypeArgumentAtIndex)) {
+//					final String error = String.format(
+//							"Generic type argument does not match constructor: %s, field: %s for class: %s",
+//							parameterTypeArgumentAtIndex, fieldTypeArgumentAtIndex, theDeclaringClass);
+//					throw new ConfigurationException(error);
+//				}
 			}
 		} else {
 			final String error = String.format(

diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/CareGapsParams.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/CareGapsParams.java
@@ -115,7 +115,7 @@ public CareGapsParams(
 		myNonDocument = theNonDocument;
 	}
 
-	public CareGapsParams(CareGapsParams.Builder builder) {
+	private CareGapsParams(CareGapsParams.Builder builder) {
 		this(
 				builder.myPeriodStart,
 				builder.myPeriodEnd,

diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java
@@ -69,7 +69,7 @@ public MeasureReport evaluateMeasure(
 						// thing as a MUTUALLY EXCLUSIVE ANNotation?4. is there such as thing as a MUTUALLY EXCLUSIVE
 						// ANNotation?4. is there such as thing as a MUTUALLY EXCLUSIVE ANNotation?
 						// so 3 different params :  try annotations
-						Eithers.forMiddle3(theParams.getId()),
+						theParams.getMeasure(),
 						theParams.getPeriodStart(),
 						theParams.getPeriodEnd(),
 						theParams.getReportType(),