Author: richard.opalka(a)jboss.com
Date: 2007-09-14 06:03:04 -0400 (Fri, 14 Sep 2007)
New Revision: 4561
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/AssertionDeployer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/WSSecurityAssertionDeployer.java
Log:
fixing Java coding convention (for Exceptions) + small generic improvements
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-09-14
10:01:36 UTC (rev 4560)
+++
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-09-14
10:03:04 UTC (rev 4561)
@@ -36,9 +36,9 @@
import org.jboss.ws.extensions.policy.deployer.domainAssertion.AssertionDeployer;
import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer;
import
org.jboss.ws.extensions.policy.deployer.domainAssertion.WSSecurityAssertionDeployer;
-import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAlternative;
-import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertion;
-import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy;
+import
org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAlternativeException;
+import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertionException;
+import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicyException;
import org.jboss.ws.metadata.umdm.ExtensibleMetaData;
/**
@@ -50,12 +50,14 @@
{
private final static Logger log = Logger.getLogger(PolicyDeployer.class);
private static PolicyDeployer me;
- private Map<String, Class> domainDeployerMap = new HashMap<String,
Class>();
+ private Map<String, Class<? extends AssertionDeployer>> domainDeployerMap
= new HashMap<String, Class<? extends AssertionDeployer>>();
static
{
me = new PolicyDeployer();
me.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jb...;,
WSSecurityAssertionDeployer.class);
+
me.domainDeployerMap.put("http://schemas.xmlsoap.org/ws/2005/02/rm/p...;,
NopAssertionDeployer.class);
+
me.domainDeployerMap.put("http://docs.oasis-open.org/ws-rx/wsrmp/200...;,
NopAssertionDeployer.class);
}
//hide constructor
@@ -69,7 +71,7 @@
}
//for test
- public static PolicyDeployer newInstance(Map<String, Class> customDomainMap)
+ public static PolicyDeployer newInstance(Map<String, Class<? extends
AssertionDeployer>> customDomainMap)
{
PolicyDeployer instance = new PolicyDeployer();
instance.domainDeployerMap = customDomainMap;
@@ -82,12 +84,14 @@
{
PolicyDeployer instance = new PolicyDeployer();
instance.domainDeployerMap.put("http://www.jboss.com/ws-security/sch...;,
NopAssertionDeployer.class);
+
instance.domainDeployerMap.put("http://schemas.xmlsoap.org/ws/2005/0...;,
NopAssertionDeployer.class);
+
instance.domainDeployerMap.put("http://docs.oasis-open.org/ws-rx/wsr...;,
NopAssertionDeployer.class);
return instance;
}
@SuppressWarnings("unchecked")
- public Policy deployServerside(Policy policy, ExtensibleMetaData extMetaData) throws
UnsupportedPolicy
+ public Policy deployServerside(Policy policy, ExtensibleMetaData extMetaData) throws
UnsupportedPolicyException
{
if (policy == null)
throw new WSException("Cannot deploy null policy!");
@@ -111,7 +115,7 @@
deployAlternativeServerSide(alternative, extMetaData);
returnedPolicyTerms.add(alternative);
}
- catch (UnsupportedAlternative e)
+ catch (UnsupportedAlternativeException e)
{
log.debug("Unsupported Alternative");
//policy is unsupported only if it have all alternative unsupported
@@ -124,7 +128,7 @@
{
log.debug("XorComposite zero element...Policy not supported");
}
- throw new UnsupportedPolicy();
+ throw new UnsupportedPolicyException();
}
policy.getTerms().clear();
policy.addTerms(returnedPolicyTerms);
@@ -137,10 +141,10 @@
*
* @param policy
* @param extMetaData
- * @throws UnsupportedPolicy
+ * @throws UnsupportedPolicyException
*/
@SuppressWarnings("unchecked")
- public void deployClientSide(Policy policy, ExtensibleMetaData extMetaData) throws
UnsupportedPolicy
+ public void deployClientSide(Policy policy, ExtensibleMetaData extMetaData) throws
UnsupportedPolicyException
{
if (policy == null)
throw new WSException("Cannot deploy null policy!");
@@ -161,10 +165,10 @@
{
deployAssertionClientSide((PrimitiveAssertion)assertion, extMetaData);
}
- catch (UnsupportedAssertion e)
+ catch (UnsupportedAssertionException e)
{
log.error("Unsupported assertion!");
- throw new UnsupportedPolicy();
+ throw new UnsupportedPolicyException();
}
}
else if (assertion instanceof Policy) //inner policy to be verified
@@ -176,7 +180,7 @@
}
@SuppressWarnings("unchecked")
- private void deployAlternativeServerSide(AndCompositeAssertion alternative,
ExtensibleMetaData extMetaData) throws UnsupportedAlternative
+ private void deployAlternativeServerSide(AndCompositeAssertion alternative,
ExtensibleMetaData extMetaData) throws UnsupportedAlternativeException
{
for (Assertion assertion : (List<Assertion>)alternative.getTerms())
{
@@ -197,41 +201,41 @@
{
log.debug("Unknown Alternative type....Alternative not
supported");
}
- throw new UnsupportedAlternative();
+ throw new UnsupportedAlternativeException();
}
}
- catch (UnsupportedAssertion e)
+ catch (UnsupportedAssertionException e)
{
//If there is al least one unsupported assertion the alternative isn't
supported
- throw new UnsupportedAlternative();
+ throw new UnsupportedAlternativeException();
}
- catch (UnsupportedPolicy ep)
+ catch (UnsupportedPolicyException ep)
{
//If there is al least one unsupported assertion the alternative isn't
supported
- throw new UnsupportedAlternative();
+ throw new UnsupportedAlternativeException();
}
}
}
- private void deployAssertionServerSide(PrimitiveAssertion assertion,
ExtensibleMetaData extMetaData) throws UnsupportedAssertion
+ private void deployAssertionServerSide(PrimitiveAssertion assertion,
ExtensibleMetaData extMetaData) throws UnsupportedAssertionException
{
AssertionDeployer deployer =
getDomainDeployerInstance(assertion.getName().getNamespaceURI());
deployer.deployServerSide(assertion, extMetaData);
}
- private void deployAssertionClientSide(PrimitiveAssertion assertion,
ExtensibleMetaData extMetaData) throws UnsupportedAssertion
+ private void deployAssertionClientSide(PrimitiveAssertion assertion,
ExtensibleMetaData extMetaData) throws UnsupportedAssertionException
{
AssertionDeployer deployer =
getDomainDeployerInstance(assertion.getName().getNamespaceURI());
deployer.deployClientSide(assertion, extMetaData);
}
/**
- *
- * @param namespace
- * @return the correct AssertionDeployer instance, or null if namespace not supported
+ * @param namespace to be used to get the associated assertion deployer
+ * @return AssertionDeployer instance
+ * @throws UnsupportedAssertionException
*/
- private AssertionDeployer getDomainDeployerInstance(String namespace) throws
UnsupportedAssertion
+ private AssertionDeployer getDomainDeployerInstance(String namespace) throws
UnsupportedAssertionException
{
try
{
@@ -239,16 +243,15 @@
{
if (log.isDebugEnabled())
{
- log.debug("Unknown namespace:" + namespace + "...Assertion
not supported");
+ log.debug("Unknown namespace: '" + namespace + "' -
Assertion not supported");
}
- throw new UnsupportedAssertion();
+ throw new UnsupportedAssertionException();
}
- return (AssertionDeployer)(domainDeployerMap.get(namespace)).newInstance();
+ return domainDeployerMap.get(namespace).newInstance();
}
catch (Exception e)
{
-
- throw new UnsupportedAssertion();
+ throw new UnsupportedAssertionException();
}
}
}
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/AssertionDeployer.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/AssertionDeployer.java 2007-09-14
10:01:36 UTC (rev 4560)
+++
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/AssertionDeployer.java 2007-09-14
10:03:04 UTC (rev 4561)
@@ -22,7 +22,7 @@
package org.jboss.ws.extensions.policy.deployer.domainAssertion;
import org.apache.ws.policy.PrimitiveAssertion;
-import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertion;
+import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertionException;
import org.jboss.ws.metadata.umdm.ExtensibleMetaData;
/**
@@ -40,9 +40,9 @@
*
* @param assertion
* @param extMetaData
- * @throws UnsupportedAssertion
+ * @throws UnsupportedAssertionException
*/
- public void deployServerSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertion;
+ public void deployServerSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertionException;
/**
* Client side deployment method; ExtensibleMetaData provided so
@@ -50,7 +50,7 @@
*
* @param assertion
* @param extMetaData
- * @throws UnsupportedAssertion
+ * @throws UnsupportedAssertionException
*/
- public void deployClientSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertion;
+ public void deployClientSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertionException;
}
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java 2007-09-14
10:01:36 UTC (rev 4560)
+++
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java 2007-09-14
10:03:04 UTC (rev 4561)
@@ -22,7 +22,7 @@
package org.jboss.ws.extensions.policy.deployer.domainAssertion;
import org.apache.ws.policy.PrimitiveAssertion;
-import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertion;
+import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertionException;
import org.jboss.ws.metadata.umdm.ExtensibleMetaData;
/**
@@ -41,12 +41,12 @@
public class NopAssertionDeployer implements AssertionDeployer
{
- public void deployClientSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertion
+ public void deployClientSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertionException
{
//nop
}
- public void deployServerSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertion
+ public void deployServerSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertionException
{
//nop
}
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/WSSecurityAssertionDeployer.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/WSSecurityAssertionDeployer.java 2007-09-14
10:01:36 UTC (rev 4560)
+++
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/WSSecurityAssertionDeployer.java 2007-09-14
10:03:04 UTC (rev 4561)
@@ -27,7 +27,7 @@
import org.apache.ws.policy.PrimitiveAssertion;
import org.jboss.logging.Logger;
import org.jboss.ws.extensions.policy.deployer.PolicyDeployer;
-import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertion;
+import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertionException;
import org.jboss.ws.extensions.policy.deployer.util.PrimitiveAssertionWriter;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ExtensibleMetaData;
@@ -46,7 +46,7 @@
{
private final static Logger log = Logger.getLogger(PolicyDeployer.class);
- public void deployServerSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertion
+ public void deployServerSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertionException
{
ByteArrayOutputStream stream = new ByteArrayOutputStream();
if (extMetaData instanceof EndpointMetaData)
@@ -73,12 +73,12 @@
catch (Exception e)
{
e.printStackTrace();
- throw new UnsupportedAssertion();
+ throw new UnsupportedAssertionException();
}
}
}
- public void deployClientSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertion
+ public void deployClientSide(PrimitiveAssertion assertion, ExtensibleMetaData
extMetaData) throws UnsupportedAssertionException
{
if (extMetaData instanceof EndpointMetaData)
{
@@ -101,7 +101,7 @@
catch (Exception e)
{
e.printStackTrace();
- throw new UnsupportedAssertion();
+ throw new UnsupportedAssertionException();
}
}
}