Changeset 9919 for extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/impl/ImageDaoImpl.java

Timestamp:

Mar 29, 2011, 8:21:25 PM (13 years ago)

Author:

mlg

Message:

Complete rewriting of the api
The api now uses interfaces everywhere (for the dao, services and session manager). This allows the developer to use his own implementations if he wants.
Deletion of the singletons. There are now getters and setters. It allows to make dependency injection.
Use of sl4j in the api, instead of using log4j.

Location:

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/impl

Files:

• . (added)
• ImageDaoImpl.java (copied) (copied from extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/ImageDao.java) (7 diffs)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/impl/ImageDaoImpl.java

@@ -1 @@
-package fr.mael.jiwigo.dao;
+package fr.mael.jiwigo.dao.impl;
 
 import java.io.File;
@@ -8 +8 @@
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -14 +16 @@
 
 import sun.misc.BASE64Encoder;
+import fr.mael.jiwigo.dao.ImageDao;
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
@@ -39 +42 @@
  *
  */
-public class ImageDao {
+public class ImageDaoImpl implements ImageDao {
 
     /**
      * Logger
      */
-    public static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
-            .getLog(ImageDao.class);
-
-    /**
-     * Singleton
-     */
-    private static ImageDao instance;
+    private final Logger LOG = LoggerFactory.getLogger(ImageDaoImpl.class);
 
     /**
@@ -66 +63 @@
     private ArrayList<File> filesToSend;
 
-    /**
-     * Private singleton, to use a singleton
-     */
-    private ImageDao(SessionManager sessionManager) {
+    public ImageDaoImpl() {
         cache = new HashMap<Integer, List<Image>>();
-        this.sessionManager = sessionManager;
-    }
-
-    /**
-     * @return le singleton
-     */
-    public static ImageDao getInstance(SessionManager sessionManager) {
-        if (instance == null) {
-            instance = new ImageDao(sessionManager);
-        }
-        return instance;
     }
 
@@ -260 +243 @@
     public List<Image> search(String searchString) throws IOException, ProxyAuthenticationException {
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.SEARCH.getLabel(), "query", searchString);
-        LOG.debug(doc);
+        LOG.debug(Tools.documentToString(doc));
         Element element = (Element) doc.getDocumentElement().getElementsByTagName("images").item(0);
         return getImagesFromElement(element);
@@ -277 +260 @@
     }
 
+    public SessionManager getSessionManager() {
+        return sessionManager;
+    }
+
+    public void setSessionManager(SessionManager sessionManager) {
+        this.sessionManager = sessionManager;
+    }
+
 }