Changeset 9893

Timestamp:

Mar 27, 2011, 1:03:05 PM (13 years ago)

Author:

mlg

Message:

Adds a better Exception management
new Exception : FileAlreadyExistsException.

Location:

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

Files:

• dao/CategoryDao.java (modified) (2 diffs)
• dao/CommentDao.java (modified) (2 diffs)
• dao/ImageDao.java (modified) (4 diffs)
• dao/TagDao.java (modified) (2 diffs)
• service/ImageService.java (modified) (2 diffs)
• transverse/exception/FileAlreadyExistsException.java (added)
• transverse/util/ImagesUtil.java (modified) (1 diff)
• transverse/util/Tools.java (modified) (6 diffs)

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

@@ -11 +11 @@
 import fr.mael.jiwigo.transverse.enumeration.CategoryEnum;
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
+import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
@@ -112 +113 @@
         } catch (IOException e) {
             LOG.error(Tools.getStackTrace(e));
+        } catch (FileAlreadyExistsException e) {
+            LOG.error(Tools.getStackTrace(e));
         }
         return false;

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

@@ -10 +10 @@
 import fr.mael.jiwigo.om.Comment;
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
+import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
@@ -113 +114 @@
             e.printStackTrace();
         }
-        return Tools.checkOk(sessionManager.executeReturnDocument(MethodsEnum.AJOUTER_COMMENTAIRE.getLabel(),
-                "image_id", String.valueOf(commentaire.getImageId()), "author", commentaire.getAuthor(), "content",
-                commentaire.getContent(), "key", key));
+        try {
+            return Tools.checkOk(sessionManager.executeReturnDocument(MethodsEnum.AJOUTER_COMMENTAIRE.getLabel(),
+                    "image_id", String.valueOf(commentaire.getImageId()), "author", commentaire.getAuthor(), "content",
+                    commentaire.getContent(), "key", key));
+        } catch (FileAlreadyExistsException e) {
+            LOG.error(Tools.getStackTrace(e));
+            return false;
+        }
 
     }

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

@@ -3 +3 @@
 import java.io.File;
 import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13 +14 @@
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
+import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.exception.WrongChunkSizeException;
@@ -133 +135 @@
      * @param image the image to create
      * @return true if the creation of the image was the successful
+     * @throws IOException
+     * @throws NoSuchAlgorithmException
+     * @throws WrongChunkSizeException
      * @throws Exception
      */
     //TODO ne pas continuer si une des reponses precedentes est negative
-    public boolean create(Image image, Double chunkSize) throws Exception {
+    public boolean create(Image image, Double chunkSize) throws FileAlreadyExistsException, IOException,
+            ProxyAuthenticationException, NoSuchAlgorithmException, WrongChunkSizeException {
         //thumbnail converted to base64
         BASE64Encoder base64 = new BASE64Encoder();
@@ -201 +207 @@
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.SET_INFO.getLabel(), "image_id", String
                 .valueOf(imageId), "tag_ids", tagId);
-        return Tools.checkOk(doc);
+        try {
+            return Tools.checkOk(doc);
+        } catch (FileAlreadyExistsException e) {
+            LOG.error(Tools.getStackTrace(e));
+            return false;
+        }
 
     }

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

@@ -12 +12 @@
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
 import fr.mael.jiwigo.transverse.enumeration.TagEnum;
+import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
@@ -105 +106 @@
         } catch (IOException e) {
             LOG.error(Tools.getStackTrace(e));
+        } catch (FileAlreadyExistsException e) {
+            e.printStackTrace();
         }
         return false;

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

@@ -3 +3 @@
 import java.io.File;
 import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
 import fr.mael.jiwigo.dao.ImageDao;
 import fr.mael.jiwigo.om.Image;
+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;
@@ -80 +83 @@
      * @param originalHeight height for the original image
      * @return true if the image is created
+     * @throws IOException
+     * @throws WrongChunkSizeException
+     * @throws ProxyAuthenticationException
+     * @throws FileAlreadyExistsException
+     * @throws NoSuchAlgorithmException
      * @throws Exception
      */
     public boolean create(String filePath, Integer idCategory, Integer originalWidth, Integer originalHeight,
-            Double chunckSize, Integer privacyLevel) throws Exception {
+            Double chunckSize, Integer privacyLevel) throws IOException, NoSuchAlgorithmException,
+            FileAlreadyExistsException, ProxyAuthenticationException, WrongChunkSizeException {
         File originalFile = new File(filePath);
         //get the byte array of the original file, to keep metadata

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/ImagesUtil.java

@@ -97 +97 @@
      * @param height the height
      * @return true if successful
+     * @throws IOException
      * @throws Exception
      */
-    public static boolean scale(String filePath, String tempName, int width, int height) throws Exception {
+    public static boolean scale(String filePath, String tempName, int width, int height) throws IOException {
         File file = new File(filePath);
         InputStream imageStream = new BufferedInputStream(new FileInputStream(filePath));

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/Tools.java

@@ -17 +17 @@
 import java.net.URLClassLoader;
 import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 
@@ -32 +33 @@
 import org.jdom.output.XMLOutputter;
 
+import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException;
+
 /*
  *  jiwigo-ws-api Piwigo webservice access Api
@@ -123 +126 @@
      * @param filename the path of the file
      * @return the checksum
+     * @throws IOException
+     * @throws NoSuchAlgorithmException
      * @throws Exception
      */
-    public static String getMD5Checksum(String filename) throws Exception {
+    public static String getMD5Checksum(String filename) throws NoSuchAlgorithmException, IOException {
         byte[] b = createChecksum(filename);
         String result = "";
@@ -138 +143 @@
      * @param filename the path of the file
      * @return the checksum as array byte
+     * @throws NoSuchAlgorithmException
+     * @throws IOException
      * @throws Exception
      */
-    private static byte[] createChecksum(String filename) throws Exception {
+    private static byte[] createChecksum(String filename) throws NoSuchAlgorithmException, IOException {
         InputStream fis = new FileInputStream(filename);
 
@@ -185 +192 @@
      * @return true if ok
      */
-    public static boolean checkOk(Document doc) {
+    public static boolean checkOk(Document doc) throws FileAlreadyExistsException {
         if (doc.getRootElement().getAttributeValue("stat").equals("ok")) {
             return true;
@@ -191 +198 @@
             LOG.error("Resultat : " + doc.getRootElement().getAttributeValue("stat") + "\nDocument retourné : \n"
                     + Tools.documentToString(doc));
+            if (doc.getRootElement().getChild("err").getAttributeValue("msg").equals("file already exists")) {
+                throw new FileAlreadyExistsException("The file already exists on the server");
+            }
             return false;
         }