Merge remote-tracking branch 'origin/master'

org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HumanName.java

@@ -655,13 +655,18 @@ public class HumanName extends Type implements ICompositeType {
   }
 
   /**
-   * Returns all of the components of the name (prefix, given, family, suffix) as a single string with a single spaced
+   * <p>Returns the {@link #getTextElement() text} element value if it is not null.</p>
-   * string separating each part.
+
-   * <p>
+   * <p>If the {@link #getTextElement() text} element value is null, returns all the components of the name (prefix,
-   * If none of the parts are populated, returns the {@link #getTextElement() text} element value instead.
+   * given, family, suffix) as a single string with a single spaced string separating each part. </p>
-   * </p>
+   *
+   * @return the human name as a single string
    */
   public String getNameAsSingleString() {
+    if (hasText()) {
+      return getText().toString();
+    }
+
     List<StringType> nameParts = new ArrayList<StringType>();
     nameParts.addAll(getPrefix());
     nameParts.addAll(getGiven());

org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/model/HumanNameTest.java

@@ -25,4 +25,14 @@ public class HumanNameTest {
     String actual = humanName.getNameAsSingleString();
     assertEquals(expected, actual);
   }
+
+  @Test
+  public void getNameAsSingleStringPreferText() {
+    final String expected = "dummy value";
+    HumanName humanName = new HumanName()
+      .setTextElement(new StringType(expected)).addFamily("wrong value");
+
+    String actual = humanName.getNameAsSingleString();
+    assertEquals(expected, actual);
+  }
 }

org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java

@@ -668,13 +668,18 @@ public class HumanName extends Type implements ICompositeType {
   }
 
   /**
-   * Returns all of the components of the name (prefix, given, family, suffix) as a single string with a single spaced
+   * <p>Returns the {@link #getTextElement() text} element value if it is not null.</p>
-   * string separating each part.
+
-   * <p>
+   * <p>If the {@link #getTextElement() text} element value is null, returns all the components of the name (prefix,
-   * If none of the parts are populated, returns the {@link #getTextElement() text} element value instead.
+   * given, family, suffix) as a single string with a single spaced string separating each part. </p>
-   * </p>
+   *
+   * @return the human name as a single string
    */
   public String getNameAsSingleString() {
+    if (hasText()) {
+      return getText().toString();
+    }
+
     List<StringType> nameParts = new ArrayList<StringType>();
     nameParts.addAll(getPrefix());
     nameParts.addAll(getGiven());

org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/model/HumanNameTest.java

@@ -25,4 +25,14 @@ public class HumanNameTest {
     String actual = humanName.getNameAsSingleString();
     assertEquals(expected, actual);
   }
+
+  @Test
+  public void getNameAsSingleStringPreferText() {
+    final String expected = "dummy value";
+    HumanName humanName = new HumanName()
+      .setTextElement(new StringType(expected)).setFamily("wrong value");
+
+    String actual = humanName.getNameAsSingleString();
+    assertEquals(expected, actual);
+  }
 }

org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HumanName.java

@@ -668,13 +668,18 @@ public class HumanName extends Type implements ICompositeType {
   }
 
   /**
-   * Returns all of the components of the name (prefix, given, family, suffix) as a single string with a single spaced
+   * <p>Returns the {@link #getTextElement() text} element value if it is not null.</p>
-   * string separating each part.
+
-   * <p>
+   * <p>If the {@link #getTextElement() text} element value is null, returns all the components of the name (prefix,
-   * If none of the parts are populated, returns the {@link #getTextElement() text} element value instead.
+   * given, family, suffix) as a single string with a single spaced string separating each part. </p>
-   * </p>
+   *
+   * @return the human name as a single string
    */
   public String getNameAsSingleString() {
+    if (hasText()) {
+      return getText().toString();
+    }
+
     List<StringType> nameParts = new ArrayList<StringType>();
     nameParts.addAll(getPrefix());
     nameParts.addAll(getGiven());

org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/model/HumanNameTest.java

@@ -27,4 +27,14 @@ public class HumanNameTest {
     String actual = humanName.getNameAsSingleString();
     assertEquals(expected, actual);
   }
+
+  @Test
+  public void getNameAsSingleStringPreferText() {
+    final String expected = "dummy value";
+    HumanName humanName = new HumanName()
+      .setTextElement(new StringType(expected)).setFamily("wrong value");
+
+    String actual = humanName.getNameAsSingleString();
+    assertEquals(expected, actual);
+  }
 }

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/HumanName.java

