Skip to content

Commit

Permalink
Merge branch 'feature/SHIBUI-1031' of bitbucket.org:unicon/shib-idp-u…
Browse files Browse the repository at this point in the history
…i into feature/SHIBUI-1031
  • Loading branch information
rmathis committed Dec 17, 2018
2 parents 2865146 + 510ec55 commit 14bed36
Showing 1 changed file with 7 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,16 @@ public Role(String name) {
this.name = name;
}

public Role(String name, int rank) {
this.name = name;
this.rank = rank;
}

@Column(unique = true)
private String name;

private int rank;

//Ignore properties annotation here is to prevent stack overflow recursive error during JSON serialization
@JsonIgnoreProperties("roles")
@ManyToMany(cascade = CascadeType.ALL, mappedBy = "roles", fetch = FetchType.EAGER)
Expand Down

0 comments on commit 14bed36

Please sign in to comment.