r444 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/importexport wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr - Wikitty-commits

21 Oct 2010

Author: bpoussin
Date: 2010-10-21 16:32:50 +0200 (Thu, 21 Oct 2010)
New Revision: 444

Url: http://nuiton.org/repositories/revision/wikitty/444

Log:
remove all usage of deprecated WikittyException(Throwable)
http://www.nuiton.org/issues/show/965

Modified:
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java
   trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java
   trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java
   trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java
   trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java
===================================================================

--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -116,7 +116,8 @@
             ImportTask task = new ImportTask(securityToken, ws, format, reader);
             task.run();
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't import in format %s uri %s", format, uri), eee);
         }
     }
 
@@ -132,7 +133,8 @@
             importExportTask.put(jobId, future);
             return jobId;
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't import in format %s uri %s", format, uri), eee);
         }
     }
 
@@ -184,7 +186,8 @@
             importExportTask.put(jobId, future);
             return jobId;
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't export in format %s", format), eee);
         }
     }
 
@@ -223,7 +226,8 @@
             }
             return result;
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't retrieve job info for job %s", jobId), eee);
         }
     }
 

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -179,8 +179,10 @@
             }
             result = WikittyUtil.newInstance(
                     securityToken, wikittyService, clazz, wikitty);
+        } catch (SecurityException eee) {
+            throw eee;
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't restore wikitty", eee);
         }
         if (checkExtension) {
             // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl
@@ -477,8 +479,10 @@
                 }
                 businessEntity = WikittyUtil.newInstance(
                         securityToken, wikittyService, clazz, wikitty);
+            } catch (SecurityException eee) {
+                throw eee;
             } catch (Exception eee) {
-                throw new WikittyException(eee);
+                throw new WikittyException("Can't restore children", eee);
             }
 
             boolean goodType = true;
@@ -526,8 +530,11 @@
             extNames = new HashSet<String>(wikitty.getExtensionNames());
             result = WikittyUtil.newInstance(
                     securityToken, wikittyService, clazz, wikitty);
+        } catch (SecurityException eee) {
+            throw eee;
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(
+                    "Can't retrieve wikitty needed for hasType test", eee);
         }
         // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl
         BusinessEntityWikitty b = (BusinessEntityWikitty)result;

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -207,7 +207,7 @@
                 throw ex;
             } catch (Exception eee) {
                 transaction.rollback();
-                throw new WikittyException(eee);
+                throw new WikittyException("Can't store wikitty", eee);
             }
         } else {
             throw new WikittyException("You can't store null wikitty object");
@@ -235,7 +235,7 @@
             throw ex;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't store wikitty", eee);
         }
     }
 
@@ -263,7 +263,7 @@
             throw ex;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't store wikitty", eee);
         }
     }
 
@@ -279,7 +279,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't retrieve all extension's ids", eee);
         }
     }
 
@@ -297,7 +297,8 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't retrieve all required extension for %s", extensionName), eee);
         }
     }
 
@@ -327,7 +328,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't store extensions", eee);
         }
     }
 
@@ -344,7 +345,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't store extension", eee);
         }
     }
 
@@ -378,7 +379,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("can't restore extensions", eee);
         }
 
     }
@@ -408,7 +409,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't restore extension", eee);
         }
     }
 
@@ -461,7 +462,7 @@
                 log.error("Can't restore wikitty collection", eee);
             }
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't restore wikitty", eee);
         }
     }
 
@@ -477,7 +478,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't restore wikitty", eee);
         }
     }
 
@@ -609,7 +610,7 @@
             transaction.commit();
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't delete wikitty", eee);
         }
     }
 
@@ -624,7 +625,7 @@
             transaction.commit();
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't delete wikitty", eee);
         }
     }
 
@@ -645,7 +646,7 @@
             transaction.commit();
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't clear all data", eee);
         }
     }
 
@@ -675,7 +676,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Error during find", eee);
         }
     }
 
@@ -707,7 +708,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Error during find", eee);
         }
     }
         
@@ -753,7 +754,7 @@
             return tree;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't restore tree", eee);
         }
     }
 
@@ -769,7 +770,7 @@
             transaction.commit();
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't delete tree", eee);
         }
         
         return deletedIds;
@@ -842,7 +843,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't restore node", eee);
         }
     }
 
@@ -884,7 +885,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't restore children", eee);
         }
     }
 
@@ -941,7 +942,7 @@
             return result;
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't sync searchable index with data", eee);
         }
     }
 

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -643,7 +643,8 @@
             return result;
 
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't create new instance of %s", clazz), eee);
         }
     }
 
@@ -708,7 +709,8 @@
 
             return result;
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't create new instance of %s", clazz), eee);
         }
     }
 

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -87,7 +87,7 @@
             transaction.commit();
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Error during export task", eee);
         }
     }
 }

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -78,7 +78,7 @@
             transaction.commit();
         } catch (Exception eee) {
             transaction.rollback();
-            throw new WikittyException(eee);
+            throw new WikittyException("Error during import task", eee);
         }
     }
 }

Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java
===================================================================
--- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -119,7 +119,7 @@
                 commitJDBCConnection(connection);
             } catch (SQLException eee) {
                 rollbackJDBCConnection(connection);
-                throw new WikittyException(eee);
+                throw new WikittyException("Can't create table for extension storage", eee);
             } finally {
                 WikittyJDBCUtil.closeQuietly(connection);
             }