@@ -887,16 +887,21 @@ public class HumanName extends DataType implements ICompositeType {
    */ 
   public String getSuffixAsSingleString() { 
     return joinStringsSpaceSeparated(getSuffix()); 
-  } 
+  }
+
+  /**
+   * <p>Returns the {@link #getTextElement() text} element value if it is not null.</p>
+
+   * <p>If the {@link #getTextElement() text} element value is null, returns all the components of the name (prefix,
+   * given, family, suffix) as a single string with a single spaced string separating each part. </p>
+   *
+   * @return the human name as a single string
+   */
+  public String getNameAsSingleString() {
+    if (hasText()) {
+      return getText().toString();
+    }
 
-  /** 
-   * Returns all of the components of the name (prefix, given, family, suffix) as a single string with a single spaced 
-   * string separating each part. 
-   * <p> 
-   * If none of the parts are populated, returns the {@link #getTextElement() text} element value instead. 
-   * </p> 
-   */ 
-  public String getNameAsSingleString() { 
     List<StringType> nameParts = new ArrayList<StringType>(); 
     nameParts.addAll(getPrefix()); 
     nameParts.addAll(getGiven());

org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/model/HumanNameTest.java

@@ -25,4 +25,14 @@ public class HumanNameTest {
     String actual = humanName.getNameAsSingleString();
     assertEquals(expected, actual);
   }
+
+  @Test
+  public void getNameAsSingleStringPreferText() {
+    final String expected = "dummy value";
+    HumanName humanName = new HumanName()
+      .setTextElement(new StringType(expected)).setFamily("wrong value");
+
+    String actual = humanName.getNameAsSingleString();
+    assertEquals(expected, actual);
+  }
 }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java

@@ -887,17 +887,22 @@ public class HumanName extends DataType implements ICompositeType {
    */ 
   public String getSuffixAsSingleString() { 
     return joinStringsSpaceSeparated(getSuffix()); 
-  } 
+  }
 
-  /** 
+  /**
-   * Returns all of the components of the name (prefix, given, family, suffix) as a single string with a single spaced 
+   * <p>Returns the {@link #getTextElement() text} element value if it is not null.</p>
-   * string separating each part. 
+
-   * <p> 
+   * <p>If the {@link #getTextElement() text} element value is null, returns all the components of the name (prefix,
-   * If none of the parts are populated, returns the {@link #getTextElement() text} element value instead. 
+   * given, family, suffix) as a single string with a single spaced string separating each part. </p>
-   * </p> 
+   *
-   */ 
+   * @return the human name as a single string
+   */
   public String getNameAsSingleString() { 
-    List<StringType> nameParts = new ArrayList<StringType>(); 
+    if (hasText()) {
+      return getText().toString();
+    }
+
+    List<StringType> nameParts = new ArrayList<StringType>();
     nameParts.addAll(getPrefix()); 
     nameParts.addAll(getGiven()); 
     if (hasFamilyElement()) {

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/model/HumanNameTest.java

@@ -27,4 +27,14 @@ public class HumanNameTest {
     String actual = humanName.getNameAsSingleString();
     assertEquals(expected, actual);
   }
+
+  @Test
+  public void getNameAsSingleStringPreferText() {
+    final String expected = "dummy value";
+    HumanName humanName = new HumanName()
+      .setTextElement(new StringType(expected)).setFamily("wrong value");
+
+    String actual = humanName.getNameAsSingleString();
+    assertEquals(expected, actual);
+  }
 }

pom.xml

@@ -238,6 +238,12 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok_version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson_version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>