hapifhir · tadgh · May 3, 2023 · May 3, 2023 · May 4, 2023 · May 4, 2023
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -70,8 +70,8 @@ stages:
  # Put to top, but kept in order here
  # - name: hapi_fhir_jpaserver_test_utilities
  # module: hapi-fhir-jpaserver-test-utilities
- - name: hapi_fhir_jpaserver_uhnfhirtest
- module: hapi-fhir-jpaserver-uhnfhirtest
+# - name: hapi_fhir_jpaserver_uhnfhirtest
+# module: hapi-fhir-jpaserver-uhnfhirtest
  - name: hapi_fhir_server
  module: hapi-fhir-server
  - name: hapi_fhir_server_mdm
@@ -129,8 +129,8 @@ stages:
  module: hapi-tinder-plugin
  - name: hapi_tinder_test
  module: hapi-tinder-test
- - name: tests_hapi_fhir_base_test_jaxrsserver_kotlin
- module: tests/hapi-fhir-base-test-jaxrsserver-kotlin
+# - name: tests_hapi_fhir_base_test_jaxrsserver_kotlin
+# module: tests/hapi-fhir-base-test-jaxrsserver-kotlin
  - name: tests_hapi_fhir_base_test_mindeps_client
  module: tests/hapi-fhir-base-test-mindeps-client
  - name: tests_hapi_fhir_base_test_mindeps_server

diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java
@@ -19,13 +19,14 @@
  */
 package ca.uhn.fhir.model.api;
 
-import java.net.URI;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hl7.fhir.instance.model.api.IBaseCoding;
 
