Skip to content

Commit 5885dad

Browse files
committed
Hibernate: Specify explicit select clause in find calls.
Change-Id: I7308937c003aaa4cd4c16decd305154ebc146824
1 parent 34f88a2 commit 5885dad

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
3434
<flexmark.version>0.64.8</flexmark.version>
3535
<google.java.format.version>1.15.0</google.java.format.version>
36-
<hibernate.version>6.6.1.Final</hibernate.version>
36+
<hibernate.version>7.0.4.Final</hibernate.version>
3737
<hibernate-types.version>3.10.0</hibernate-types.version>
3838
<jakarta-jacc-api.version>1.6.1</jakarta-jacc-api.version>
3939
<jna.version>5.15.0</jna.version>

src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class Role extends PanacheEntityBase {
7979
public Set<String> tags;
8080

8181
public static Role getWorld() {
82-
return find("from Role r join r.tags tag where tag = 'world'").singleResult();
82+
return find("select r from Role r join r.tags tag where tag = 'world'").singleResult();
8383
}
8484

8585
@Override

src/main/java/eu/mulk/mulkcms2/benki/users/User.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ public String getFirstAndLastName() {
148148
}
149149

150150
public static User findByNickname(String nickname) {
151-
return User.find("from BenkiUser u join u.nicknames n where ?1 = n", nickname).singleResult();
151+
return User.find("select u from BenkiUser u join u.nicknames n where ?1 = n", nickname).singleResult();
152152
}
153153

154154
public static User findByNicknameWithRoles(String nickname) {
155155
return User.find(
156156
""
157-
+ "from BenkiUser u "
157+
+ "select u from BenkiUser u "
158158
+ "join u.nicknames n "
159159
+ "left join fetch u.effectiveRoles r "
160160
+ "left join fetch r.tags "

src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiResource.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public TemplateInstance getPage(@PathParam("pageName") String pageName) {
6262

6363
Optional<WikiPageRevision> maybePage =
6464
WikiPageRevision.find(
65-
"from WikiPageRevision rev join fetch rev.author where rev.title = ?1",
65+
"select rev from WikiPageRevision rev join fetch rev.author where rev.title = ?1",
6666
Sort.by("date").descending(),
6767
pageName)
6868
.firstResultOptional();
@@ -71,7 +71,7 @@ public TemplateInstance getPage(@PathParam("pageName") String pageName) {
7171
} else {
7272
var userName = identity.getPrincipal().getName();
7373
User user =
74-
User.find("from BenkiUser u join u.nicknames n where ?1 = n", userName).singleResult();
74+
User.find("select u from BenkiUser u join u.nicknames n where ?1 = n", userName).singleResult();
7575
page = new WikiPageRevision();
7676
page.content = "";
7777
page.title = pageName;
@@ -108,11 +108,11 @@ public JsonObject updatePage(
108108

109109
var userName = identity.getPrincipal().getName();
110110
User user =
111-
User.find("from BenkiUser u join u.nicknames n where ?1 = n", userName).singleResult();
111+
User.find("select u from BenkiUser u join u.nicknames n where ?1 = n", userName).singleResult();
112112

113113
Optional<WikiPageRevision> maybeCurrentRevision =
114114
WikiPageRevision.find(
115-
"from WikiPageRevision rev join fetch rev.author where rev.title = ?1",
115+
"select rev from WikiPageRevision rev join fetch rev.author where rev.title = ?1",
116116
Sort.by("date").descending(),
117117
pageName)
118118
.firstResultOptional();
@@ -153,7 +153,7 @@ public JsonObject updatePage(
153153
public TemplateInstance getPageRevisions(@PathParam("pageName") String pageName) {
154154
Optional<WikiPageRevision> maybePrimaryRevision =
155155
WikiPageRevision.find(
156-
"from WikiPageRevision rev join fetch rev.author where rev.title = ?1",
156+
"select rev from WikiPageRevision rev join fetch rev.author where rev.title = ?1",
157157
Sort.by("date").descending(),
158158
pageName)
159159
.firstResultOptional();
@@ -164,7 +164,7 @@ public TemplateInstance getPageRevisions(@PathParam("pageName") String pageName)
164164

165165
WikiPage page =
166166
WikiPageRevision.find(
167-
"from WikiPage p"
167+
"select p from WikiPage p"
168168
+ " join fetch p.revisions rev"
169169
+ " join fetch rev.author"
170170
+ " where p.id = ?1",

0 commit comments

Comments
 (0)