Policy failures:
Code warning - failed on resource ConferenceManagerBean.java. Reason: The import org.yacos.core.users.Role.RoleType is never used, line 1 Override reason: c
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
package org.yacos.core.conferences;
|
package org.yacos.core.conferences;
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -9,9 +8,10 @@ import javax.persistence.EntityManager;
|
|||||||
import javax.persistence.PersistenceContext;
|
import javax.persistence.PersistenceContext;
|
||||||
import javax.persistence.Query;
|
import javax.persistence.Query;
|
||||||
|
|
||||||
import org.yacos.core.article.Article;
|
|
||||||
import org.yacos.core.users.Role;
|
import org.yacos.core.users.Role;
|
||||||
import org.yacos.core.users.User;
|
import org.yacos.core.users.User;
|
||||||
|
import org.yacos.core.users.Role.RoleType;
|
||||||
|
|
||||||
|
|
||||||
@Stateless
|
@Stateless
|
||||||
public class ConferenceManagerBean implements IConferenceManager {
|
public class ConferenceManagerBean implements IConferenceManager {
|
||||||
@@ -42,34 +42,47 @@ public class ConferenceManagerBean implements IConferenceManager {
|
|||||||
em.merge(conf);
|
em.merge(conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
public List<Article> getArticles(Integer conference_id) {
|
public List<Article> getArticles(Integer conference_id) {
|
||||||
//FIXME cast a verifier lors des tests
|
//FIXME cast a verifier lors des tests
|
||||||
return getConference(conference_id).getArticles();
|
return getConference(conference_id).getArticles();
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
public void addArticle(User user) {
|
//FIXME
|
||||||
|
/*public void addArticle(User user) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
|
||||||
|
}*/
|
||||||
|
|
||||||
|
public List<Conference> getConferencesForUser(User user){
|
||||||
|
return user.getConferences();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addRoleForUser(Role.RoleType roleType, User user, Conference conf) {
|
/*
|
||||||
|
*
|
||||||
|
* m<>thodes relatives aux roles
|
||||||
|
* */
|
||||||
|
|
||||||
|
public void addRole(Role.RoleType roleType, User user, Conference conf) {
|
||||||
Role role = new Role(roleType, user, conf);
|
Role role = new Role(roleType, user, conf);
|
||||||
em.persist(role);
|
em.persist(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void removeRole(Role role) {
|
||||||
|
em.remove(role);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateRole(Role role){
|
||||||
|
em.merge(role);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
public List<Role> getRoles(User user, Conference conf) {
|
public List<Role> getRoles(User user, Conference conf) {
|
||||||
Query query = em.createQuery("from Role role where conference = ? and user = ?");
|
Query query = em.createQuery("from Role role where conference = ? and user = ?");
|
||||||
query.setParameter(0, conf);
|
query.setParameter(0, conf);
|
||||||
query.setParameter(1, user);
|
query.setParameter(1, user);
|
||||||
|
|
||||||
return query.getResultList();
|
return query.getResultList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void removeRoleForUser(Role role) {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
package org.yacos.core.conferences;
|
package org.yacos.core.conferences;
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.ejb.Remote;
|
import javax.ejb.Remote;
|
||||||
|
|
||||||
import org.yacos.core.article.Article;
|
|
||||||
import org.yacos.core.users.Role;
|
import org.yacos.core.users.Role;
|
||||||
import org.yacos.core.users.User;
|
import org.yacos.core.users.User;
|
||||||
|
|
||||||
@@ -16,7 +14,7 @@ public interface IConferenceManager {
|
|||||||
//CRUD methodes
|
//CRUD methodes
|
||||||
public Conference addConference(String titre, String descirption, String infoComplementray, Date dataAbstract, Date dateArticle, Date dateEvaluation, Date dateStart, Date dateEnd);
|
public Conference addConference(String titre, String descirption, String infoComplementray, Date dataAbstract, Date dateArticle, Date dateEvaluation, Date dateStart, Date dateEnd);
|
||||||
public Conference getConference(Integer id);
|
public Conference getConference(Integer id);
|
||||||
public List<Conference> getConferences();
|
|
||||||
public void remove(Conference conf);
|
public void remove(Conference conf);
|
||||||
public void update(Conference conf);
|
public void update(Conference conf);
|
||||||
|
|
||||||
@@ -24,10 +22,15 @@ public interface IConferenceManager {
|
|||||||
//FIXME
|
//FIXME
|
||||||
//methode a gicler ?
|
//methode a gicler ?
|
||||||
//public void addArticle(User user);
|
//public void addArticle(User user);
|
||||||
public Collection<Article> getArticles(Integer id);
|
//public Collection<Article> getArticles(Integer id);
|
||||||
|
|
||||||
|
//list methodes
|
||||||
|
public List<Conference> getConferences();
|
||||||
|
public List<Conference> getConferencesForUser(User user);
|
||||||
|
|
||||||
//role methode
|
//role methode
|
||||||
public void addRoleForUser(Role.RoleType roleType, User user, Conference conf);
|
public void addRole(Role.RoleType roleType, User user, Conference conf);
|
||||||
public void removeRoleForUser(Role role);
|
public void removeRole(Role role);
|
||||||
public List<Role> getRoles(User user, Conference conf);
|
public List<Role> getRoles(User user, Conference conf);
|
||||||
|
public void updateRole(Role role);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package org.yacos.core.users;
|
package org.yacos.core.users;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.ejb.Remote;
|
import javax.ejb.Remote;
|
||||||
|
|
||||||
@@ -10,7 +10,7 @@ import org.yacos.core.exceptions.PKAlreadyUsedException;
|
|||||||
public interface IUserManager {
|
public interface IUserManager {
|
||||||
|
|
||||||
//crud methode
|
//crud methode
|
||||||
public Collection<User> getUsers();
|
public List<User> getUsers();
|
||||||
public User addUser(String login, String password, String firstName,
|
public User addUser(String login, String password, String firstName,
|
||||||
String lastName, String organization, String email) throws PKAlreadyUsedException;
|
String lastName, String organization, String email) throws PKAlreadyUsedException;
|
||||||
public void removeUser(User user);
|
public void removeUser(User user);
|
||||||
@@ -19,6 +19,7 @@ public interface IUserManager {
|
|||||||
public Boolean exists(String login);
|
public Boolean exists(String login);
|
||||||
|
|
||||||
//role methode
|
//role methode
|
||||||
public Collection<Role> getRoles();
|
public List<Role> getRoles();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package org.yacos.core.users;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
@@ -56,7 +56,7 @@ public class User implements Serializable{
|
|||||||
* Roles for this user
|
* Roles for this user
|
||||||
*/
|
*/
|
||||||
@OneToMany(targetEntity=Role.class,mappedBy="user")
|
@OneToMany(targetEntity=Role.class,mappedBy="user")
|
||||||
private Collection<Role> roles;
|
private List<Role> roles;
|
||||||
|
|
||||||
public User(String login, String password, String firstName,
|
public User(String login, String password, String firstName,
|
||||||
String lastName, String organization, String email) {
|
String lastName, String organization, String email) {
|
||||||
@@ -133,7 +133,7 @@ public class User implements Serializable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@OneToMany(targetEntity=Role.class,mappedBy="user")
|
@OneToMany(targetEntity=Role.class,mappedBy="user")
|
||||||
public Collection<Role> getRoles(){
|
public List<Role> getRoles(){
|
||||||
return roles;
|
return roles;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -156,12 +156,23 @@ public class User implements Serializable{
|
|||||||
* @param roles the roles to set
|
* @param roles the roles to set
|
||||||
*/
|
*/
|
||||||
@OneToMany(targetEntity=Role.class,mappedBy="user")
|
@OneToMany(targetEntity=Role.class,mappedBy="user")
|
||||||
public void setRoles(Collection<Role> roles) {
|
public void setRoles(List<Role> roles) {
|
||||||
this.roles = roles;
|
this.roles = roles;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddRole(Role role){
|
|
||||||
roles.add(role);
|
public List<Conference> getConferences(){
|
||||||
|
Conference conf;
|
||||||
|
List<Conference> list = new ArrayList<Conference>();
|
||||||
|
List<Role> tmpList = getRoles();
|
||||||
|
|
||||||
|
for (Role role : tmpList) {
|
||||||
|
conf = role.getConference();
|
||||||
|
if(!list.contains(conf)){
|
||||||
|
list.add(conf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
*/
|
*/
|
||||||
package org.yacos.core.users;
|
package org.yacos.core.users;
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import javax.ejb.Stateless;
|
import javax.ejb.Stateless;
|
||||||
import javax.persistence.EntityManager;
|
import javax.persistence.EntityManager;
|
||||||
@@ -22,7 +23,7 @@ public class UserManagerBean implements IUserManager{
|
|||||||
EntityManager em;
|
EntityManager em;
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public Collection<User> getUsers(){
|
public List<User> getUsers(){
|
||||||
Query query = em.createNativeQuery("from User", User.class);
|
Query query = em.createNativeQuery("from User", User.class);
|
||||||
return query.getResultList();
|
return query.getResultList();
|
||||||
}
|
}
|
||||||
@@ -65,7 +66,7 @@ public class UserManagerBean implements IUserManager{
|
|||||||
return (this.getUser(login)!= null);
|
return (this.getUser(login)!= null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Collection<Role> getRoles() {
|
public List<Role> getRoles() {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user