Revert change to supportsSystem method and fix test.

hapifhir · Nov 23, 2024 · 2091291 · 2091291
1 parent c37ed40
commit 2091291
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReadSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReadSvc.java
@@ -56,6 +56,11 @@
  */
 public interface ITermReadSvc extends IValidationSupport {
 
+	@Override
+	default String getName() {
+		return getClass().getSimpleName() + " JPA Term Read Service";
+	}
+
 	ValueSet expandValueSet(
 			@Nullable ValueSetExpansionOptions theExpansionOptions, @Nonnull String theValueSetCanonicalUrl);
 

diff --git a/...jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java b/...jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java
@@ -1530,7 +1530,7 @@ public void validateResource_withUnknownMetaProfileurl_validatesButLogsWarning()
 		// we have errors
 		assertFalse(errors.isEmpty());
 
-		LogbackTestExtensionAssert.assertThat(myLogbackTestExtension).hasWarnMessage("Unrecognized profile uri");
+		LogbackTestExtensionAssert.assertThat(myLogbackTestExtension).hasWarnMessage("Unrecognized resource uri");
 	}
 
 	@Test

diff --git a/...va/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java b/...va/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java
@@ -749,7 +749,9 @@ public void setLogger(@Nonnull org.hl7.fhir.r5.context.ILoggingService logger) {
 
 	@Override
 	public boolean supportsSystem(String system) {
-		return hasResource(CodeSystem.class, system);
+		return myValidationSupportContext
+				.getRootValidationSupport()
+				.isCodeSystemSupported(myValidationSupportContext, system);
 	}
 
 	@Override