honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Grahame Grieve 2023-07-21 21:18:42 +10:00
parent 6350d9743e 4e8f0f0c0c
commit 5a858949d4
11 changed files with 114 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HumanName.java
View File

@ -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
* string separating each part.
* <p>
* If none of the parts are populated, returns the {@link #getTextElement() text} element value instead.
* </p>
* <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();
}
List<StringType> nameParts = new ArrayList<StringType>();
nameParts.addAll(getPrefix());
nameParts.addAll(getGiven());

10
org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/model/HumanNameTest.java
View File

@ -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);
}
}

15
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java
View File

@ -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
* string separating each part.
* <p>
* If none of the parts are populated, returns the {@link #getTextElement() text} element value instead.
* </p>
* <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();
}
List<StringType> nameParts = new ArrayList<StringType>();
nameParts.addAll(getPrefix());
nameParts.addAll(getGiven());

10
org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/model/HumanNameTest.java
View File

@ -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);
}
}

15
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HumanName.java
View File

@ -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
* string separating each part.
* <p>
* If none of the parts are populated, returns the {@link #getTextElement() text} element value instead.
* </p>
* <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();
}
List<StringType> nameParts = new ArrayList<StringType>();
nameParts.addAll(getPrefix());
nameParts.addAll(getGiven());

10
org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/model/HumanNameTest.java
View File

@ -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);
}
}

23
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/HumanName.java
View File

@ -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());

10
org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/model/HumanNameTest.java
View File

@ -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);
}
}

23
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java
View File

@ -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
* string separating each part.
* <p>
* If none of the parts are populated, returns the {@link #getTextElement() text} element value instead.
* </p>
*/
/**
* <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() {
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()) {

10
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/model/HumanNameTest.java
View File

@ -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);
}
}

6
pom.xml
View File

@ -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>