Issue #2029, second part of new exceptions design is introduced.

client/src/main/java/com/orientechnologies/orient/client/remote/ORemoteConnectionManager.java

@@ -21,6 +21,7 @@
 
 import com.orientechnologies.common.concur.resource.OResourcePool;
 import com.orientechnologies.common.concur.resource.OResourcePoolListener;
+import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.common.io.OIOException;
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.config.OContextConfiguration;
@@ -176,15 +177,14 @@ public int getAvailableConnections(final String url) {
     return pool.getAvailableResources();
   }
 
-  public int getReusableConnections(final String url){
+  public int getReusableConnections(final String url) {
     final OResourcePool<String, OChannelBinaryAsynchClient> pool = connections.get(url);
     if (pool == null)
       return 0;
 
     return pool.getInPoolResources();
   }
 
-
   public int getCreatedInstancesInPool(final String url) {
     final OResourcePool<String, OChannelBinaryAsynchClient> pool = connections.get(url);
     if (pool == null)
@@ -205,7 +205,7 @@ protected void closePool(final OResourcePool<String, OChannelBinaryAsynchClient>
     final List<OChannelBinaryAsynchClient> conns = new ArrayList<OChannelBinaryAsynchClient>(pool.getAllResources());
     for (OChannelBinaryAsynchClient c : conns)
       try {
-        //Unregister the listener that make the connection return to the closing pool.
+        // Unregister the listener that make the connection return to the closing pool.
         c.unregisterListener(this);
         c.close();
       } catch (Exception e) {
@@ -252,7 +252,7 @@ protected OChannelBinaryAsynchClient createNetworkConnection(String iServerURL,
       throw e;
     } catch (Exception e) {
       OLogManager.instance().debug(this, "Error on connecting to %s", e, iServerURL);
-      throw new OIOException("Error on connecting to " + iServerURL, e);
+      throw OException.wrapException(new OIOException("Error on connecting to " + iServerURL), e);
     }
   }
 }

client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java

@@ -26,6 +26,7 @@
 import java.util.Set;
 
 import com.orientechnologies.common.concur.lock.OModificationOperationProhibitedException;
+import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.Orient;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
@@ -142,7 +143,7 @@ public synchronized Map<String, String> listDatabases() throws IOException {
 
     } catch (Exception e) {
       storage.close(true, false);
-      throw new OStorageException("Cannot retrieve the configuration list", e);
+      throw OException.wrapException(new OStorageException("Cannot retrieve the configuration list"), e);
     }
     return (Map<String, String>) result.field("databases");
   }
@@ -255,7 +256,8 @@ public synchronized boolean existsDatabase(final String iDatabaseName, final Str
 
     } catch (Exception e) {
       storage.close(true, false);
-      throw new OStorageException("Error on checking existence of the remote storage: " + storage.getName(), e);
+      throw OException.wrapException(
+          new OStorageException("Error on checking existence of the remote storage: " + storage.getName()), e);
     }
   }
 
@@ -315,7 +317,7 @@ public synchronized OServerAdmin dropDatabase(final String iDatabaseName, final
       } catch (OModificationOperationProhibitedException oope) {
         retry = handleDBFreeze();
       } catch (Exception e) {
-        throw new OStorageException("Cannot delete the remote storage: " + storage.getName(), e);
+        throw OException.wrapException(new OStorageException("Cannot delete the remote storage: " + storage.getName()), e);
       }
 
     final Set<OStorage> underlyingStorages = new HashSet<OStorage>();
@@ -371,7 +373,7 @@ public synchronized OServerAdmin freezeDatabase(final String storageType) throws
 
       storage.getResponse(network);
     } catch (Exception e) {
-      throw new OStorageException("Cannot freeze the remote storage: " + storage.getName(), e);
+      throw OException.wrapException(new OStorageException("Cannot freeze the remote storage: " + storage.getName()), e);
     }
 
     return this;
@@ -400,7 +402,7 @@ public synchronized OServerAdmin releaseDatabase(final String storageType) throw
 
       storage.getResponse(network);
     } catch (Exception e) {
-      throw new OStorageException("Cannot release the remote storage: " + storage.getName(), e);
+      throw OException.wrapException(new OStorageException("Cannot release the remote storage: " + storage.getName()), e);
     }
 
     return this;
