Skip to content

Commit cd5fe03

Browse files
jtravan3jtravan3
authored
Merge pull request #32 from jtravan3/fix/emailaddress-data-change
Changed to EmailAddress POJO
2 parents 82cd8df + a10ebd9 commit cd5fe03

File tree

11 files changed

+44
-31
lines changed

11 files changed

+44
-31
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.0.5]
9+
10+
### Changed
11+
12+
- Changed email addresses to the actual `EmailAddress` object
13+
814
## [1.0.4]
915

1016
### Added

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.3.RELEASE</version>
8+
<version>2.3.7.RELEASE</version>
99
<relativePath /> <!-- lookup parent from repository -->
1010
</parent>
1111

@@ -46,10 +46,10 @@
4646
<properties>
4747
<java.version>11</java.version>
4848
<mvn.version>3.6.0</mvn.version>
49-
<jackson.version>2.11.2</jackson.version>
50-
<lombok.version>1.18.12</lombok.version>
49+
<jackson.version>2.12.0</jackson.version>
50+
<lombok.version>1.18.16</lombok.version>
5151
<sonatype.plugin.version>1.6.8</sonatype.plugin.version>
52-
<jacoco.reports.plugin.version>0.8.5</jacoco.reports.plugin.version>
52+
<jacoco.reports.plugin.version>0.8.6</jacoco.reports.plugin.version>
5353
<maven.javadoc.plugin.version>3.2.0</maven.javadoc.plugin.version>
5454
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
5555
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>

