Changeset 9430 for extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao

Timestamp:

Feb 28, 2011, 7:40:53 PM (13 years ago)

Author:

mlg

Message:

Modifications to handle proxy error.
Two types of error are handled : proxy address error and proxy authentication error.
Connecting to jiwigo via a proxy seems to work (tried with my own server... gonna have to try with an external server).
version is 0.13.1.1

Location:

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

Files:

• CategoryDao.java (modified) (3 diffs)
• CommentDao.java (modified) (4 diffs)
• ImageDao.java (modified) (5 diffs)
• TagDao.java (modified) (4 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.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
 import fr.mael.jiwigo.transverse.util.Tools;
@@ -81 +82 @@
      * @return the list of categories
      * @throws IOException
+     * @throws ProxyAuthenticationException
      */
-    public List<Category> list(boolean recursive) throws IOException {
+    public List<Category> list(boolean recursive) throws IOException, ProxyAuthenticationException {
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.LISTER_CATEGORIES.getLabel(), "recursive",
                 String.valueOf(recursive));
@@ -112 +114 @@
      * @param category the category to create
      * @return true if the category is successfully created
+     * @throws ProxyAuthenticationException
      */
-    public boolean create(Category category) {
+    public boolean create(Category category) throws ProxyAuthenticationException {
         try {
             if (category.getDirectParent() != null) {

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.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
 import fr.mael.jiwigo.transverse.util.Tools;
@@ -80 +81 @@
      * @return list of comments
      * @throws IOException
+     * @throws ProxyAuthenticationException
      */
-    public List<Comment> list(Integer idImage) throws IOException {
+    public List<Comment> list(Integer idImage) throws IOException, ProxyAuthenticationException {
         Document doc = (sessionManager.executeReturnDocument(MethodsEnum.GET_INFO.getLabel(), "image_id", String
-                .valueOf(idImage)));
+                .valueOf(idImage), "comments_per_page", "100"));
         Element element = doc.getRootElement().getChild("image").getChild("comments");
         List<Element> listElement = (List<Element>) element.getChildren("comment");
@@ -103 +105 @@
      * @return the key
      * @throws IOException
+     * @throws ProxyAuthenticationException
      */
-    public String getKey(Integer idImage) throws IOException {
+    public String getKey(Integer idImage) throws IOException, ProxyAuthenticationException {
         Document doc = (sessionManager.executeReturnDocument(MethodsEnum.GET_INFO.getLabel(), "image_id", String
                 .valueOf(idImage)));
@@ -116 +119 @@
      * @return true if the comment is successfully added
      * @throws IOException
+     * @throws ProxyAuthenticationException
      */
-    public boolean create(Comment commentaire) throws IOException {
+    public boolean create(Comment commentaire) throws IOException, ProxyAuthenticationException {
         String key = getKey(commentaire.getImageId());
         try {

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

@@ -13 +13 @@
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
+import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.exception.WrongChunkSizeException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
@@ -98 +99 @@
      * @return the list of images
      * @throws IOException
-     */
-    public List<Image> list(boolean refresh) throws IOException {
+     * @throws ProxyAuthenticationException
+     */
+    public List<Image> list(boolean refresh) throws IOException, ProxyAuthenticationException {
         return listByCategory(null, refresh);
     }
@@ -108 +110 @@
      * @return the list of images
      * @throws IOException
-     */
-    public List<Image> listByCategory(Integer categoryId, boolean refresh) throws IOException {
+     * @throws ProxyAuthenticationException
+     */
+    public List<Image> listByCategory(Integer categoryId, boolean refresh) throws IOException,
+            ProxyAuthenticationException {
         if (refresh || cache.get(categoryId) == null) {
             Document doc = null;
@@ -207 +211 @@
      * @param tagId ids of the tags
      * @throws IOException
-     */
-    public boolean addTags(Integer imageId, String tagId) throws IOException {
+     * @throws ProxyAuthenticationException
+     */
+    public boolean addTags(Integer imageId, String tagId) throws IOException, ProxyAuthenticationException {
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.SET_INFO.getLabel(), "image_id", String
                 .valueOf(imageId), "tag_ids", tagId);
@@ -248 +253 @@
      * @return the list of images matching the string
      * @throws IOException
-     */
-    public List<Image> search(String searchString) throws IOException {
+     * @throws ProxyAuthenticationException
+     */
+    public List<Image> search(String searchString) throws IOException, ProxyAuthenticationException {
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.SEARCH.getLabel(), "query", searchString);
         LOG.debug(doc);

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.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
 import fr.mael.jiwigo.transverse.util.Tools;
@@ -53 +54 @@
      * @return the list of tags
      * @throws IOException
+     * @throws ProxyAuthenticationException
      */
-    public List<Tag> list() throws IOException {
+    public List<Tag> list() throws IOException, ProxyAuthenticationException {
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.TAGS_ADMIN_LIST.getLabel());
         //      System.out.println(Outil.documentToString(doc));
@@ -84 +86 @@
      * @param tag the tag to create
      * @return true if the tag as been successfully created
+     * @throws ProxyAuthenticationException
      */
-    public boolean create(Tag tag) {
+    public boolean create(Tag tag) throws ProxyAuthenticationException {
         try {
             return Tools.checkOk(sessionManager.executeReturnDocument(MethodsEnum.ADD_TAG.getLabel(), "name", tag
@@ -100 +103 @@
      * @return the tags list
      * @throws IOException
+     * @throws ProxyAuthenticationException
      */
-    public List<Tag> tagsForImage(Image image) throws IOException {
+    public List<Tag> tagsForImage(Image image) throws IOException, ProxyAuthenticationException {
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.GET_INFO.getLabel(), "image_id", String
                 .valueOf(image.getIdentifier()));