@@ -435,7 +437,8 @@ public synchronized OServerAdmin freezeCluster(final int clusterId, final String
     } catch (IllegalArgumentException e) {
       throw e;
     } catch (Exception e) {
-      throw new OStorageException("Cannot freeze the remote cluster " + clusterId + " on storage: " + storage.getName(), e);
+      throw OException.wrapException(new OStorageException("Cannot freeze the remote cluster " + clusterId + " on storage: "
+          + storage.getName()), e);
     }
 
     return this;
@@ -469,7 +472,8 @@ public synchronized OServerAdmin releaseCluster(final int clusterId, final Strin
     } catch (IllegalArgumentException e) {
       throw e;
     } catch (Exception e) {
-      throw new OStorageException("Cannot release the remote cluster " + clusterId + " on storage: " + storage.getName(), e);
+      throw OException.wrapException(new OStorageException("Cannot release the remote cluster " + clusterId + " on storage: "
+          + storage.getName()), e);
     }
 
     return this;
@@ -520,7 +524,7 @@ public synchronized OServerAdmin copyDatabase(final String databaseName, final S
       OLogManager.instance().debug(this, "Database '%s' has been copied to the server '%s'", databaseName, iRemoteName);
 
     } catch (Exception e) {
-      throw new OStorageException("Cannot copy the database: " + databaseName, e);
+      throw OException.wrapException(new OStorageException("Cannot copy the database: " + databaseName), e);
     }
 
     return this;
@@ -545,7 +549,7 @@ public synchronized Map<String, String> getGlobalConfigurations() throws IOExcep
 
     } catch (Exception e) {
       storage.close(true, false);
-      throw new OStorageException("Cannot retrieve the configuration list", e);
+      throw OException.wrapException(new OStorageException("Cannot retrieve the configuration list"), e);
     }
     return config;
   }
@@ -566,7 +570,7 @@ public synchronized String getGlobalConfiguration(final OGlobalConfiguration con
 
     } catch (Exception e) {
       storage.close(true, false);
-      throw new OStorageException("Cannot retrieve the configuration value: " + config.getKey(), e);
+      throw OException.wrapException(new OStorageException("Cannot retrieve the configuration value: " + config.getKey()), e);
     }
   }
 
@@ -582,7 +586,7 @@ public synchronized OServerAdmin setGlobalConfiguration(final OGlobalConfigurati
 
     } catch (Exception e) {
       storage.close(true, false);
-      throw new OStorageException("Cannot set the configuration value: " + config.getKey(), e);
+      throw OException.wrapException(new OStorageException("Cannot set the configuration value: " + config.getKey()), e);
     }
     return this;
   }
@@ -631,11 +635,11 @@ protected ODocument sendRequest(final byte iRequest, final ODocument iPayLoad, f
       } catch (IOException e) {
         if (network != null)
           storage.getEngine().getConnectionManager().remove(network);
-        throw new OStorageException("Error on executing  '" + iActivity + "'", e);
+        throw OException.wrapException(new OStorageException("Error on executing  '" + iActivity + "'"), e);
       } catch (Exception e2) {
         if (network != null)
           storage.getEngine().getConnectionManager().release(network);
-        throw new OStorageException("Error on executing  '" + iActivity + "'", e2);
+        throw OException.wrapException(new OStorageException("Error on executing  '" + iActivity + "'"), e2);
       }
     }
     return null;

client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java