@@ -171,7 +171,7 @@
             UpdateResponse result = new UpdateResponse();
             return result;
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't store extension", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -191,7 +191,7 @@
             boolean result = resultSet.next();
             return result;
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't test extension existance",eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -214,7 +214,7 @@
             }
             return result;
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't retrieve all extensions id", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -240,7 +240,8 @@
             
             return result;
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't retrieve all extensions required by %s", extensionName), eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -277,7 +278,7 @@
                 }
                 lastVersion = tmp;
             } catch (SQLException eee) {
-                throw new WikittyException(eee);
+                throw new WikittyException("Can't get last version of extensions", eee);
             } finally {
                 WikittyJDBCUtil.closeQuietly(connection);
             }
@@ -353,7 +354,7 @@
             doQuery(connection, conf.getProperty(QUERY_CLEAR_EXTENSION));
 
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't clear all extension", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }

Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java
===================================================================
--- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -295,7 +295,9 @@
             return connection;
             
         } catch(Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(String.format(
+                    "Can't connect to database %s %s with login %s",
+                    JDBC_DRIVER, JDBC_HOST, JDBC_USER_NAME), eee);
         }
     }
 
@@ -324,7 +326,8 @@
             connection.setAutoCommit(false);
             return connection;
         } catch(SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException(
+                    "Can't set connection auto commit to false", eee);
         }
     }
 
@@ -337,12 +340,12 @@
         try {
             connection.commit();
         } catch(SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't commit transaction", eee);
         } finally {
             try {
                 connection.close();
             }  catch(SQLException eee) {
-                throw new WikittyException(eee);
+                throw new WikittyException("Can't close connection", eee);
             }
         }
     }
@@ -356,12 +359,12 @@
         try {
             connection.rollback();
         } catch(SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't rollback transaction", eee);
         } finally {
             try {
                 connection.close();
             }  catch(SQLException eee) {
-                throw new WikittyException(eee);
+                throw new WikittyException("Can't close connection", eee);
             }
         }
     }

Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java
===================================================================
--- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -137,7 +137,7 @@
                 commitJDBCConnection(connection);
             } catch (SQLException eee) {
                 rollbackJDBCConnection(connection);
-                throw new WikittyException(eee);
+                throw new WikittyException("Can't create table for wikitty storage", eee);
             } finally {
                 WikittyJDBCUtil.closeQuietly(connection);
             }
@@ -294,7 +294,7 @@
 
             return result;
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't store wikitty", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -314,7 +314,7 @@
             boolean result = resultSet.next();
             return result;
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't test wikitty existance", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -339,7 +339,7 @@
                             "Wikitty with id '%s' doesn't exists", id));
             }
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't test if wikitty is already deleted", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -407,7 +407,7 @@
 
             return result;
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't delete wikitty", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -431,7 +431,7 @@
                 scanner.scan(id);
             }
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't scan wall wikitty", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }
@@ -564,7 +564,7 @@
             doQuery(connection, conf.getProperty(QUERY_CLEAR_WIKITTY));
 
         } catch (SQLException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't clear wikitty data", eee);
         } finally {
             WikittyJDBCUtil.closeQuietly(connection);
         }

Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java
===================================================================
--- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java	2010-10-21 10:47:18 UTC (rev 443)
+++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java	2010-10-21 14:32:50 UTC (rev 444)
@@ -515,7 +515,7 @@
             solrResource = new SolrResource(solrServer);
             
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("SolR initialization error", eee);
         }
     }
 
@@ -526,7 +526,7 @@
             solrResource.init();
             solrServer.deleteByQuery("*:*");
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Error during clearing SolR data", eee);
         }
     }
 
@@ -581,7 +581,7 @@
             return result;
             
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't store wikitty", eee);
         }
     }
 
@@ -615,7 +615,7 @@
             return result;
             
         } catch (Exception eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Can't delete wikitty in index", eee);
         }
     }
 
@@ -626,8 +626,8 @@
                 solrServer.deleteById(id);
             }
             solrServer.commit();
-        } catch (Exception e) {
-            throw new WikittyException(e);
+        } catch (Exception eee) {
+            throw new WikittyException("Can't delete wikitty in index", eee);
         }
     }
     
@@ -750,8 +750,8 @@
                     firstIndex, numFound, queryString, facets, ids);
 
             return result;
-        } catch (SolrServerException e) {
-            throw new WikittyException(e);
+        } catch (SolrServerException eee) {
+            throw new WikittyException("Error during find", eee);
         }
     }
 
@@ -904,7 +904,7 @@
         try {
             response = solrServer.query(query);
         } catch (SolrServerException eee) {
-            throw new WikittyException(eee);
+            throw new WikittyException("Error during find", eee);
         }
 
         SolrDocumentList results = response.getResults();

    

r444 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/importexport wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr

bpoussin＠users.nuiton.org

tags

participants (1)