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

Timestamp:

Apr 20, 2011, 5:17:02 AM (13 years ago)

Author:

anthony43

Message:

huge refactoring to introduce JiwigoException : a generic exception encapsulating low level exceptions (IOException, ProxyAuthentication, etc...)
The aim is to have, on the consumer side, just one exception to catch them all.
this refactoring may need a code review to check the changes.

File:

• extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/impl/TagDaoImpl.java (modified) (4 diffs)

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

@@ -18 +18 @@
 import fr.mael.jiwigo.transverse.enumeration.TagEnum;
 import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException;
+import fr.mael.jiwigo.transverse.exception.JiwigoException;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
@@ -52 +53 @@
      * @throws ProxyAuthenticationException
      */
-    public List<Tag> list() throws IOException, ProxyAuthenticationException {
+    public List<Tag> list() throws JiwigoException {
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.TAGS_ADMIN_LIST.getLabel());
         //      System.out.println(Outil.documentToString(doc));
@@ -90 +91 @@
      * @throws ProxyAuthenticationException
      */
-    public boolean create(Tag tag) throws ProxyAuthenticationException {
+    public boolean create(Tag tag) throws JiwigoException {
         try {
-            return Tools.checkOk(sessionManager.executeReturnDocument(MethodsEnum.ADD_TAG.getLabel(), "name", tag
-                    .getName()));
-        } catch (IOException e) {
+            return Tools.checkOk(sessionManager.executeReturnDocument(MethodsEnum.ADD_TAG.getLabel(), "name",
+                    tag.getName()));
+        } catch (FileAlreadyExistsException e) {
             LOG.error(Tools.getStackTrace(e));
-        } catch (FileAlreadyExistsException e) {
-            e.printStackTrace();
+            throw new JiwigoException(e);
         }
-        return false;
     }
 
@@ -107 +106 @@
      * @return the tags list
      * @throws IOException
-     * @throws ProxyAuthenticationException
+     * @throws JiwigoException
      */
-    public List<Tag> tagsForImage(Image image) throws IOException, ProxyAuthenticationException {
-        Document doc = sessionManager.executeReturnDocument(MethodsEnum.GET_INFO.getLabel(), "image_id", String
-                .valueOf(image.getIdentifier()));
+    public List<Tag> tagsForImage(Image image) throws JiwigoException {
+        Document doc = sessionManager.executeReturnDocument(MethodsEnum.GET_INFO.getLabel(), "image_id",
+                String.valueOf(image.getIdentifier()));
         Element elementImage = (Element) doc.getDocumentElement().getElementsByTagName("image").item(0);
         Element elementTag = (Element) elementImage.getElementsByTagName("tags").item(0);