@@ -259,7 +259,7 @@ public void open(final String iUserName, final String iUserPassword, final Map<S
         // PASS THROUGH
         throw (RuntimeException) e;
       else
-        throw new OStorageException("Cannot open the remote storage: " + name, e);
+        throw OException.wrapException(new OStorageException("Cannot open the remote storage: " + name), e);
 
     } finally {
       stateLock.releaseWriteLock();
@@ -1744,7 +1744,7 @@ protected void handleException(final OChannelBinaryAsynchClient iNetwork, final
     } else if (!(exception instanceof IOException)) {
       if (iNetwork != null)
         engine.getConnectionManager().release(iNetwork);
-      throw new OStorageException(message, exception);
+      throw OException.wrapException(new OStorageException(message), exception);
     }
 
     if (status != STATUS.OPEN)
@@ -1824,7 +1824,7 @@ protected void handleException(final OChannelBinaryAsynchClient iNetwork, final
     }
 
     // RECONNECTION FAILED: THROW+LOG THE ORIGINAL EXCEPTION
-    throw new OStorageException(message, exception);
+    throw OException.wrapException(new OStorageException(message), exception);
   }
 
   protected String reopenRemoteDatabase() {
@@ -2180,7 +2180,7 @@ protected OChannelBinaryAsynchClient getAvailableNetwork(final String iCurrentUR
           parseServerURLs();
           if (cause instanceof IOException)
             throw (IOException) cause;
-          throw new OIOException("Cannot open a connection to remote server: " + iCurrentURL, cause);
+          throw OException.wrapException(new OIOException("Cannot open a connection to remote server: " + iCurrentURL), cause);
         }
       } else if (!network.isConnected()) {
         // DISCONNECTED NETWORK, GET ANOTHER ONE
@@ -2315,7 +2315,7 @@ private void commitEntry(final OChannelBinaryAsynchClient iNetwork, final ORecor
     } catch (Exception e) {
       // ABORT TX COMMIT
       iNetwork.writeByte((byte) -1);
-      throw new OTransactionException("Error on transaction commit", e);
+      throw OException.wrapException(new OTransactionException("Error on transaction commit"), e);
     }
 
     iNetwork.writeByte((byte) 1);

core/src/main/java/com/orientechnologies/common/concur/lock/OAdaptiveLock.java

@@ -20,6 +20,7 @@
 package com.orientechnologies.common.concur.lock;
 
 import com.orientechnologies.common.concur.OTimeoutException;
+import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.common.log.OLogManager;
 
 import java.io.PrintWriter;
@@ -89,8 +90,8 @@ public void lock() {
             }
           }
 
-          throw new OLockException("Thread interrupted while waiting for resource of class '" + getClass() + "' with timeout="
-              + timeout, e);
+          throw OException.wrapException(new OLockException("Thread interrupted while waiting for resource of class '" + getClass()
+              + "' with timeout=" + timeout), e);
         }
 
         throwTimeoutException(lock);
@@ -109,8 +110,8 @@ public boolean tryAcquireLock(final long iTimeout, final TimeUnit iUnit) {
         try {
           return lock.tryLock(iTimeout, iUnit);
         } catch (InterruptedException e) {
-          throw new OLockException("Thread interrupted while waiting for resource of class '" + getClass() + "' with timeout="
-              + timeout, e);
+          throw OException.wrapException(new OLockException("Thread interrupted while waiting for resource of class '" + getClass()
+              + "' with timeout=" + timeout), e);
         }
       else
         return lock.tryLock();

core/src/main/java/com/orientechnologies/common/concur/resource/OResourcePool.java

@@ -31,6 +31,7 @@
 
 import com.orientechnologies.common.concur.lock.OInterruptedException;
 import com.orientechnologies.common.concur.lock.OLockException;
+import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.common.log.OLogManager;
 
 /**
@@ -110,7 +111,7 @@ public V getResource(K key, final long maxWaitMillis, Object... additionalArgs)
     } catch (Exception e) {
       sem.release();
 
-      throw new OLockException("Error on creation of the new resource in the pool", e);
+      throw OException.wrapException(new OLockException("Error on creation of the new resource in the pool"), e);
     }
   }
 

core/src/main/java/com/orientechnologies/common/exception/OException.java

@@ -35,18 +35,4 @@ public static OException wrapException(OException exception, Exception cause) {
   public OException(final String message) {
     super(message);
   }
-
-  @Override
-  public boolean equals(final Object obj) {
-    if (obj == null || !obj.getClass().equals(getClass()))
-      return false;
-
-    final String myMsg = getMessage();
-    final String otherMsg = ((OException) obj).getMessage();
-    if (myMsg == null || otherMsg == null)
-      // UNKNOWN
-      return false;
-
-    return myMsg.equals(otherMsg);
-  }
 }

core/src/main/java/com/orientechnologies/common/parser/OStringForwardReader.java

@@ -19,6 +19,7 @@
   */
 package com.orientechnologies.common.parser;
 
+import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.common.io.OIOException;
 
 import java.io.BufferedReader;
@@ -83,7 +84,7 @@ private void read(final int iIndex) {
 			end = start + byteRead;
 			current = start;
 		} catch (IOException e) {
-			throw new OIOException("Error in read", e);
+      throw OException.wrapException(new OIOException("Error in read"), e);
 		}
 	}
 
@@ -99,7 +100,7 @@ public boolean ready() {
 		try {
 			return current < end || input.ready();
 		} catch (IOException e) {
-			throw new OIOException("Error in ready", e);
+      throw OException.wrapException(new OIOException("Error in ready"), e);
 		}
 	}
 

