From 781aeb36947ddc75c938f726becb02f262a5d333 Mon Sep 17 00:00:00 2001
From: Kavoos Bojnourdi <kavoos.bojnourdi@edf.fr>
Date: Mon, 10 Aug 2015 19:54:06 +0200
Subject: [PATCH] - Removed PermissionManager class

---
 .../com/edf/gde/common/PermissionManager.java | 55 -------------------
 .../java/com/edf/gde/ejb/ApplicationEJB.java  |  8 ---
 .../edf/gde/ejb/PermissionsManagerEJB.java    | 34 +++++++++++-
 3 files changed, 31 insertions(+), 66 deletions(-)
 delete mode 100644 projects/GDE_App/GDE-ejb/src/java/com/edf/gde/common/PermissionManager.java

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/common/PermissionManager.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/common/PermissionManager.java
deleted file mode 100644
index b30ee3d..0000000
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/common/PermissionManager.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.edf.gde.common;
-
-import com.edf.gde.entities.GroupPermission;
-import com.edf.gde.entities.UserGroup;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-/**
- *
- * @author Kavoos
- */
-public class PermissionManager {
-
-    /**
-     * MAP<K,V>
-     * K = Service name V = Set of group Id
-     */
-
-    private EntityManager em;
-
-    public PermissionManager(EntityManager em) {
-        this.em = em;
-    }
-
-    public synchronized void addGroup(long groupId, String serviceName, int methodIndex) {
-        GroupPermission groupPermission = new GroupPermission();
-        groupPermission.setMethodIndex(methodIndex);
-        groupPermission.setServiceName(serviceName);
-        groupPermission.setGroupId(groupId);
-        em.persist(groupPermission);
-    }
-    
-    public synchronized boolean checkPermission(long userId, String serviceName, int methodIndex) {
-        Query query = em.createNamedQuery("UserGroup.findByUserId");
-        query.setParameter("userId", userId);
-        List<UserGroup> userGroups = query.getResultList();
-
-        for (UserGroup ug : userGroups) {
-            Query gQuery = em.createNamedQuery("GroupPermission.findPermission");
-            gQuery.setParameter("groupId", ug.getGroupId());
-            gQuery.setParameter("serviceName", serviceName);
-            gQuery.setParameter("methodIndex", methodIndex);
-
-            List<GroupPermission> gps = gQuery.getResultList();
-            if (gps.size() > 0) {
-                /* If GroupPermission object exists with this parameters then return true */
-                return true;
-            }
-        }
-        return false;
-
-    }
-
-}
diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ApplicationEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ApplicationEJB.java
index 6358e96..c0fe6c5 100644
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ApplicationEJB.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ApplicationEJB.java
@@ -1,6 +1,5 @@
 package com.edf.gde.ejb;
 
-import com.edf.gde.common.PermissionManager;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -27,8 +26,6 @@ public class ApplicationEJB {
      */
 
     private Map<Long, Long> userFiles;
-    private PermissionManager permissionManager;
-
     
     /**
      *
@@ -41,7 +38,6 @@ public class ApplicationEJB {
         try {
             ctx = new InitialContext();
             PermissionsManagerEJB managerEJB = (PermissionsManagerEJB) ctx.lookup("java:global/GDE_App/GDE-ejb/PermissionsManagerEJB");
-            permissionManager = managerEJB.getManager();
         } catch (NamingException ex) {
             Logger.getLogger(ApplicationEJB.class.getName()).log(Level.SEVERE, null, ex);
         }
@@ -83,10 +79,6 @@ public class ApplicationEJB {
         return false;
     }
 
-    public PermissionManager getPermissionManager() {
-        return permissionManager;
-    }
-
     private void loadPermissions() {
 
     }
diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/PermissionsManagerEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/PermissionsManagerEJB.java
index 8a5edd0..606f70f 100644
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/PermissionsManagerEJB.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/PermissionsManagerEJB.java
@@ -3,11 +3,14 @@
  */
 package com.edf.gde.ejb;
 
-import com.edf.gde.common.PermissionManager;
+import com.edf.gde.entities.GroupPermission;
+import com.edf.gde.entities.UserGroup;
+import java.util.List;
 import javax.ejb.Stateless;
 import javax.ejb.LocalBean;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
 
 /**
  *
@@ -20,7 +23,32 @@ public class PermissionsManagerEJB {
     @PersistenceContext(unitName = "GDE-ejbPU")
     private EntityManager em;
 
-    public PermissionManager getManager() {
-        return new PermissionManager(em);
+    public void addGroup(long groupId, String serviceName, int methodIndex) {
+        GroupPermission groupPermission = new GroupPermission();
+        groupPermission.setMethodIndex(methodIndex);
+        groupPermission.setServiceName(serviceName);
+        groupPermission.setGroupId(groupId);
+        em.persist(groupPermission);
+    }
+    
+    public boolean checkPermission(long userId, String serviceName, int methodIndex) {
+        Query query = em.createNamedQuery("UserGroup.findByUserId");
+        query.setParameter("userId", userId);
+        List<UserGroup> userGroups = query.getResultList();
+
+        for (UserGroup ug : userGroups) {
+            Query gQuery = em.createNamedQuery("GroupPermission.findPermission");
+            gQuery.setParameter("groupId", ug.getGroupId());
+            gQuery.setParameter("serviceName", serviceName);
+            gQuery.setParameter("methodIndex", methodIndex);
+
+            List<GroupPermission> gps = gQuery.getResultList();
+            if (gps.size() > 0) {
+                /* If GroupPermission object exists with this parameters then return true */
+                return true;
+            }
+        }
+        return false;
+
     }
 }
-- 
2.39.2