Changeset 9919 for extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/impl/ImageServiceImpl.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/service/impl

Files:

• . (added)
• ImageServiceImpl.java (copied) (copied from extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/ImageService.java) (8 diffs)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/impl/ImageServiceImpl.java

@@ -1 @@
-package fr.mael.jiwigo.service;
+package fr.mael.jiwigo.service.impl;
 
 import java.io.File;
@@ -6 +6 @@
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import fr.mael.jiwigo.dao.ImageDao;
 import fr.mael.jiwigo.om.Image;
+import fr.mael.jiwigo.service.ImageService;
 import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.exception.WrongChunkSizeException;
-import fr.mael.jiwigo.transverse.session.SessionManager;
 import fr.mael.jiwigo.transverse.util.ImagesUtil;
 import fr.mael.jiwigo.transverse.util.Tools;
@@ -32 +35 @@
  *
  */
-public class ImageService {
+public class ImageServiceImpl implements ImageService {
 
     /**
      * Logger
      */
-    public static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
-            .getLog(ImageService.class);
+    private final Logger LOG = LoggerFactory.getLogger(ImageServiceImpl.class);
 
-    /**
-     * Singleton
-     */
-    private static ImageService instance;
-
-    private SessionManager sessionManager;
-
-    /**
-     * @return the singleton
-     */
-    public static ImageService getInstance(SessionManager sessionManager) {
-        if (instance == null) {
-            instance = new ImageService(sessionManager);
-        }
-        return instance;
-    }
-
-    /**
-     * private constructor to use a singleton
-     */
-    private ImageService(SessionManager sessionManager) {
-        this.sessionManager = sessionManager;
-    }
+    private ImageDao dao;
 
     /**
@@ -73 +53 @@
     public List<Image> listByCategory(Integer categoryId, boolean rafraichir) throws IOException,
             ProxyAuthenticationException {
-        return ImageDao.getInstance(sessionManager).listByCategory(categoryId, rafraichir);
+        return dao.listByCategory(categoryId, rafraichir);
     }
 
@@ -127 +107 @@
         image.setPrivacyLevel(String.valueOf(privacyLevel));
         //now we call the dao to send the image to the webservice
-        return ImageDao.getInstance(sessionManager).create(image, chunckSize * 1000000);
+        return dao.create(image, chunckSize * 1000000);
     }
 
@@ -139 +119 @@
      */
     public boolean addTags(Image image, String tagId) throws IOException, ProxyAuthenticationException {
-        return ImageDao.getInstance(sessionManager).addTags(image.getIdentifier(), tagId);
+        return dao.addTags(image.getIdentifier(), tagId);
     }
 
@@ -150 +130 @@
      */
     public List<Image> search(String queryString) throws IOException, ProxyAuthenticationException {
-        return ImageDao.getInstance(sessionManager).search(queryString);
+        return dao.search(queryString);
     }
 
@@ -165 +145 @@
     }
 
+    public ImageDao getDao() {
+        return dao;
+    }
+
+    public void setDao(ImageDao dao) {
+        this.dao = dao;
+    }
+
 }