From 0da48904d985fefaeefe8a5329e81bf1f3c4e90d Mon Sep 17 00:00:00 2001 From: Bojnourdi Date: Thu, 13 Aug 2015 09:43:25 +0200 Subject: [PATCH] - CreateAttribute - DeleteAttribute - ReadAttribute - Dao cleanup - Renamed MetadataService to AttributeService --- .../src/java/com/edf/gde/dao/MetadataDao.java | 8 +-- .../src/java/com/edf/gde/ejb/MetadataEJB.java | 8 +-- .../com/edf/gde/services/MetadataService.java | 71 +++++++++++++++++++ .../com/edf/gde/services/ProfileService.java | 35 --------- .../com/edf/gde/services/UserService.java | 2 +- projects/GDE_App/GDE-war/web/WEB-INF/web.xml | 2 +- 6 files changed, 81 insertions(+), 45 deletions(-) create mode 100644 projects/GDE_App/GDE-war/src/java/com/edf/gde/services/MetadataService.java delete mode 100644 projects/GDE_App/GDE-war/src/java/com/edf/gde/services/ProfileService.java diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/dao/MetadataDao.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/dao/MetadataDao.java index e36e4a8..43f9cb6 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/dao/MetadataDao.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/dao/MetadataDao.java @@ -27,8 +27,8 @@ public class MetadataDao { return a.toAttributeTO(); } - public void deleteAttribute(AttributeTO ato) { - Attribute a = Attribute.fromAttributeTO(ato); + public void deleteAttribute(long attributeId ) { + Attribute a = new Attribute(attributeId); em.remove(a); } @@ -38,8 +38,8 @@ public class MetadataDao { return up.toAttributeTO(); } - public AttributeTO findAttribute(AttributeTO ato) { - Attribute found = em.find(Attribute.class, ato.getId()); + public AttributeTO readAttribute(long attributeId) { + Attribute found = em.find(Attribute.class, attributeId); return found.toAttributeTO(); } diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/MetadataEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/MetadataEJB.java index 06cd3f0..ea66ed6 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/MetadataEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/MetadataEJB.java @@ -28,9 +28,9 @@ public class MetadataEJB { return dao.createAttribute(ato); } - public void deleteAttribute(AttributeTO ato) { + public void deleteAttribute(long attributeId) { MetadataDao dao = new MetadataDao(em); - dao.deleteAttribute(ato); + dao.deleteAttribute(attributeId); } public AttributeTO updateAttribute(AttributeTO ato) { @@ -38,9 +38,9 @@ public class MetadataEJB { return dao.updateAttribute(ato); } - public AttributeTO findAttribute(AttributeTO ato) { + public AttributeTO readAttribute(long attributeId) { MetadataDao dao = new MetadataDao(em); - return dao.findAttribute(ato); + return dao.readAttribute(attributeId); } public AttributeTO findById(long id) { diff --git a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/MetadataService.java b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/MetadataService.java new file mode 100644 index 0000000..8131bb8 --- /dev/null +++ b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/MetadataService.java @@ -0,0 +1,71 @@ +package com.edf.gde.services; + +import com.edf.gde.ejb.MetadataEJB; +import com.edf.gde.ejb.PermissionsManagerEJB; +import com.edf.gde.ejb.UserEJB; +import static com.edf.gde.services.UserService.ServiceName; +import com.edf.gde.tools.Credentials; +import com.edf.gde.transferables.AttributeTO; +import com.edf.gde.transferables.CommandTO; +import com.edf.gde.transferables.responses.CommandResultTO; +import java.util.logging.Logger; +import javax.ejb.EJB; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author kavoos + */ +public class MetadataService extends BaseService { + + public static final String ServiceName = "MetadataService"; + public static final int CREATEATTRIBUTE = 1; + public static final int DELETEATTRIBUTE = 2; + public static final int READATTRIBUTE = 3; + @EJB + private UserEJB userEjb; + @EJB + private PermissionsManagerEJB pm; + @EJB + private MetadataEJB mjb; + + @Override + public void processRequest(HttpServletRequest request, HttpServletResponse response) { + response.setContentType("text/html;charset=UTF-8"); + Logger logger = Logger.getLogger(ServiceName); + CommandTO commandTO = getCommand(request); + CommandResultTO resultTO = new CommandResultTO(); + Credentials credentials = getCredentials(request); + userEjb.checkPassword(credentials.getLogin(), credentials.getPassword()); + pm.checkPermission(credentials.getLogin(), ServiceName, commandTO.getMethod()); + try { + switch (commandTO.getMethod()) { + case CREATEATTRIBUTE: { + AttributeTO ato = fromJson(commandTO.getData(), AttributeTO.class); + AttributeTO nato = mjb.createAttribute(ato); + resultTO.setData(toJson(nato)); + } + break; + case DELETEATTRIBUTE: { + long attributeId = commandTO.getLong("attributeId"); + mjb.deleteAttribute(attributeId); + } + break; + case READATTRIBUTE: { + long attributeId = commandTO.getLong("attributeId"); + AttributeTO ato = mjb.readAttribute(attributeId); + resultTO.setData(toJson(ato)); + } + break; + } + } catch (RuntimeException ex) { + // Return error on any error... + resultTO.setCode(CommandResultTO.ERROR); + ex.printStackTrace(); + } finally { + send(resultTO, response); + } + } + +} diff --git a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/ProfileService.java b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/ProfileService.java deleted file mode 100644 index b19449f..0000000 --- a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/ProfileService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.edf.gde.services; - -import com.edf.gde.transferables.CommandTO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * - * @author kavoos - */ -public class ProfileService extends BaseService { - - public enum Command { - CREATE(1), - DELETE(2), - ATTACH(3); - private int command; - - private Command(int i) { - command = i; - } - - public int getCommand() { - return command; - } - } - - @Override - public void processRequest(HttpServletRequest request, HttpServletResponse response) { - response.setContentType("text/html;charset=UTF-8"); - CommandTO commandTO = getCommand(request); - } - - -} diff --git a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java index 7450a49..f8d93d3 100644 --- a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java +++ b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java @@ -37,7 +37,7 @@ public class UserService extends BaseService { @Override public void processRequest(HttpServletRequest request, HttpServletResponse response) { - + response.setContentType("text/html;charset=UTF-8"); Logger logger = Logger.getLogger(ServiceName); CommandTO commandTO = getCommand(request); CommandResultTO resultTO = new CommandResultTO(); diff --git a/projects/GDE_App/GDE-war/web/WEB-INF/web.xml b/projects/GDE_App/GDE-war/web/WEB-INF/web.xml index 29d9579..5f8f095 100644 --- a/projects/GDE_App/GDE-war/web/WEB-INF/web.xml +++ b/projects/GDE_App/GDE-war/web/WEB-INF/web.xml @@ -2,7 +2,7 @@ MetadataService - com.edf.gde.services.ProfileService + com.edf.gde.services.MetadataService UserServce -- 2.39.2