Skip to content

Commit 4b8ba6e

Browse files
knjensenknjensen
committed
#70: Removed the NamedQueries annotation, it became obsolete with Java EE 8.
1 parent b033d1a commit 4b8ba6e

File tree

9 files changed

+205
-232
lines changed

9 files changed

+205
-232
lines changed

‎cws-core/src/main/java/io/javadog/cws/core/model/entities/CircleEntity.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.javadog.cws.api.common.Utilities;
2121
import javax.persistence.Column;
2222
import javax.persistence.Entity;
23-
import javax.persistence.NamedQueries;
2423
import javax.persistence.NamedQuery;
2524
import javax.persistence.Table;
2625

@@ -32,11 +31,9 @@
3231
*/
3332
@Entity
3433
@Table(name = "cws_circles")
35-
@NamedQueries(
36-
@NamedQuery(name = "circle.findByName",
37-
query = "select c from CircleEntity c " +
38-
"where lower(c.name) = lower(:name)")
39-
)
34+
@NamedQuery(name = "circle.findByName",
35+
query = "select c from CircleEntity c " +
36+
"where lower(c.name) = lower(:name)")
4037
public class CircleEntity extends Externable {
4138

4239
@Column(name = "name", unique = true, nullable = false, length = Constants.MAX_NAME_LENGTH)

‎cws-core/src/main/java/io/javadog/cws/core/model/entities/DataEntity.java

+36-39
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import javax.persistence.FetchType;
2828
import javax.persistence.JoinColumn;
2929
import javax.persistence.ManyToOne;
30-
import javax.persistence.NamedQueries;
3130
import javax.persistence.NamedQuery;
3231
import javax.persistence.OneToOne;
3332
import javax.persistence.Table;
@@ -41,44 +40,42 @@
4140
* @since CWS 1.0
4241
*/
4342
@Entity
44-
@NamedQueries({
45-
@NamedQuery(name = "data.findByMetadata",
46-
query = "select d " +
47-
"from DataEntity d " +
48-
"where d.metadata = :metadata"),
49-
@NamedQuery(name = "data.findAllWithState",
50-
query = "select d " +
51-
"from DataEntity d " +
52-
"where d.sanityStatus = :status" +
53-
" and d.sanityChecked >= :since"),
54-
@NamedQuery(name = "data.findAllWithStateForCircle",
55-
query = "select d " +
56-
"from DataEntity d " +
57-
"where d.sanityStatus = :status" +
58-
" and d.sanityChecked >= :since" +
59-
" and d.metadata.circle.externalId = :externalId"),
60-
@NamedQuery(name = "data.findAllWithStateForMember",
61-
query = "select d " +
62-
"from DataEntity d, TrusteeEntity t " +
63-
"where t.circle = d.metadata.circle" +
64-
" and d.sanityStatus = :status" +
65-
" and d.sanityChecked >= :since" +
66-
" and t.member = :member"),
67-
@NamedQuery(name = "data.findByMemberAndExternalId",
68-
query = "select d " +
69-
"from DataEntity d," +
70-
" TrusteeEntity t " +
71-
"where d.metadata.circle.id = t.circle.id" +
72-
" and d.metadata.externalId = :externalId" +
73-
" and t.member = :member" +
74-
" and t.trustLevel in :trustLevels"),
75-
@NamedQuery(name = "data.findIdsForSanityCheck",
76-
query = "select d.id " +
77-
"from DataEntity d " +
78-
"where d.sanityStatus = :status" +
79-
" and d.sanityChecked <= :date " +
80-
"order by d.id asc")
81-
})
43+
@NamedQuery(name = "data.findByMetadata",
44+
query = "select d " +
45+
"from DataEntity d " +
46+
"where d.metadata = :metadata")
47+
@NamedQuery(name = "data.findAllWithState",
48+
query = "select d " +
49+
"from DataEntity d " +
50+
"where d.sanityStatus = :status" +
51+
" and d.sanityChecked >= :since")
52+
@NamedQuery(name = "data.findAllWithStateForCircle",
53+
query = "select d " +
54+
"from DataEntity d " +
55+
"where d.sanityStatus = :status" +
56+
" and d.sanityChecked >= :since" +
57+
" and d.metadata.circle.externalId = :externalId")
58+
@NamedQuery(name = "data.findAllWithStateForMember",
59+
query = "select d " +
60+
"from DataEntity d, TrusteeEntity t " +
61+
"where t.circle = d.metadata.circle" +
62+
" and d.sanityStatus = :status" +
63+
" and d.sanityChecked >= :since" +
64+
" and t.member = :member")
65+
@NamedQuery(name = "data.findByMemberAndExternalId",
66+
query = "select d " +
67+
"from DataEntity d," +
68+
" TrusteeEntity t " +
69+
"where d.metadata.circle.id = t.circle.id" +
70+
" and d.metadata.externalId = :externalId" +
71+
" and t.member = :member" +
72+
" and t.trustLevel in :trustLevels")
73+
@NamedQuery(name = "data.findIdsForSanityCheck",
74+
query = "select d.id " +
75+
"from DataEntity d " +
76+
"where d.sanityStatus = :status" +
77+
" and d.sanityChecked <= :date " +
78+
"order by d.id asc")
8279
@Table(name = "cws_data")
8380
public class DataEntity extends CWSEntity {
8481

‎cws-core/src/main/java/io/javadog/cws/core/model/entities/DataTypeEntity.java

+11-14
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.javadog.cws.api.common.Constants;
2020
import javax.persistence.Column;
2121
import javax.persistence.Entity;
22-
import javax.persistence.NamedQueries;
2322
import javax.persistence.NamedQuery;
2423
import javax.persistence.Table;
2524

@@ -30,19 +29,17 @@
3029
* @since CWS 1.0
3130
*/
3231
@Entity
33-
@NamedQueries({
34-
@NamedQuery(name = "type.findAll",
35-
query = "select d " +
36-
"from DataTypeEntity d " +
37-
"order by d.id asc"),
38-
@NamedQuery(name = "type.findByName",
39-
query = "select d from DataTypeEntity d " +
40-
"where lower(d.name) = lower(:name)"),
41-
@NamedQuery(name = "type.countUsage",
42-
query = "select count(m.id) " +
43-
"from MetadataEntity m " +
44-
"where m.type = :type")
45-
})
32+
@NamedQuery(name = "type.findAll",
33+
query = "select d " +
34+
"from DataTypeEntity d " +
35+
"order by d.id asc")
36+
@NamedQuery(name = "type.findByName",
37+
query = "select d from DataTypeEntity d " +
38+
"where lower(d.name) = lower(:name)")
39+
@NamedQuery(name = "type.countUsage",
40+
query = "select count(m.id) " +
41+
"from MetadataEntity m " +
42+
"where m.type = :type")
4643
@Table(name = "cws_datatypes")
4744
public class DataTypeEntity extends CWSEntity {
4845

‎cws-core/src/main/java/io/javadog/cws/core/model/entities/MemberEntity.java

+27-30
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import javax.persistence.Entity;
2626
import javax.persistence.EnumType;
2727
import javax.persistence.Enumerated;
28-
import javax.persistence.NamedQueries;
2928
import javax.persistence.NamedQuery;
3029
import javax.persistence.Table;
3130
import javax.persistence.Temporal;
@@ -38,35 +37,33 @@
3837
* @since CWS 1.0
3938
*/
4039
@Entity
41-
@NamedQueries({
42-
@NamedQuery(name = "member.countMembers",
43-
query = "select count(m.id) " +
44-
"from MemberEntity m"),
45-
@NamedQuery(name = "member.findByName",
46-
query = "select m " +
47-
"from MemberEntity m " +
48-
"where lower(m.name) = lower(:name)"),
49-
@NamedQuery(name = "member.findByChecksum",
50-
query = "select m " +
51-
"from MemberEntity m " +
52-
"where m.sessionChecksum = :checksum"),
53-
@NamedQuery(name = "member.findByRole",
54-
query = "select m " +
55-
"from MemberEntity m " +
56-
"where m.memberRole = :role " +
57-
"order by m.id asc"),
58-
@NamedQuery(name = "member.findByNameAndCircle",
59-
query = "select e.member " +
60-
"from TrusteeEntity e " +
61-
"where lower(e.member.name) = lower(:name)" +
62-
" and e.circle.externalId = :externalCircleId"),
63-
@NamedQuery(name = "member.removeExpiredSessions",
64-
query = "update MemberEntity set" +
65-
" sessionChecksum = null," +
66-
" sessionCrypto = null," +
67-
" sessionExpire = null " +
68-
"where sessionExpire > current_timestamp")
69-
})
40+
@NamedQuery(name = "member.countMembers",
41+
query = "select count(m.id) " +
42+
"from MemberEntity m")
43+
@NamedQuery(name = "member.findByName",
44+
query = "select m " +
45+
"from MemberEntity m " +
46+
"where lower(m.name) = lower(:name)")
47+
@NamedQuery(name = "member.findByChecksum",
48+
query = "select m " +
49+
"from MemberEntity m " +
50+
"where m.sessionChecksum = :checksum")
51+
@NamedQuery(name = "member.findByRole",
52+
query = "select m " +
53+
"from MemberEntity m " +
54+
"where m.memberRole = :role " +
55+
"order by m.id asc")
56+
@NamedQuery(name = "member.findByNameAndCircle",
57+
query = "select e.member " +
58+
"from TrusteeEntity e " +
59+
"where lower(e.member.name) = lower(:name)" +
60+
" and e.circle.externalId = :externalCircleId")
61+
@NamedQuery(name = "member.removeExpiredSessions",
62+
query = "update MemberEntity set" +
63+
" sessionChecksum = null," +
64+
" sessionCrypto = null," +
65+
" sessionExpire = null " +
66+
"where sessionExpire > current_timestamp")
7067
@Table(name = "cws_members")
7168
public class MemberEntity extends Externable {
7269

‎cws-core/src/main/java/io/javadog/cws/core/model/entities/MetadataEntity.java

+62-65
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import javax.persistence.FetchType;
2323
import javax.persistence.JoinColumn;
2424
import javax.persistence.ManyToOne;
25-
import javax.persistence.NamedQueries;
2625
import javax.persistence.NamedQuery;
2726
import javax.persistence.Table;
2827

@@ -33,70 +32,68 @@
3332
* @since CWS 1.0
3433
*/
3534
@Entity
36-
@NamedQueries({
37-
@NamedQuery(name = "metadata.findByMemberAndExternalId",
38-
query = "select m " +
39-
"from MetadataEntity m," +
40-
" TrusteeEntity t " +
41-
"where m.circle.id = t.circle.id" +
42-
" and t.member.id = :mid" +
43-
" and m.externalId = :eid " +
44-
"order by m.id desc"),
45-
@NamedQuery(name = "metadata.findByMemberAndName",
46-
query = "select m " +
47-
"from MetadataEntity m," +
48-
" TrusteeEntity t " +
49-
"where m.circle.id = t.circle.id" +
50-
" and t.member.id = :mid" +
51-
" and m.name = :name " +
52-
"order by m.id desc"),
53-
@NamedQuery(name = "metadata.findByMemberAndFolder",
54-
query = "select m " +
55-
"from MetadataEntity m," +
56-
" TrusteeEntity t " +
57-
"where m.circle.id = t.circle.id" +
58-
" and t.member = :member" +
59-
" and m.parentId = :parentId " +
60-
"order by m.id desc"),
61-
@NamedQuery(name = "metadata.findRootByMemberAndCircle",
62-
query = "select m " +
63-
"from MetadataEntity m," +
64-
" TrusteeEntity t " +
65-
"where m.circle.id = t.circle.id" +
66-
" and t.member.id = :mid" +
67-
" and m.circle.externalId = :cid" +
68-
" and m.type.name = 'folder'" +
69-
" and m.name = '/'" +
70-
" and m.parentId = 0 " +
71-
"order by m.id desc"),
72-
@NamedQuery(name = "metadata.findInFolder",
73-
query = "select m " +
74-
"from MetadataEntity m," +
75-
" TrusteeEntity t " +
76-
"where m.circle.id = t.circle.id" +
77-
" and t.member = :member" +
78-
" and m.parentId = :parentId" +
79-
" and lower(m.name) = lower(:name)"),
80-
@NamedQuery(name = "metadata.findByNameAndFolder",
81-
query = "select m " +
82-
"from MetadataEntity m " +
83-
"where m.id <> :id" +
84-
" and m.name = :name" +
85-
" and m.parentId = :parentId"),
86-
@NamedQuery(name = "metadata.countFolderContent",
87-
query = "select count(m.id) " +
88-
"from MetadataEntity m " +
89-
"where m.parentId = :parentId"),
90-
@NamedQuery(name = "metadata.readInventoryRecords",
91-
query = "select m " +
92-
"from MetadataEntity m " +
93-
"where m.type.name <> 'folder' " +
94-
"order by m.id desc"),
95-
@NamedQuery(name = "metadata.countInventoryRecords",
96-
query = "select count(m.id) " +
97-
"from MetadataEntity m " +
98-
"where m.type.name <> 'folder'")
99-
})
35+
@NamedQuery(name = "metadata.findByMemberAndExternalId",
36+
query = "select m " +
37+
"from MetadataEntity m," +
38+
" TrusteeEntity t " +
39+
"where m.circle.id = t.circle.id" +
40+
" and t.member.id = :mid" +
41+
" and m.externalId = :eid " +
42+
"order by m.id desc")
43+
@NamedQuery(name = "metadata.findByMemberAndName",
44+
query = "select m " +
45+
"from MetadataEntity m," +
46+
" TrusteeEntity t " +
47+
"where m.circle.id = t.circle.id" +
48+
" and t.member.id = :mid" +
49+
" and m.name = :name " +
50+
"order by m.id desc")
51+
@NamedQuery(name = "metadata.findByMemberAndFolder",
52+
query = "select m " +
53+
"from MetadataEntity m," +
54+
" TrusteeEntity t " +
55+
"where m.circle.id = t.circle.id" +
56+
" and t.member = :member" +
57+
" and m.parentId = :parentId " +
58+
"order by m.id desc")
59+
@NamedQuery(name = "metadata.findRootByMemberAndCircle",
60+
query = "select m " +
61+
"from MetadataEntity m," +
62+
" TrusteeEntity t " +
63+
"where m.circle.id = t.circle.id" +
64+
" and t.member.id = :mid" +
65+
" and m.circle.externalId = :cid" +
66+
" and m.type.name = 'folder'" +
67+
" and m.name = '/'" +
68+
" and m.parentId = 0 " +
69+
"order by m.id desc")
70+
@NamedQuery(name = "metadata.findInFolder",
71+
query = "select m " +
72+
"from MetadataEntity m," +
73+
" TrusteeEntity t " +
74+
"where m.circle.id = t.circle.id" +
75+
" and t.member = :member" +
76+
" and m.parentId = :parentId" +
77+
" and lower(m.name) = lower(:name)")
78+
@NamedQuery(name = "metadata.findByNameAndFolder",
79+
query = "select m " +
80+
"from MetadataEntity m " +
81+
"where m.id <> :id" +
82+
" and m.name = :name" +
83+
" and m.parentId = :parentId")
84+
@NamedQuery(name = "metadata.countFolderContent",
85+
query = "select count(m.id) " +
86+
"from MetadataEntity m " +
87+
"where m.parentId = :parentId")
88+
@NamedQuery(name = "metadata.readInventoryRecords",
89+
query = "select m " +
90+
"from MetadataEntity m " +
91+
"where m.type.name <> 'folder' " +
92+
"order by m.id desc")
93+
@NamedQuery(name = "metadata.countInventoryRecords",
94+
query = "select count(m.id) " +
95+
"from MetadataEntity m " +
96+
"where m.type.name <> 'folder'")
10097
@Table(name = "cws_metadata")
10198
public class MetadataEntity extends Externable {
10299

‎cws-core/src/main/java/io/javadog/cws/core/model/entities/SettingEntity.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import javax.persistence.Column;
2020
import javax.persistence.Entity;
21-
import javax.persistence.NamedQueries;
2221
import javax.persistence.NamedQuery;
2322
import javax.persistence.Table;
2423

@@ -29,14 +28,12 @@
2928
* @since CWS 1.0
3029
*/
3130
@Entity
32-
@NamedQueries({
33-
@NamedQuery(name = "setting.readAll",
34-
query = "select s from SettingEntity s " +
35-
"order by s.name asc"),
36-
@NamedQuery(name = "setting.findByName",
37-
query = "select s from SettingEntity s " +
38-
"where s.name = :name")
39-
})
31+
@NamedQuery(name = "setting.readAll",
32+
query = "select s from SettingEntity s " +
33+
"order by s.name asc")
34+
@NamedQuery(name = "setting.findByName",
35+
query = "select s from SettingEntity s " +
36+
"where s.name = :name")
4037
@Table(name = "cws_settings")
4138
public class SettingEntity extends CWSEntity {
4239

0 commit comments

Comments
 (0)