‎src/main/java/redox/datamodel/clinicalsummary/common/Author.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class Author {
4444
@JsonProperty("Address")
4545
private Address address;
4646
@JsonProperty("EmailAddresses")
47-
private List<Object> emailAddresses = null;
47+
private List<EmailAddress> emailAddresses = null;
4848
@JsonProperty("PhoneNumber")
4949
private PhoneNumber phoneNumber;
5050
@JsonProperty("Location")
@@ -123,12 +123,12 @@ public void setAddress(Address address) {
123123
}
124124

125125
@JsonProperty("EmailAddresses")
126-
public List<Object> getEmailAddresses() {
126+
public List<EmailAddress> getEmailAddresses() {
127127
return emailAddresses;
128128
}
129129

130130
@JsonProperty("EmailAddresses")
131-
public void setEmailAddresses(List<Object> emailAddresses) {
131+
public void setEmailAddresses(List<EmailAddress> emailAddresses) {
132132
this.emailAddresses = emailAddresses;
133133
}
134134

‎src/main/java/redox/datamodel/common/Demographics.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.annotation.JsonInclude;
1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
13+
import redox.datamodel.clinicalsummary.common.EmailAddress;
1314

1415
@JsonInclude(JsonInclude.Include.NON_NULL)
1516
@JsonPropertyOrder({
@@ -59,7 +60,7 @@ public class Demographics {
5960
@JsonProperty("PhoneNumber")
6061
private PhoneNumber phoneNumber;
6162
@JsonProperty("EmailAddresses")
62-
private List<Object> emailAddresses = null;
63+
private List<EmailAddress> emailAddresses = null;
6364
@JsonProperty("Language")
6465
private String language;
6566
@JsonProperty("Citizenship")
@@ -194,12 +195,12 @@ public void setPhoneNumber(PhoneNumber phoneNumber) {
194195
}
195196

196197
@JsonProperty("EmailAddresses")
197-
public List<Object> getEmailAddresses() {
198+
public List<EmailAddress> getEmailAddresses() {
198199
return emailAddresses;
199200
}
200201

201202
@JsonProperty("EmailAddresses")
202-
public void setEmailAddresses(List<Object> emailAddresses) {
203+
public void setEmailAddresses(List<EmailAddress> emailAddresses) {
203204
this.emailAddresses = emailAddresses;
204205
}
205206

‎src/main/java/redox/datamodel/common/PhoneNumber.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class PhoneNumber {
2323
@JsonProperty("Home")
2424
private String home;
2525
@JsonProperty("Mobile")
26-
private Object mobile;
26+
private String mobile;
2727
@JsonIgnore
2828
private Map<String, Object> additionalProperties = new HashMap<String, Object>();
2929

@@ -46,11 +46,11 @@ public void setHome(String home) {
4646
this.home = home;
4747
}
4848
@JsonProperty("Mobile")
49-
public Object getMobile() {
49+
public String getMobile() {
5050
return mobile;
5151
}
5252
@JsonProperty("Mobile")
53-
public void setMobile(Object mobile) {
53+
public void setMobile(String mobile) {
5454
this.mobile = mobile;
5555
}
5656

‎src/main/java/redox/datamodel/common/Provider.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.annotation.JsonInclude;
1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
13+
import redox.datamodel.clinicalsummary.common.EmailAddress;
1314
import redox.datamodel.clinicalsummary.common.Role;
1415
import redox.datamodel.common.Address;
1516
import redox.datamodel.common.Location;
@@ -44,7 +45,7 @@ public class Provider {
4445
@JsonProperty("Address")
4546
private Address address;
4647
@JsonProperty("EmailAddresses")
47-
private List<Object> emailAddresses = null;
48+
private List<EmailAddress> emailAddresses = null;
4849
@JsonProperty("PhoneNumber")
4950
private PhoneNumber phoneNumber;
5051
@JsonProperty("Location")
@@ -117,12 +118,12 @@ public void setAddress(Address address) {
117118
}
118119

119120
@JsonProperty("EmailAddresses")
120-
public List<Object> getEmailAddresses() {
121+
public List<EmailAddress> getEmailAddresses() {
121122
return emailAddresses;
122123
}
123124

124125
@JsonProperty("EmailAddresses")
125-
public void setEmailAddresses(List<Object> emailAddresses) {
126+
public void setEmailAddresses(List<EmailAddress> emailAddresses) {
126127
this.emailAddresses = emailAddresses;
127128
}
128129

‎src/main/java/redox/datamodel/media/common/Authenticator.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.annotation.JsonInclude;
1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
13+
import redox.datamodel.clinicalsummary.common.EmailAddress;
1314
import redox.datamodel.common.Address;
1415
import redox.datamodel.common.Location;
1516
import redox.datamodel.common.PhoneNumber;
@@ -41,7 +42,7 @@ public class Authenticator {
4142
@JsonProperty("Address")
4243
private Address address;
4344
@JsonProperty("EmailAddresses")
44-
private List<Object> emailAddresses = null;
45+
private List<EmailAddress> emailAddresses = null;
4546
@JsonProperty("PhoneNumber")
4647
private PhoneNumber phoneNumber;
4748
@JsonProperty("Location")
@@ -110,12 +111,12 @@ public void setAddress(Address address) {
110111
}
111112

112113
@JsonProperty("EmailAddresses")
113-
public List<Object> getEmailAddresses() {
114+
public List<EmailAddress> getEmailAddresses() {
114115
return emailAddresses;
115116
}
116117

117118
@JsonProperty("EmailAddresses")
118-
public void setEmailAddresses(List<Object> emailAddresses) {
119+
public void setEmailAddresses(List<EmailAddress> emailAddresses) {
119120
this.emailAddresses = emailAddresses;
120121
}
121122

‎src/main/java/redox/datamodel/results/common/AttendingProvider.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.annotation.JsonInclude;
1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
13+
import redox.datamodel.clinicalsummary.common.EmailAddress;
1314
import redox.datamodel.common.Address;
1415
import redox.datamodel.common.PhoneNumber;
1516
import redox.datamodel.common.Location;
@@ -41,7 +42,7 @@ public class AttendingProvider {
4142
@JsonProperty("Address")
4243
private Address address;
4344
@JsonProperty("EmailAddresses")
44-
private List<Object> emailAddresses = null;
45+
private List<EmailAddress> emailAddresses = null;
4546
@JsonProperty("PhoneNumber")
4647
private PhoneNumber phoneNumber;
4748
@JsonProperty("Location")
@@ -110,12 +111,12 @@ public void setAddress(Address address) {
110111
}
111112

112113
@JsonProperty("EmailAddresses")
113-
public List<Object> getEmailAddresses() {
114+
public List<EmailAddress> getEmailAddresses() {
114115
return emailAddresses;
115116
}
116117

117118
@JsonProperty("EmailAddresses")
118-
public void setEmailAddresses(List<Object> emailAddresses) {
119+
public void setEmailAddresses(List<EmailAddress> emailAddresses) {
119120
this.emailAddresses = emailAddresses;
120121
}
121122

‎src/main/java/redox/datamodel/results/common/Performer.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.annotation.JsonInclude;
1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
13+
import redox.datamodel.clinicalsummary.common.EmailAddress;
1314
import redox.datamodel.common.Address;
1415
import redox.datamodel.common.PhoneNumber;
1516
import redox.datamodel.common.Location;
@@ -41,7 +42,7 @@ public class Performer {
4142
@JsonProperty("Address")
4243
private Address address;
4344
@JsonProperty("EmailAddresses")
44-
private List<Object> emailAddresses = null;
45+
private List<EmailAddress> emailAddresses = null;
4546
@JsonProperty("PhoneNumber")
4647
private PhoneNumber phoneNumber;
4748
@JsonProperty("Location")
@@ -110,12 +111,12 @@ public void setAddress(Address address) {
110111
}
111112

112113
@JsonProperty("EmailAddresses")
113-
public List<Object> getEmailAddresses() {
114+
public List<EmailAddress> getEmailAddresses() {
114115
return emailAddresses;
115116
}
116117

117118
@JsonProperty("EmailAddresses")
118-
public void setEmailAddresses(List<Object> emailAddresses) {
119+
public void setEmailAddresses(List<EmailAddress> emailAddresses) {
119120
this.emailAddresses = emailAddresses;
120121
}
121122

‎src/main/java/redox/datamodel/results/common/PrimaryResultsInterpreter.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.annotation.JsonInclude;
1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
13+
import redox.datamodel.clinicalsummary.common.EmailAddress;
1314
import redox.datamodel.common.Address;
1415
import redox.datamodel.common.PhoneNumber;
1516
import redox.datamodel.common.Location;
@@ -44,7 +45,7 @@ public class PrimaryResultsInterpreter {
4445
@JsonProperty("Address")
4546
private Address address;
4647
@JsonProperty("EmailAddresses")
47-
private List<Object> emailAddresses = null;
48+
private List<EmailAddress> emailAddresses = null;
4849
@JsonProperty("PhoneNumber")
4950
private PhoneNumber phoneNumber;
5051
@JsonProperty("Location")
@@ -123,12 +124,12 @@ public void setAddress(Address address) {
123124
}
124125

125126
@JsonProperty("EmailAddresses")
126-
public List<Object> getEmailAddresses() {
127+
public List<EmailAddress> getEmailAddresses() {
127128
return emailAddresses;
128129
}
129130

130131
@JsonProperty("EmailAddresses")
131-
public void setEmailAddresses(List<Object> emailAddresses) {
132+
public void setEmailAddresses(List<EmailAddress> emailAddresses) {
132133
this.emailAddresses = emailAddresses;
133134
}
134135

0 commit comments

Comments
 (0)