Skip to content

Commit ad9b497

Browse files
jricherjricher
committed
externalized queries for scopes, blacklists, user info, pairwise identifiers, and whitelists, closes mitreid-connect#771 even harder
1 parent 15b97b1 commit ad9b497

File tree

12 files changed

+68
-40
lines changed

12 files changed

+68
-40
lines changed

‎openid-connect-common/src/main/java/org/mitre/oauth2/model/SystemScope.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,16 @@
3737
@Entity
3838
@Table(name = "system_scope")
3939
@NamedQueries({
40-
@NamedQuery(name = "SystemScope.findAll", query = "select s from SystemScope s ORDER BY s.id"),
41-
@NamedQuery(name = "SystemScope.getByValue", query = "select s from SystemScope s WHERE s.value = :value")
40+
@NamedQuery(name = SystemScope.QUERY_ALL, query = "select s from SystemScope s ORDER BY s.id"),
41+
@NamedQuery(name = SystemScope.QUERY_BY_VALUE, query = "select s from SystemScope s WHERE s.value = :" + SystemScope.PARAM_VALUE)
4242
})
4343
public class SystemScope {
4444

45+
public static final String QUERY_BY_VALUE = "SystemScope.getByValue";
46+
public static final String QUERY_ALL = "SystemScope.findAll";
47+
48+
public static final String PARAM_VALUE = "value";
49+
4550
private Long id;
4651
private String value; // scope value
4752
private String description; // human-readable description

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,21 @@
4545
@Entity
4646
@Table(name="approved_site")
4747
@NamedQueries({
48-
@NamedQuery(name = "ApprovedSite.getAll", query = "select a from ApprovedSite a"),
49-
@NamedQuery(name = "ApprovedSite.getByUserId", query = "select a from ApprovedSite a where a.userId = :userId"),
50-
@NamedQuery(name = "ApprovedSite.getByClientId", query = "select a from ApprovedSite a where a.clientId = :clientId"),
51-
@NamedQuery(name = "ApprovedSite.getByClientIdAndUserId", query = "select a from ApprovedSite a where a.clientId = :clientId and a.userId = :userId")
48+
@NamedQuery(name = ApprovedSite.QUERY_ALL, query = "select a from ApprovedSite a"),
49+
@NamedQuery(name = ApprovedSite.QUERY_BY_USER_ID, query = "select a from ApprovedSite a where a.userId = :" + ApprovedSite.PARAM_USER_ID),
50+
@NamedQuery(name = ApprovedSite.QUERY_BY_CLIENT_ID, query = "select a from ApprovedSite a where a.clientId = :" + ApprovedSite.PARAM_CLIENT_ID),
51+
@NamedQuery(name = ApprovedSite.QUERY_BY_CLIENT_ID_AND_USER_ID, query = "select a from ApprovedSite a where a.clientId = :" + ApprovedSite.PARAM_CLIENT_ID + " and a.userId = :" + ApprovedSite.PARAM_USER_ID)
5252
})
5353
public class ApprovedSite {
5454

55+
public static final String QUERY_BY_CLIENT_ID_AND_USER_ID = "ApprovedSite.getByClientIdAndUserId";
56+
public static final String QUERY_BY_CLIENT_ID = "ApprovedSite.getByClientId";
57+
public static final String QUERY_BY_USER_ID = "ApprovedSite.getByUserId";
58+
public static final String QUERY_ALL = "ApprovedSite.getAll";
59+
60+
public static final String PARAM_CLIENT_ID = "clientId";
61+
public static final String PARAM_USER_ID = "userId";
62+
5563
// unique id
5664
private Long id;
5765

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@
3636
@Entity
3737
@Table(name="blacklisted_site")
3838
@NamedQueries({
39-
@NamedQuery(name = "BlacklistedSite.getAll", query = "select b from BlacklistedSite b")
39+
@NamedQuery(name = BlacklistedSite.QUERY_ALL, query = "select b from BlacklistedSite b")
4040
})
4141
public class BlacklistedSite {
4242

43+
public static final String QUERY_ALL = "BlacklistedSite.getAll";
44+
4345
// unique id
4446
private Long id;
4547

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@
3333
@Entity
3434
@Table(name="user_info")
3535
@NamedQueries({
36-
@NamedQuery(name="DefaultUserInfo.getByUsername", query = "select u from DefaultUserInfo u WHERE u.preferredUsername = :username")
36+
@NamedQuery(name=DefaultUserInfo.QUERY_BY_USERNAME, query = "select u from DefaultUserInfo u WHERE u.preferredUsername = :" + DefaultUserInfo.PARAM_USERNAME)
3737
})
3838
public class DefaultUserInfo implements UserInfo {
3939

40-
/**
41-
*
42-
*/
40+
public static final String QUERY_BY_USERNAME = "DefaultUserInfo.getByUsername";
41+
42+
public static final String PARAM_USERNAME = "username";
43+
4344
private static final long serialVersionUID = 6078310513185681918L;
4445
private Long id;
4546
private String sub;

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,17 @@
3939
@Entity
4040
@Table(name = "pairwise_identifier")
4141
@NamedQueries({
42-
@NamedQuery(name="PairwiseIdentifier.getAll", query = "select p from PairwiseIdentifier p"),
43-
@NamedQuery(name="PairwiseIdentifier.getBySectorIdentifier", query = "select p from PairwiseIdentifier p WHERE p.userSub = :sub AND p.sectorIdentifier = :sectorIdentifier")
42+
@NamedQuery(name=PairwiseIdentifier.QUERY_ALL, query = "select p from PairwiseIdentifier p"),
43+
@NamedQuery(name=PairwiseIdentifier.QUERY_BY_SECTOR_IDENTIFIER, query = "select p from PairwiseIdentifier p WHERE p.userSub = :" + PairwiseIdentifier.PARAM_SUB + " AND p.sectorIdentifier = :" + PairwiseIdentifier.PARAM_SECTOR_IDENTIFIER)
4444
})
4545
public class PairwiseIdentifier {
4646

47+
public static final String QUERY_BY_SECTOR_IDENTIFIER = "PairwiseIdentifier.getBySectorIdentifier";
48+
public static final String QUERY_ALL = "PairwiseIdentifier.getAll";
49+
50+
public static final String PARAM_SECTOR_IDENTIFIER = "sectorIdentifier";
51+
public static final String PARAM_SUB = "sub";
52+
4753
private Long id;
4854
private String identifier;
4955
private String userSub;
@@ -86,7 +92,7 @@ public void setIdentifier(String identifier) {
8692
* @return the userSub
8793
*/
8894
@Basic
89-
@Column(name = "sub")
95+
@Column(name = PairwiseIdentifier.PARAM_SUB)
9096
public String getUserSub() {
9197
return userSub;
9298
}

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,19 @@
4141
@Entity
4242
@Table(name="whitelisted_site")
4343
@NamedQueries({
44-
@NamedQuery(name = "WhitelistedSite.getAll", query = "select w from WhitelistedSite w"),
45-
@NamedQuery(name = "WhitelistedSite.getByClientId", query = "select w from WhitelistedSite w where w.clientId = :clientId"),
46-
@NamedQuery(name = "WhitelistedSite.getByCreatoruserId", query = "select w from WhitelistedSite w where w.creatorUserId = :userId")
44+
@NamedQuery(name = WhitelistedSite.QUERY_ALL, query = "select w from WhitelistedSite w"),
45+
@NamedQuery(name = WhitelistedSite.QUERY_BY_CLIENT_ID, query = "select w from WhitelistedSite w where w.clientId = :" + WhitelistedSite.PARAM_CLIENT_ID),
46+
@NamedQuery(name = WhitelistedSite.QUERY_BY_CREATOR, query = "select w from WhitelistedSite w where w.creatorUserId = :" + WhitelistedSite.PARAM_USER_ID)
4747
})
4848
public class WhitelistedSite {
4949

50+
public static final String QUERY_BY_CREATOR = "WhitelistedSite.getByCreatoruserId";
51+
public static final String QUERY_BY_CLIENT_ID = "WhitelistedSite.getByClientId";
52+
public static final String QUERY_ALL = "WhitelistedSite.getAll";
53+
54+
public static final String PARAM_USER_ID = "userId";
55+
public static final String PARAM_CLIENT_ID = "clientId";
56+
5057
// unique id
5158
private Long id;
5259

‎openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class JpaSystemScopeRepository implements SystemScopeRepository {
5050
@Override
5151
@Transactional
5252
public Set<SystemScope> getAll() {
53-
TypedQuery<SystemScope> query = em.createNamedQuery("SystemScope.findAll", SystemScope.class);
53+
TypedQuery<SystemScope> query = em.createNamedQuery(SystemScope.QUERY_ALL, SystemScope.class);
5454

5555
return new LinkedHashSet<SystemScope>(query.getResultList());
5656
}
@@ -70,8 +70,8 @@ public SystemScope getById(Long id) {
7070
@Override
7171
@Transactional
7272
public SystemScope getByValue(String value) {
73-
TypedQuery<SystemScope> query = em.createNamedQuery("SystemScope.getByValue", SystemScope.class);
74-
query.setParameter("value", value);
73+
TypedQuery<SystemScope> query = em.createNamedQuery(SystemScope.QUERY_BY_VALUE, SystemScope.class);
74+
query.setParameter(SystemScope.PARAM_VALUE, value);
7575
return getSingleResult(query.getResultList());
7676
}
7777

‎openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaApprovedSiteRepository.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ public class JpaApprovedSiteRepository implements ApprovedSiteRepository {
4444
@Override
4545
@Transactional
4646
public Collection<ApprovedSite> getAll() {
47-
TypedQuery<ApprovedSite> query = manager.createNamedQuery(
48-
"ApprovedSite.getAll", ApprovedSite.class);
47+
TypedQuery<ApprovedSite> query = manager.createNamedQuery(ApprovedSite.QUERY_ALL, ApprovedSite.class);
4948
return query.getResultList();
5049
}
5150

@@ -76,18 +75,18 @@ public ApprovedSite save(ApprovedSite approvedSite) {
7675
@Override
7776
public Collection<ApprovedSite> getByClientIdAndUserId(String clientId, String userId) {
7877

79-
TypedQuery<ApprovedSite> query = manager.createNamedQuery("ApprovedSite.getByClientIdAndUserId", ApprovedSite.class);
80-
query.setParameter("userId", userId);
81-
query.setParameter("clientId", clientId);
78+
TypedQuery<ApprovedSite> query = manager.createNamedQuery(ApprovedSite.QUERY_BY_CLIENT_ID_AND_USER_ID, ApprovedSite.class);
79+
query.setParameter(ApprovedSite.PARAM_USER_ID, userId);
80+
query.setParameter(ApprovedSite.PARAM_CLIENT_ID, clientId);
8281

8382
return query.getResultList();
8483
}
8584

8685
@Override
8786
@Transactional
8887
public Collection<ApprovedSite> getByUserId(String userId) {
89-
TypedQuery<ApprovedSite> query = manager.createNamedQuery("ApprovedSite.getByUserId", ApprovedSite.class);
90-
query.setParameter("userId", userId);
88+
TypedQuery<ApprovedSite> query = manager.createNamedQuery(ApprovedSite.QUERY_BY_USER_ID, ApprovedSite.class);
89+
query.setParameter(ApprovedSite.PARAM_USER_ID, userId);
9190

9291
return query.getResultList();
9392

@@ -96,8 +95,8 @@ public Collection<ApprovedSite> getByUserId(String userId) {
9695
@Override
9796
@Transactional
9897
public Collection<ApprovedSite> getByClientId(String clientId) {
99-
TypedQuery<ApprovedSite> query = manager.createNamedQuery("ApprovedSite.getByClientId", ApprovedSite.class);
100-
query.setParameter("clientId", clientId);
98+
TypedQuery<ApprovedSite> query = manager.createNamedQuery(ApprovedSite.QUERY_BY_CLIENT_ID, ApprovedSite.class);
99+
query.setParameter(ApprovedSite.PARAM_CLIENT_ID, clientId);
101100

102101
return query.getResultList();
103102
}

‎openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaBlacklistedSiteRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class JpaBlacklistedSiteRepository implements BlacklistedSiteRepository {
4848
@Override
4949
@Transactional
5050
public Collection<BlacklistedSite> getAll() {
51-
TypedQuery<BlacklistedSite> query = manager.createNamedQuery("BlacklistedSite.getAll", BlacklistedSite.class);
51+
TypedQuery<BlacklistedSite> query = manager.createNamedQuery(BlacklistedSite.QUERY_ALL, BlacklistedSite.class);
5252
return query.getResultList();
5353
}
5454

‎openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaPairwiseIdentifierRepository.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public class JpaPairwiseIdentifierRepository implements PairwiseIdentifierReposi
4646
*/
4747
@Override
4848
public PairwiseIdentifier getBySectorIdentifier(String sub, String sectorIdentifierUri) {
49-
TypedQuery<PairwiseIdentifier> query = manager.createNamedQuery("PairwiseIdentifier.getBySectorIdentifier", PairwiseIdentifier.class);
50-
query.setParameter("sub", sub);
51-
query.setParameter("sectorIdentifier", sectorIdentifierUri);
49+
TypedQuery<PairwiseIdentifier> query = manager.createNamedQuery(PairwiseIdentifier.QUERY_BY_SECTOR_IDENTIFIER, PairwiseIdentifier.class);
50+
query.setParameter(PairwiseIdentifier.PARAM_SUB, sub);
51+
query.setParameter(PairwiseIdentifier.PARAM_SECTOR_IDENTIFIER, sectorIdentifierUri);
5252

5353
return getSingleResult(query.getResultList());
5454
}

0 commit comments

Comments
 (0)