github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed entity relationship for address

pull/924/head
Justin Richer 2015-10-01 20:52:01 -04:00
parent e1af979995
commit ca23521c3b
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultAddress.java
View File

@ -47,6 +47,19 @@ public class DefaultAddress implements Address {
} }
/**
* Copy constructor from an existing address.
* @param address
*/
public DefaultAddress(Address address) {
setFormatted(address.getFormatted());
setStreetAddress(address.getStreetAddress());
setLocality(address.getLocality());
setRegion(address.getRegion());
setPostalCode(address.getPostalCode());
setCountry(address.getCountry());
}
/** /**
* @return the formatted address string * @return the formatted address string
*/ */

10
openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
View File

@ -72,7 +72,7 @@ public class DefaultUserInfo implements UserInfo {
private String locale; private String locale;
private String phoneNumber; private String phoneNumber;
private Boolean phoneNumberVerified; private Boolean phoneNumberVerified;
private Address address; private DefaultAddress address;
private String updatedTime; private String updatedTime;
private String birthdate; private String birthdate;
private transient JsonObject src; // source JSON if this is loaded remotely private transient JsonObject src; // source JSON if this is loaded remotely
@ -369,7 +369,7 @@ public class DefaultUserInfo implements UserInfo {
* @see org.mitre.openid.connect.model.UserInfo#getAddress() * @see org.mitre.openid.connect.model.UserInfo#getAddress()
*/ */
@Override @Override
@OneToOne @OneToOne(targetEntity = DefaultAddress.class)
@JoinColumn(name="address_id") @JoinColumn(name="address_id")
public Address getAddress() { public Address getAddress() {
return address; return address;
@ -379,7 +379,11 @@ public class DefaultUserInfo implements UserInfo {
*/ */
@Override @Override
public void setAddress(Address address) { public void setAddress(Address address) {
this.address = address; if (address != null) {
this.address = new DefaultAddress(address);
} else {
this.address = null;
}
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.mitre.openid.connect.model.UserInfo#getUpdatedTime() * @see org.mitre.openid.connect.model.UserInfo#getUpdatedTime()