From c79ca386643d00ea3464854cdeb0dd3b08060b3b Mon Sep 17 00:00:00 2001 From: Kavoos Bojnourdi Date: Sat, 15 Aug 2015 12:25:33 +0200 Subject: [PATCH] DAO cleanup --- .../GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java | 2 -- projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java | 2 +- .../GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java | 2 -- .../GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java index 6f94e03..52b6591 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java @@ -29,12 +29,10 @@ public class AttributeDaoClient extends BaseDao { getContext().setBaseResource("http://localhost:8080/GDE-war/AttributesService"); getContext().setUserName("admin"); getContext().setPassword("edf123"); - daoResponseHandler = new DaoResponseHandler(); } public AttributeDaoClient(DaoResponseHandler daoResponseHandler, RestContext context) { super(context); - this.daoResponseHandler = daoResponseHandler; } public AttributeTO createAttribute(AttributeTO ato) throws IOException { diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java index 244bff5..51e929a 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java @@ -16,7 +16,7 @@ import restapi.SimpleRestApi; */ public abstract class BaseDao extends SimpleRestApi { - protected DaoResponseHandler daoResponseHandler; + protected DaoResponseHandler daoResponseHandler = new DaoResponseHandler(); public BaseDao() { super(); diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java index 180e037..83f7f12 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java @@ -27,12 +27,10 @@ public class StudyDaoClient extends BaseDao { getContext().setBaseResource("http://localhost:8080/GDE-war/StudyService"); getContext().setUserName("admin"); getContext().setPassword("edf123"); - daoResponseHandler = new DaoResponseHandler(); } public StudyDaoClient(RestContext context) { super(context); - daoResponseHandler = new DaoResponseHandler(); } public StudyTO createStudy(StudyTO studyTO) throws IOException { diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java index e305625..71c2e1e 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java @@ -31,12 +31,10 @@ public class UserDaoClient extends BaseDao { getContext().setBaseResource("http://localhost:8080/GDE-war/UserService"); getContext().setUserName("admin"); getContext().setPassword("edf123"); - daoResponseHandler = new DaoResponseHandler(); } public UserDaoClient(RestContext context) { super(context); - daoResponseHandler = new DaoResponseHandler(); } /** -- 2.39.2