Rel 6 8 2 mb

hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonStructure.java

@@ -28,6 +28,7 @@
 import ca.uhn.fhir.parser.json.JsonLikeStructure;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -388,6 +389,15 @@ private static ObjectMapper createObjectMapper() {
 		retVal = retVal.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
 		retVal = retVal.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
 		retVal = retVal.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
+
+		retVal.getFactory().setStreamReadConstraints(createStreamReadConstraints());
+
 		return retVal;
 	}
+
+	private static StreamReadConstraints createStreamReadConstraints() {
+		return StreamReadConstraints.builder()
+				.maxStringLength(Integer.MAX_VALUE)
+				.build();
+	}
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java

@@ -119,13 +119,16 @@ public enum VersionEnum {
 	V6_6_0,
 	V6_7_0,
 	V6_8_0,
-
+	V6_8_1,
+	V6_8_2,
 	V6_9_0,
 
 	V7_0_0;
 
+
 	public static VersionEnum latestVersion() {
 		VersionEnum[] values = VersionEnum.values();
 		return values[values.length - 1];
 	}
 }
+

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_8_0/5205-uploading-large-vocabulary-file-returns-error.yaml

@@ -0,0 +1,5 @@
+---
+type: fix
+issue: 5205
+title: "Previously, uploading a large vocabulary file (like Loinc) through the upload-external-code-system command would
+return an error.  The issue has been fixed."

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_8_1/upgrade.md

@@ -0,0 +1 @@
+Note: this release has been decommissioned, and you should not be using it. Please upgrade to a newer version.

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_8_1/version.yaml

@@ -0,0 +1,3 @@
+---
+release-date: "2023-08-31"
+codename: "Yucatán"

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_8_2/upgrade.md

@@ -0,0 +1 @@
+Note: this release has been decommissioned, and you should not be using it. Please upgrade to a newer version.

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_8_2/version.yaml

@@ -0,0 +1,3 @@
+---
+release-date: "2023-09-05"
+codename: "Yucatán"

hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/jsonlike/JsonLikeParserTest.java

@@ -10,9 +10,13 @@
 import ca.uhn.fhir.parser.json.JsonLikeStructure;
 import ca.uhn.fhir.parser.json.jackson.JacksonStructure;
 import ca.uhn.fhir.parser.view.ExtPatient;
+import ca.uhn.fhir.util.AttachmentUtil;
+import ca.uhn.fhir.util.ParametersUtil;
 import ca.uhn.fhir.util.TestUtil;
 import org.apache.commons.io.IOUtils;
+import org.hl7.fhir.instance.model.api.IBaseParameters;
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.r4.model.Extension;
 import org.hl7.fhir.r4.model.IntegerType;
 import org.hl7.fhir.r4.model.Patient;
@@ -21,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.Writer;
@@ -63,6 +68,22 @@ public void testJsonLikeParseAndEncodeResourceFromXmlToJson() throws Exception {
 		assertEquals(parsed.getClass().getName(), resource.getClass().getName(), "reparsed resource classes not equal");
 	}
 
+	@Test
+	public void testJacksonStructureCanLoadLoincTerminogy() throws IOException {
+		// given
+		IBaseParameters inputParametersForLoinc = getUploadTerminologyCommandInputParametersForLoinc();
+		String s = ourCtx.newJsonParser().encodeResourceToString(inputParametersForLoinc);
+		StringReader stringReader = new StringReader(s);
+
+		// when
+		JsonLikeStructure jsonLikeStructure = new JacksonStructure();
+		jsonLikeStructure.load(stringReader);
+
+		// then
+		assertNotNull(jsonLikeStructure.getRootObject());
+
+	}
+
 	/**
 	 * Test JSON-Like writer using custom stream writer
 	 * 
@@ -151,14 +172,34 @@ public void testViewJson() throws Exception {
 
 		assertEquals(0, va.getExtension().size());
 	}
-
+
+	private IBaseParameters getUploadTerminologyCommandInputParametersForLoinc() throws IOException {
+		IBaseParameters inputParameters = ParametersUtil.newInstance(ourCtx);
+		ParametersUtil.addParameterToParametersUri(
+			ourCtx, inputParameters, "system", "http://loinc.org");
+
+		try(InputStream inputStream = JsonLikeParserTest.class.getResourceAsStream("/Loinc_2.72.zip")) {
+
+			ICompositeType attachment = AttachmentUtil.newInstance(ourCtx);
+			AttachmentUtil.setContentType(ourCtx, attachment, "application/zip");
+			AttachmentUtil.setUrl(ourCtx, attachment, "Loinc_2.72.zip");
+
+			AttachmentUtil.setData(ourCtx, attachment, IOUtils.toByteArray(inputStream));
+
+			ParametersUtil.addParameterToParameters(
+				ourCtx, inputParameters, "file", attachment);
+
+		}
+
+		return inputParameters;
+
+	}
+
 	@AfterAll
 	public static void afterClassClearContext() {
 		TestUtil.randomizeLocaleAndTimezone();
 	}
-
-
-
+
 	public static class JsonLikeMapWriter extends BaseJsonLikeWriter {
 
 		private Map<String,Object> target;

pom.xml

@@ -897,7 +897,7 @@
 	</licenses>
 
 	<properties>
-		<fhir_core_version>6.0.22</fhir_core_version>
+		<fhir_core_version>6.0.22.2</fhir_core_version>
 		<spotless_version>2.37.0</spotless_version>
 		<ucum_version>1.0.3</ucum_version>
 		<surefire_jvm_args>-Dfile.encoding=UTF-8 -Xmx2048m</surefire_jvm_args>

tests/hapi-fhir-base-test-jaxrsserver-kotlin/src/main/java/Sample.java

@@ -0,0 +1,4 @@
+/**
+ * This class exists to satisfy Sonatype.
+ */
+public class Sample {}