You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openaz.apache.org by co...@apache.org on 2015/07/13 18:25:13 UTC
[1/2] incubator-openaz git commit: Avoid throwing raw Exceptions
Repository: incubator-openaz
Updated Branches:
refs/heads/master 7fc92f796 -> 9a7edafa8
Avoid throwing raw Exceptions
Project: http://git-wip-us.apache.org/repos/asf/incubator-openaz/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-openaz/commit/90a0f551
Tree: http://git-wip-us.apache.org/repos/asf/incubator-openaz/tree/90a0f551
Diff: http://git-wip-us.apache.org/repos/asf/incubator-openaz/diff/90a0f551
Branch: refs/heads/master
Commit: 90a0f551a36c4d5b0704060562678f8633aa4b4b
Parents: 7fc92f7
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jul 13 17:21:41 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jul 13 17:21:41 2015 +0100
----------------------------------------------------------------------
.../org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java | 6 +++---
.../main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java | 4 ++--
.../main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java | 4 ++--
.../src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/90a0f551/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java
index 8193d2c..19254b5 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/dom/DOMPolicyDef.java
@@ -55,7 +55,7 @@ public abstract class DOMPolicyDef {
try {
Node rootNode = DOMUtil.getFirstChildElement(document);
if (rootNode == null) {
- throw new Exception("No child in document");
+ throw new DOMStructureException("No child in document");
}
if (DOMUtil.isInNamespace(rootNode, XACML3.XMLNS)) {
@@ -86,7 +86,7 @@ public abstract class DOMPolicyDef {
try {
Document document = DOMUtil.loadDocument(inputStream);
if (document == null) {
- throw new Exception("Null document returned");
+ throw new DOMStructureException("Null document returned");
}
policyDef = newInstance(document, null);
} catch (Exception ex) {
@@ -112,7 +112,7 @@ public abstract class DOMPolicyDef {
try {
Document document = DOMUtil.loadDocument(filePolicy);
if (document == null) {
- throw new Exception("Null document returned");
+ throw new DOMStructureException("Null document returned");
}
policyDef = newInstance(document, null);
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/90a0f551/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java
index f61db06..767fc64 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMRequest.java
@@ -108,12 +108,12 @@ public class DOMRequest {
try {
Document document = DOMUtil.loadDocument(is);
if (document == null) {
- throw new Exception("Null document returned");
+ throw new DOMStructureException("Null document returned");
}
Node rootNode = DOMUtil.getFirstChildElement(document);
if (rootNode == null) {
- throw new Exception("No child in document");
+ throw new DOMStructureException("No child in document");
}
if (DOMUtil.isInNamespace(rootNode, XACML3.XMLNS)) {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/90a0f551/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
index fcca867..442a898 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
@@ -226,12 +226,12 @@ public class DOMResponse {
try {
Document document = DOMUtil.loadDocument(is);
if (document == null) {
- throw new Exception("Null document returned");
+ throw new DOMStructureException("Null document returned");
}
Node rootNode = DOMUtil.getFirstChildElement(document);
if (rootNode == null) {
- throw new Exception("No child in document");
+ throw new DOMStructureException("No child in document");
}
if (DOMUtil.isInNamespace(rootNode, XACML3.XMLNS)) {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/90a0f551/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
index f7f8b1b..cd8b0db 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
@@ -740,7 +740,7 @@ public class DOMUtil {
try {
document = documentBuilder.parse(fileDocument);
if (document == null) {
- throw new Exception("Null document returned");
+ throw new DOMStructureException("Null document returned");
}
} catch (Exception ex) {
throw new DOMStructureException("Exception loading file \"" + fileDocument.getAbsolutePath()
@@ -777,7 +777,7 @@ public class DOMUtil {
try {
document = documentBuilder.parse(inputStreamDocument);
if (document == null) {
- throw new Exception("Null document returned");
+ throw new DOMStructureException("Null document returned");
}
} catch (Exception ex) {
throw new DOMStructureException("Exception loading file from stream: " + ex.getMessage(), ex);
[2/2] incubator-openaz git commit: Rationalise some of the
DocumentBuilder calls in DOMUtil
Posted by co...@apache.org.
Rationalise some of the DocumentBuilder calls in DOMUtil
Project: http://git-wip-us.apache.org/repos/asf/incubator-openaz/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-openaz/commit/9a7edafa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-openaz/tree/9a7edafa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-openaz/diff/9a7edafa
Branch: refs/heads/master
Commit: 9a7edafa869a8641bb4646cbc34fcef4026cdbe1
Parents: 90a0f55
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jul 13 17:24:57 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jul 13 17:24:57 2015 +0100
----------------------------------------------------------------------
.../apache/openaz/xacml/std/dom/DOMUtil.java | 34 ++++++--------------
1 file changed, 9 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/9a7edafa/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
index cd8b0db..adb3d3e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
@@ -86,9 +86,7 @@ public class DOMUtil {
public static Node getDirectDocumentChild(Node node) throws DOMStructureException {
Node nodeResult = null;
try {
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware(true);
- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+ DocumentBuilder documentBuilder = getDocumentBuilder();
Document documentRoot = documentBuilder.newDocument();
Node nodeTopRoot = documentRoot.importNode(node, true);
documentRoot.appendChild(nodeTopRoot);
@@ -712,8 +710,8 @@ public class DOMUtil {
}
return false;
}
-
- public static Document loadDocument(File fileDocument) throws DOMStructureException {
+
+ public static DocumentBuilder getDocumentBuilder() throws DOMStructureException {
/*
* Get the DocumentBuilderFactory
*/
@@ -726,12 +724,15 @@ public class DOMUtil {
/*
* Get the DocumentBuilder
*/
- DocumentBuilder documentBuilder = null;
try {
- documentBuilder = documentBuilderFactory.newDocumentBuilder();
+ return documentBuilderFactory.newDocumentBuilder();
} catch (Exception ex) {
throw new DOMStructureException("Exception creating DocumentBuilder: " + ex.getMessage(), ex);
}
+ }
+
+ public static Document loadDocument(File fileDocument) throws DOMStructureException {
+ DocumentBuilder documentBuilder = getDocumentBuilder();
/*
* Parse the XML file
@@ -751,24 +752,7 @@ public class DOMUtil {
}
public static Document loadDocument(InputStream inputStreamDocument) throws DOMStructureException {
- /*
- * Get the DocumentBuilderFactory
- */
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- if (documentBuilderFactory == null) {
- throw new DOMStructureException("No XML DocumentBuilderFactory configured");
- }
- documentBuilderFactory.setNamespaceAware(true);
-
- /*
- * Get the DocumentBuilder
- */
- DocumentBuilder documentBuilder = null;
- try {
- documentBuilder = documentBuilderFactory.newDocumentBuilder();
- } catch (Exception ex) {
- throw new DOMStructureException("Exception creating DocumentBuilder: " + ex.getMessage(), ex);
- }
+ DocumentBuilder documentBuilder = getDocumentBuilder();
/*
* Parse the XML file