From d6109fd1aea69b5c19b8818361bb32596e6dcec8 Mon Sep 17 00:00:00 2001 From: William Kim Date: Tue, 11 Jun 2013 15:08:39 -0400 Subject: [PATCH] explicitly mapped missing JPA columns in common->openid.connect.model #317 --- .../java/org/mitre/openid/connect/model/Address.java | 5 +++++ .../org/mitre/openid/connect/model/ApprovedSite.java | 1 + .../org/mitre/openid/connect/model/BlacklistedSite.java | 1 + .../org/mitre/openid/connect/model/DefaultUserInfo.java | 9 +++++++++ .../main/java/org/mitre/openid/connect/model/Event.java | 3 +++ .../main/java/org/mitre/openid/connect/model/Nonce.java | 1 + .../org/mitre/openid/connect/model/WhitelistedSite.java | 1 + 7 files changed, 21 insertions(+) diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Address.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Address.java index 2b58b9454..747bb002e 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Address.java +++ b/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; } diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java index 14866d194..170817bf7 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java +++ b/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; } diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java index 2994d24ac..8fa035148 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java +++ b/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; } diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java index ed66606ac..5e27b6b8c 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java +++ b/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; } diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java index 611b17ff6..e63c8b6f0 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java +++ b/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; } diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Nonce.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Nonce.java index 4efa67ec2..b1818d246 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Nonce.java +++ b/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; } diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java index 333edbfa0..e35e51090 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java +++ b/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; }