explicitly mapped missing JPA columns in common->openid.connect.model #317

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

@@ -48,6 +48,7 @@ public class Address {
 	 * @return the formatted address string
 	 */
 	@Basic
+	@Column(name = "formatted")
 	public String getFormatted() {
 		return formatted;
 	}
@@ -75,6 +76,7 @@ public class Address {
 	 * @return the locality
 	 */
 	@Basic
+	@Column(name = "locality")
 	public String getLocality() {
 		return locality;
 	}
@@ -88,6 +90,7 @@ public class Address {
 	 * @return the region
 	 */
 	@Basic
+	@Column(name = "region")
 	public String getRegion() {
 		return region;
 	}
@@ -115,6 +118,7 @@ public class Address {
 	 * @return the country
 	 */
 	@Basic
+	@Column(name = "country")
 	public String getCountry() {
 		return country;
 	}
@@ -130,6 +134,7 @@ public class Address {
 	 */
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}

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

@@ -85,6 +85,7 @@ public class ApprovedSite {
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}

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

@@ -55,6 +55,7 @@ public class BlacklistedSite {
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}

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

@@ -66,6 +66,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}
@@ -112,6 +113,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Override
 	@Basic
+	@Column(name = "name")
 	public String getName() {
 		return name;
 	}
@@ -175,6 +177,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Override
 	@Basic
+	@Column(name = "nickname")
 	public String getNickname() {
 		return nickname;
 	}
@@ -190,6 +193,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Override
 	@Basic
+	@Column(name = "profile")
 	public String getProfile() {
 		return profile;
 	}
@@ -205,6 +209,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Override
 	@Basic
+	@Column(name = "picture")
 	public String getPicture() {
 		return picture;
 	}
@@ -220,6 +225,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Override
 	@Basic
+	@Column(name = "website")
 	public String getWebsite() {
 		return website;
 	}
@@ -235,6 +241,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Override
 	@Basic
+	@Column(name = "email")
 	public String getEmail() {
 		return email;
 	}
@@ -266,6 +273,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Override
 	@Basic
+	@Column(name = "gender")
 	public String getGender() {
 		return gender;
 	}
@@ -297,6 +305,7 @@ public class DefaultUserInfo implements UserInfo {
 	 */
 	@Override
 	@Basic
+	@Column(name = "locale")
 	public String getLocale() {
 		return locale;
 	}

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

@@ -19,6 +19,7 @@ package org.mitre.openid.connect.model;
 import java.util.Date;
 
 import javax.persistence.Basic;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -48,6 +49,7 @@ public class Event {
 	 */
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}
@@ -74,6 +76,7 @@ public class Event {
 	 */
 	@Basic
 	@Temporal(javax.persistence.TemporalType.TIMESTAMP)
+	@Column(name = "timestamp")
 	public Date getTimestamp() {
 		return timestamp;
 	}

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

@@ -55,6 +55,7 @@ public class Nonce {
 	 */
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}

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

@@ -72,6 +72,7 @@ public class WhitelistedSite {
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}