You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/09/29 11:32:27 UTC
[2/2] cayenne git commit: exceptions cleanup
exceptions cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8c7bec0f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8c7bec0f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8c7bec0f
Branch: refs/heads/master
Commit: 8c7bec0f471bdce2d7fb501c622060d63d97e970
Parents: 76ab7c7
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Thu Sep 29 14:32:19 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Thu Sep 29 14:32:19 2016 +0300
----------------------------------------------------------------------
.../XMLDataChannelDescriptorLoader.java | 25 ++++++++++----------
.../ReverseEngineeringLoaderException.java | 3 ++-
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8c7bec0f/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
index 6e71e6a..4539f16 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
@@ -18,18 +18,11 @@
****************************************************************/
package org.apache.cayenne.configuration;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-
+import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.conn.DataSourceInfo;
import org.apache.cayenne.dbimport.DefaultReverseEngineeringLoader;
import org.apache.cayenne.dbimport.ReverseEngineering;
-import org.apache.cayenne.dbimport.ReverseEngineeringLoaderException;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.DataMap;
@@ -37,9 +30,17 @@ import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.util.Util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
-import javax.xml.parsers.ParserConfigurationException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
* @since 3.1
@@ -224,10 +225,8 @@ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoad
reverseEngineering.setConfigurationSource(reverseEngineeringResource);
dataMap.setReverseEngineering(reverseEngineering);
}
- } catch (ReverseEngineeringLoaderException e) {
- logger.info(e.getMessage(), e);
} catch (IOException e) {
- logger.info(e.getMessage(), e);
+ throw new CayenneRuntimeException("Error loading reverse engineering model", e);
}
descriptor.getDataMaps().add(dataMap);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8c7bec0f/cayenne-server/src/main/java/org/apache/cayenne/dbimport/ReverseEngineeringLoaderException.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dbimport/ReverseEngineeringLoaderException.java b/cayenne-server/src/main/java/org/apache/cayenne/dbimport/ReverseEngineeringLoaderException.java
index 01e2cb3..2becf65 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dbimport/ReverseEngineeringLoaderException.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dbimport/ReverseEngineeringLoaderException.java
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.cayenne.dbimport;
+import org.apache.cayenne.CayenneRuntimeException;
import org.xml.sax.SAXException;
import javax.xml.parsers.ParserConfigurationException;
@@ -25,7 +26,7 @@ import javax.xml.parsers.ParserConfigurationException;
/**
* @since 4.0
*/
-public class ReverseEngineeringLoaderException extends RuntimeException {
+public class ReverseEngineeringLoaderException extends CayenneRuntimeException {
public ReverseEngineeringLoaderException(String message, ParserConfigurationException e) {
super(message, e);