fixup checks and updated exception messages to inidcate which options could not be applied
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/dba3f1a3 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/dba3f1a3 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/dba3f1a3 Branch: refs/heads/master Commit: dba3f1a3846d09a53dad21e9cabbecfbaeb593b0 Parents: 7f59db6 Author: Robert Gemmell <[email protected]> Authored: Fri Jan 30 17:00:19 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Fri Jan 30 17:08:57 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/qpid/jms/JmsConnectionFactory.java | 10 ++++++---- .../qpid/jms/provider/amqp/AmqpProviderFactory.java | 5 +++-- .../jms/provider/failover/FailoverProviderFactory.java | 5 +++-- .../org/apache/qpid/jms/transports/TransportFactory.java | 5 +++-- 4 files changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dba3f1a3/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java index 789f2ae..21c3eaf 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java @@ -318,11 +318,12 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact Map<String, String> map = PropertyUtil.parseQuery(this.remoteURI.getQuery()); Map<String, String> jmsOptionsMap = PropertyUtil.filterProperties(map, "jms."); - if (!PropertyUtil.setProperties(this, jmsOptionsMap)) { + Map<String, String> unused = PropertyUtil.setProperties(this, jmsOptionsMap); + if (!unused.isEmpty()) { String msg = "" + " Not all jms options could be set on the ConnectionFactory." + " Check the options are spelled correctly." - + " Given parameters=[" + jmsOptionsMap + "]." + + " Unused parameters=[" + unused + "]." + " This connection factory cannot be started."; throw new IllegalArgumentException(msg); } else { @@ -331,11 +332,12 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact } else if (URISupport.isCompositeURI(this.remoteURI)) { CompositeData data = URISupport.parseComposite(this.remoteURI); Map<String, String> jmsOptionsMap = PropertyUtil.filterProperties(data.getParameters(), "jms."); - if (!PropertyUtil.setProperties(this, jmsOptionsMap)) { + Map<String, String> unused = PropertyUtil.setProperties(this, jmsOptionsMap); + if (!unused.isEmpty()) { String msg = "" + " Not all jms options could be set on the ConnectionFactory." + " Check the options are spelled correctly." - + " Given parameters=[" + jmsOptionsMap + "]." + + " Unused parameters=[" + unused + "]." + " This connection factory cannot be started."; throw new IllegalArgumentException(msg); } else { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dba3f1a3/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java index 814b6c9..9fa8998 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java @@ -44,11 +44,12 @@ public class AmqpProviderFactory extends ProviderFactory { result.setTransportType(getTransportType()); - if (!PropertyUtil.setProperties(result, providerOptions)) { + Map<String, String> unused = PropertyUtil.setProperties(result, providerOptions); + if (!unused.isEmpty()) { String msg = "" + " Not all provider options could be set on the AMQP Provider." + " Check the options are spelled correctly." - + " Given parameters=[" + providerOptions + "]." + + " Unused parameters=[" + unused + "]." + " This provider instance cannot be started."; throw new IllegalArgumentException(msg); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dba3f1a3/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java index a0be3ec..1b02dd9 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProviderFactory.java @@ -37,11 +37,12 @@ public class FailoverProviderFactory extends ProviderFactory { Map<String, String> nested = PropertyUtil.filterProperties(options, "nested."); FailoverProvider provider = new FailoverProvider(composite.getComponents(), nested); - if (!PropertyUtil.setProperties(provider, options)) { + Map<String, String> unused = PropertyUtil.setProperties(provider, options); + if (!unused.isEmpty()) { String msg = "" + " Not all options could be set on the Failover provider." + " Check the options are spelled correctly." - + " Given parameters=[" + options + "]." + + " Unused parameters=[" + unused + "]." + " This Provider cannot be started."; throw new IllegalArgumentException(msg); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dba3f1a3/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportFactory.java index da0c4f5..2f0a4e7 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportFactory.java @@ -55,10 +55,11 @@ public abstract class TransportFactory { TransportOptions transportOptions = doCreateTransportOptions(); - if (!PropertyUtil.setProperties(transportOptions, transportURIOptions)) { + Map<String, String> unused = PropertyUtil.setProperties(transportOptions, transportURIOptions); + if (!unused.isEmpty()) { String msg = " Not all transport options could be set on the " + getName() + " Transport. Check the options are spelled correctly." + - " Given parameters=[" + transportURIOptions + "]." + + " Unused parameters=[" + unused + "]." + " This provider instance cannot be started."; throw new IllegalArgumentException(msg); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