core/src/main/java/com/orientechnologies/common/util/MersenneTwister.java

@@ -230,7 +230,7 @@ public Object clone() {
       f.mag01 = (int[]) (mag01.clone());
       return f;
     } catch (CloneNotSupportedException e) {
-      throw new OSystemException("Can not clone instance of " + MersenneTwister.class.getSimpleName(), e);
+      throw OException.wrapException(new OSystemException("Can not clone instance of " + MersenneTwister.class.getSimpleName()), e);
     } // should never happen
   }
 

core/src/main/java/com/orientechnologies/common/util/MersenneTwisterFast.java

@@ -222,7 +222,8 @@ public Object clone() {
       f.mag01 = (int[]) (mag01.clone());
       return f;
     } catch (CloneNotSupportedException e) {
-      throw new OSystemException("Can not clone " + MersenneTwisterFast.class.getSimpleName() + " instance", e);
+      throw OException.wrapException(new OSystemException("Can not clone " + MersenneTwisterFast.class.getSimpleName()
+          + " instance"), e);
     } // should never happen
   }
 

core/src/main/java/com/orientechnologies/common/util/OClassLoaderHelper.java

@@ -23,6 +23,7 @@
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
+import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.exception.OConfigurationException;
 
@@ -50,7 +51,7 @@ public static synchronized <T extends Object> Iterator<T> lookupProviderWithOrie
       return ServiceLoader.load(clazz).iterator();
     } catch (Exception e) {
       OLogManager.instance().warn(null, "Cannot lookup in service registry", e);
-      throw new OConfigurationException("Cannot lookup in service registry", e);
+      throw OException.wrapException(new OConfigurationException("Cannot lookup in service registry"), e);
     } finally {
       Thread.currentThread().setContextClassLoader(origClassLoader);
     }

core/src/main/java/com/orientechnologies/orient/core/command/OCommandManager.java

@@ -19,6 +19,7 @@
  */
 package com.orientechnologies.orient.core.command;
 
+import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.common.util.OCallable;
 import com.orientechnologies.orient.core.command.script.OCommandExecutorScript;
 import com.orientechnologies.orient.core.command.script.OCommandScript;
@@ -112,8 +113,8 @@ public OCommandExecutor getExecutor(OCommandRequestInternal iCommand) {
       return exec;
 
     } catch (Exception e) {
-      throw new OCommandExecutionException("Cannot create the command executor of class " + executorClass
-          + " for the command request: " + iCommand, e);
+      throw OException.wrapException(new OCommandExecutionException("Cannot create the command executor of class " + executorClass
+          + " for the command request: " + iCommand), e);
     }
   }
 }

core/src/main/java/com/orientechnologies/orient/core/command/script/OCommandExecutorFunction.java

@@ -20,6 +20,7 @@
 package com.orientechnologies.orient.core.command.script;
 
 import com.orientechnologies.common.concur.resource.OPartitionedObjectPool;
+import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.common.util.OCommonConst;
 import com.orientechnologies.orient.core.Orient;
 import com.orientechnologies.orient.core.command.OCommandContext;
@@ -89,7 +90,7 @@ public Object executeInContext(final OCommandContext iContext, final Map<Object,
             for (Entry<Object, Object> arg : iArgs.entrySet())
               args[i++] = arg.getValue();
           } else {
-        	  args = OCommonConst.EMPTY_OBJECT_ARRAY;
+            args = OCommonConst.EMPTY_OBJECT_ARRAY;
           }
           result = invocableEngine.invokeFunction(parserText, args);
 
@@ -102,9 +103,10 @@ public Object executeInContext(final OCommandContext iContext, final Map<Object,
         return OCommandExecutorUtility.transformResult(result);
 
       } catch (ScriptException e) {
-        throw new OCommandScriptException("Error on execution of the script", request.getText(), e.getColumnNumber(), e);
+        throw OException.wrapException(
+            new OCommandScriptException("Error on execution of the script", request.getText(), e.getColumnNumber()), e);
       } catch (NoSuchMethodException e) {
-        throw new OCommandScriptException("Error on execution of the script", request.getText(), 0, e);
+        throw OException.wrapException(new OCommandScriptException("Error on execution of the script", request.getText(), 0), e);
       } catch (OCommandScriptException e) {
         // PASS THROUGH
         throw e;