← Back to branch summary

~opensource21/permsec/psec2.0.x

« back to all changes in this revision

Viewing changes to psec/app/models/psec/PsecUser.java

  • Committer: niels
  • Date: 2012-05-26 18:01:51 UTC
  • Revision ID: opensource21@googlemail.com-20120526180151-1yn2ucehdty3ytdp
Switched complete to Mockito at Test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
psec/app/models/psec/PsecUser.java
51
51
    private String password;
52
52
 
53
53
    @ManyToMany()
54
 
    private List<PsecRole> psecRoles;
 
54
    private List<PsecRole> psecRoles = new ArrayList <PsecRole>();
55
55
 
56
56
    @ManyToMany()
57
57
    private List<PsecPermission> psecPermissions;
71
71
 
72
72
 
73
73
    public List <Permission> getPermissions() {
 
74
        if (psecPermissions == null) {
 
75
            return new ArrayList <Permission>();
 
76
        }
74
77
        final List<Permission> permissions = new ArrayList <Permission>(psecPermissions.size());
75
78
        for (PsecPermission permission : psecPermissions) {
76
79
            permissions.add(permission.convertToPermission());
118
121
     *{@inheritDoc}
119
122
     */
120
123
    public void addToRoles(PsecRole permsecRole) {
121
 
        if (psecRoles == null) {
122
 
            psecRoles = new ArrayList <PsecRole>();
123
 
        }
124
124
        psecRoles.add(permsecRole);
125
125
    }
126
126