fixed entity relationship for address

Author: jricher

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

@@ -47,6 +47,19 @@ public DefaultAddress() {
 
 }
 
+/**
+ * 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
  */

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

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