+import java.net.URI;
+import java.util.Objects;
+
 /**
  * A single tag
  * <p>
@@ -58,7 +59,7 @@ public class Tag extends BaseElement implements IElement, IBaseCoding {
  private String myScheme;
  private String myTerm;
  private String myVersion;
- private boolean myUserSelected;
+ private Boolean myUserSelected;
 
  public Tag() {
  }
@@ -114,37 +115,22 @@ public boolean equals(Object obj) {
  if (getClass() != obj.getClass())
  return false;
  Tag other = (Tag) obj;
- if (myScheme == null) {
- if (other.myScheme != null)
- return false;
- } else if (!myScheme.equals(other.myScheme))
- return false;
- if (myTerm == null) {
- if (other.myTerm != null)
- return false;
- } else if (!myTerm.equals(other.myTerm))
- return false;
-
- if (myVersion == null) {
- if (other.getVersion() != null)
- return false;
- } else if (!myVersion.equals(other.getVersion()))
- return false;
-
- if (myUserSelected != other.getUserSelected())
- return false;
 
- return true;
+ return
+ Objects.equals(myScheme, other.myScheme) &&
+ Objects.equals(myTerm, other.myTerm) &&
+ Objects.equals(myVersion, other.myVersion) &&
+ Objects.equals(myUserSelected, other.myUserSelected);
  }
 
  @Override
  public int hashCode() {
  final int prime = 31;
  int result = 1;
- result = prime * result + ((myScheme == null) ? 0 : myScheme.hashCode());
- result = prime * result + ((myTerm == null) ? 0 : myTerm.hashCode());
- result = prime * result + ((myVersion == null) ? 0 : myVersion.hashCode());
- result = prime * result + Boolean.hashCode(myUserSelected);
+ result = prime * result + Objects.hashCode(myScheme);
+ result = prime * result + Objects.hashCode(myTerm);
+ result = prime * result + Objects.hashCode(myVersion);
+ result = prime * result + Objects.hashCode(myUserSelected);
  return result;
  }
 
@@ -234,12 +220,18 @@ public IBaseCoding setVersion(String theVersion) {
  }
 
  @Override
- public boolean getUserSelected() { return myUserSelected; }
+ public boolean getUserSelected() { return myUserSelected != null && myUserSelected; }
+
+ public Boolean getUserSelectedBoolean() { return myUserSelected; }
 
  @Override
  public IBaseCoding setUserSelected(boolean theUserSelected) {
  myUserSelected = theUserSelected;
  return this;
  }
 
+ public void setUserSelectedBoolean(Boolean theUserSelected) {
+ myUserSelected = theUserSelected;
+ }
+
 }
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
@@ -724,78 +724,83 @@
  }
 
  if (theResource instanceof IResource) {
- IResource resource = (IResource) theResource;
- // Object securityLabelRawObj =
-
- List<BaseCodingDt> securityLabels = extractMetadataListNotNull(resource, ResourceMetadataKeyEnum.SECURITY_LABELS);
- List<? extends IIdType> profiles = extractMetadataListNotNull(resource, ResourceMetadataKeyEnum.PROFILES);
- profiles = super.getProfileTagsForEncoding(resource, profiles);
-
- TagList tags = getMetaTagsForEncoding(resource, theEncodeContext);
- InstantDt updated = (InstantDt) resource.getResourceMetadata().get(ResourceMetadataKeyEnum.UPDATED);
- IdDt resourceId = resource.getId();
- String versionIdPart = resourceId.getVersionIdPart();
- if (isBlank(versionIdPart)) {
- versionIdPart = ResourceMetadataKeyEnum.VERSION.get(resource);
- }
- List<Map.Entry<ResourceMetadataKeyEnum<?>, Object>> extensionMetadataKeys = getExtensionMetadataKeys(resource);
+ parseMetaForDSTU2(theResDef, theResource, theEventWriter, theContainedResource, theEncodeContext, resDef);
+ }
 
- if (super.shouldEncodeResourceMeta(resource) && (ElementUtil.isEmpty(versionIdPart, updated, securityLabels, tags, profiles) == false) || !extensionMetadataKeys.isEmpty()) {
- beginObject(theEventWriter, "meta");
+ encodeCompositeElementToStreamWriter(theResDef, theResource, theResource, theEventWriter, theContainedResource, new CompositeChildElement(resDef, theEncodeContext), theEncodeContext);
 
- if (shouldEncodePath(resource, "meta.versionId")) {
- writeOptionalTagWithTextNode(theEventWriter, "versionId", versionIdPart);
- }
- if (shouldEncodePath(resource, "meta.lastUpdated")) {
- writeOptionalTagWithTextNode(theEventWriter, "lastUpdated", updated);
- }
+ theEventWriter.endObject();
+ }
 
- if (profiles != null && profiles.isEmpty() == false) {
- beginArray(theEventWriter, "profile");
- for (IIdType profile : profiles) {
- if (profile != null && isNotBlank(profile.getValue())) {
- theEventWriter.write(profile.getValue());
- }
+ private void parseMetaForDSTU2(RuntimeResourceDefinition theResDef, IBaseResource theResource, BaseJsonLikeWriter theEventWriter, boolean theContainedResource, EncodeContext theEncodeContext, RuntimeResourceDefinition resDef) throws IOException {
+ IResource resource = (IResource) theResource;
+ // Object securityLabelRawObj =
+
+ List<BaseCodingDt> securityLabels = extractMetadataListNotNull(resource, ResourceMetadataKeyEnum.SECURITY_LABELS);
+ List<? extends IIdType> profiles = extractMetadataListNotNull(resource, ResourceMetadataKeyEnum.PROFILES);
+ profiles = super.getProfileTagsForEncoding(resource, profiles);
+
+ TagList tags = getMetaTagsForEncoding(resource, theEncodeContext);
+ InstantDt updated = (InstantDt) resource.getResourceMetadata().get(ResourceMetadataKeyEnum.UPDATED);
+ IdDt resourceId = resource.getId();
+ String versionIdPart = resourceId.getVersionIdPart();
+ if (isBlank(versionIdPart)) {
+ versionIdPart = ResourceMetadataKeyEnum.VERSION.get(resource);
+ }
+ List<Map.Entry<ResourceMetadataKeyEnum<?>, Object>> extensionMetadataKeys = getExtensionMetadataKeys(resource);
+
+ if (super.shouldEncodeResourceMeta(resource) && (ElementUtil.isEmpty(versionIdPart, updated, securityLabels, tags, profiles) == false) || !extensionMetadataKeys.isEmpty()) {
+ beginObject(theEventWriter, "meta");
+
+ if (shouldEncodePath(resource, "meta.versionId")) {
+ writeOptionalTagWithTextNode(theEventWriter, "versionId", versionIdPart);
+ }
+ if (shouldEncodePath(resource, "meta.lastUpdated")) {
+ writeOptionalTagWithTextNode(theEventWriter, "lastUpdated", updated);
+ }
+
+ if (profiles != null && profiles.isEmpty() == false) {
+ beginArray(theEventWriter, "profile");
+ for (IIdType profile : profiles) {
+ if (profile != null && isNotBlank(profile.getValue())) {
+ theEventWriter.write(profile.getValue());
  }
- theEventWriter.endArray();
  }
+ theEventWriter.endArray();
+ }
 
- if (securityLabels.isEmpty() == false) {
- beginArray(theEventWriter, "security");
- for (BaseCodingDt securityLabel : securityLabels) {
- theEventWriter.beginObject();
- theEncodeContext.pushPath("security", false);
- encodeCompositeElementChildrenToStreamWriter(resDef, resource, securityLabel, theEventWriter, theContainedResource, null, theEncodeContext);
- theEncodeContext.popPath();
- theEventWriter.endObject();
- }
- theEventWriter.endArray();
+ if (securityLabels.isEmpty() == false) {
+ beginArray(theEventWriter, "security");
+ for (BaseCodingDt securityLabel : securityLabels) {
+ theEventWriter.beginObject();
+ theEncodeContext.pushPath("security", false);
+ encodeCompositeElementChildrenToStreamWriter(resDef, resource, securityLabel, theEventWriter, theContainedResource, null, theEncodeContext);
+ theEncodeContext.popPath();
+ theEventWriter.endObject();
  }
+ theEventWriter.endArray();
+ }
 
- if (tags != null && tags.isEmpty() == false) {
- beginArray(theEventWriter, "tag");
- for (Tag tag : tags) {
- if (tag.isEmpty()) {
- continue;
- }
- theEventWriter.beginObject();
- writeOptionalTagWithTextNode(theEventWriter, "system", tag.getScheme());
- writeOptionalTagWithTextNode(theEventWriter, "code", tag.getTerm());
- writeOptionalTagWithTextNode(theEventWriter, "display", tag.getLabel());
- theEventWriter.endObject();
+ if (tags != null && tags.isEmpty() == false) {
+ beginArray(theEventWriter, "tag");
+ for (Tag tag : tags) {
+ if (tag.isEmpty()) {
+ continue;
  }
- theEventWriter.endArray();
+ theEventWriter.beginObject();
+ writeOptionalTagWithTextNode(theEventWriter, "system", tag.getScheme());
+ writeOptionalTagWithTextNode(theEventWriter, "code", tag.getTerm());
+ writeOptionalTagWithTextNode(theEventWriter, "display", tag.getLabel());
+ // wipmb should we be writing the new properties here? There must be another path.
+ theEventWriter.endObject();
  }
-
- addExtensionMetadata(theResDef, theResource, theContainedResource, extensionMetadataKeys, resDef, theEventWriter, theEncodeContext);
-
- theEventWriter.endObject(); // end meta
+ theEventWriter.endArray();
  }
- }
 
- encodeCompositeElementToStreamWriter(theResDef, theResource, theResource, theEventWriter, theContainedResource, new CompositeChildElement(resDef, theEncodeContext), theEncodeContext);
+  addExtensionMetadata(theResDef, theResource, theContainedResource, extensionMetadataKeys, resDef, theEventWriter, theEncodeContext);
 
- theEventWriter.endObject();
+ theEventWriter.endObject(); // end meta
+ }
  }
 
 

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java
@@ -116,7 +116,9 @@ public enum VersionEnum {
  V6_4_1,
  V6_4_2,
  V6_5_0,
- V6_6_0
+ V6_6_0,
+ V6_7_0,
+ V6_8_0,
  ;
 
  public static VersionEnum latestVersion() {

diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/model/api/TagTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/model/api/TagTest.java
@@ -27,7 +27,7 @@ public void testEquals() {
  @Test
  public void testHashCode() {
  Tag tag1 = new Tag().setScheme("scheme").setTerm("term").setLabel("label");
- assertEquals(-1029266947, tag1.hashCode());
+ assertEquals(-1029268184, tag1.hashCode());
  }
 
  @Test

diff --git a/hapi-fhir-bom/pom.xml b/hapi-fhir-bom/pom.xml
@@ -4,15 +4,15 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-bom</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <packaging>pom</packaging>
  <name>HAPI FHIR BOM</name>
 
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-checkstyle/pom.xml b/hapi-fhir-checkstyle/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-cli</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.5.19-SNAPSHOT</version>
+ <version>6.5.20-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/canonical/VersionCanonicalizer.java b/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/canonical/VersionCanonicalizer.java
@@ -355,7 +355,9 @@ public Coding codingToCanonical(IBaseCoding theCoding) {
  retVal.setSystem(coding.getSystem());
  retVal.setDisplay(coding.getDisplay());
  retVal.setVersion(coding.getVersion());
- retVal.setUserSelected(!coding.getUserSelectedElement().isEmpty() && coding.getUserSelected());
+ if (!coding.getUserSelectedElement().isEmpty()) {
+ retVal.setUserSelected( coding.getUserSelected() );
+ }
 
  return retVal;
  }