You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2014/10/10 16:55:24 UTC
git commit: Remove now unused parts of the interceptor classes and
finish up the test coverage.
Repository: qpid-jms
Updated Branches:
refs/heads/master d661352c9 -> 7dbfa28c2
Remove now unused parts of the interceptor classes and finish up the
test coverage.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/7dbfa28c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/7dbfa28c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/7dbfa28c
Branch: refs/heads/master
Commit: 7dbfa28c2987e2390c6a29f739da7fbf12e00076
Parents: d661352
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Oct 10 10:55:10 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Oct 10 10:55:10 2014 -0400
----------------------------------------------------------------------
.../message/JmsMessagePropertyIntercepter.java | 115 -------------------
.../AmqpJmsMessagePropertyIntercepter.java | 115 -------------------
.../JmsMessagePropertyIntercepterTest.java | 5 +
.../AmqpJmsMessagePropertyIntercepterTest.java | 5 +
4 files changed, 10 insertions(+), 230 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7dbfa28c/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
index 63b6d24..53bf779 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
@@ -541,119 +541,4 @@ public class JmsMessagePropertyIntercepter {
}
return names;
}
-
- /**
- * Allows for the additional PropertyIntercepter instances to be added to the global set.
- *
- * @param propertyName
- * The name of the Message property that will be intercepted.
- * @param getter
- * The PropertyIntercepter instance that should be used for the named property.
- */
- public static void addPropertySetter(String propertyName, PropertyIntercepter getter) {
- PROPERTY_INTERCEPTERS.put(propertyName, getter);
- }
-
- /**
- * Given a property name, remove the configured intercepter that has been assigned to
- * intercept the queries for that property value.
- *
- * @param propertyName
- * The name of the PropertyIntercepter to remove.
- *
- * @return true if a getter was removed from the global set.
- */
- public static boolean removePropertySetter(String propertyName) {
- if (PROPERTY_INTERCEPTERS.remove(propertyName) != null) {
- return true;
- }
-
- return false;
- }
-
- private final String name;
- private final PropertyIntercepter jmsPropertyExpression;
-
- /**
- * Creates an new property getter instance that is assigned to read the named value.
- *
- * @param name
- * the property value that this getter is assigned to lookup.
- */
- public JmsMessagePropertyIntercepter(String name) {
- this.name = name;
- this.jmsPropertyExpression = PROPERTY_INTERCEPTERS.get(name);
- }
-
- /**
- * Gets the correct property value from the JmsMessageFacade instance based on
- * the predefined property mappings.
- *
- * @param message
- * the JmsMessageFacade whose property is being read.
- *
- * @return the correct value either mapped to an Message attribute of a Message property.
- *
- * @throws JMSException if an error occurs while reading the defined property.
- */
- public Object get(JmsMessageFacade message) throws JMSException {
- if (jmsPropertyExpression != null) {
- return jmsPropertyExpression.getProperty(message);
- }
-
- return message.getProperty(name);
- }
-
- /**
- * Sets the correct property value from the JmsMessageFacade instance based on
- * the predefined property mappings.
- *
- * @param message
- * the JmsMessageFacade whose property is being read.
- * @param value
- * the value to be set on the intercepted JmsMessageFacade property.
- *
- * @throws JMSException if an error occurs while reading the defined property.
- */
- public void set(JmsMessageFacade message, Object value) throws JMSException {
- if (jmsPropertyExpression != null) {
- jmsPropertyExpression.setProperty(message, value);
- } else {
- message.setProperty(name, value);
- }
- }
-
- /**
- * @return the property name that is being intercepted for the JmsMessageFacade.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return name;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- return name.hashCode();
- }
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object o) {
- if (o == null || !this.getClass().equals(o.getClass())) {
- return false;
- }
- return name.equals(((JmsMessagePropertyIntercepter) o).name);
- }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7dbfa28c/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
index 0fd2d39..1a676de 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
@@ -263,119 +263,4 @@ public class AmqpJmsMessagePropertyIntercepter {
}
return names;
}
-
- /**
- * Allows for the additional PropertyIntercepter instances to be added to the global set.
- *
- * @param propertyName
- * The name of the Message property that will be intercepted.
- * @param getter
- * The PropertyIntercepter instance that should be used for the named property.
- */
- public static void addPropertyIntercepter(String propertyName, PropertyIntercepter getter) {
- PROPERTY_INTERCEPTERS.put(propertyName, getter);
- }
-
- /**
- * Given a property name, remove the configured intercepter that has been assigned to
- * intercept calls for that property value.
- *
- * @param propertyName
- * The name of the PropertyIntercepter to remove.
- *
- * @return true if a getter was removed from the global set.
- */
- public boolean removePropertyIntercepter(String propertyName) {
- if (PROPERTY_INTERCEPTERS.remove(propertyName) != null) {
- return true;
- }
-
- return false;
- }
-
- private final String name;
- private final PropertyIntercepter propertyExpression;
-
- /**
- * Creates an new property getter instance that is assigned to read the named value.
- *
- * @param name
- * the property value that this getter is assigned to lookup.
- */
- public AmqpJmsMessagePropertyIntercepter(String name) {
- this.name = name;
- this.propertyExpression = PROPERTY_INTERCEPTERS.get(name);
- }
-
- /**
- * Gets the correct property value from the JmsMessageFacade instance based on
- * the predefined property mappings.
- *
- * @param message
- * the JmsMessageFacade whose property is being read.
- *
- * @return the correct value either mapped to an Message attribute of a Message property.
- *
- * @throws JMSException if an error occurs while reading the defined property.
- */
- public Object get(AmqpJmsMessageFacade message) throws JMSException {
- if (propertyExpression != null) {
- return propertyExpression.getProperty(message);
- }
-
- return message.getApplicationProperty(name);
- }
-
- /**
- * Sets the correct property value from the AmqpJmsMessageFacade instance based on
- * the predefined property mappings.
- *
- * @param message
- * the AmqpJmsMessageFacade whose property is being read.
- * @param value
- * the value to be set on the intercepted AmqpJmsMessageFacade property.
- *
- * @throws JMSException if an error occurs while reading the defined property.
- */
- public void set(AmqpJmsMessageFacade message, Object value) throws JMSException {
- if (propertyExpression != null) {
- propertyExpression.setProperty(message, value);
- } else {
- message.setApplicationProperty(name, value);
- }
- }
-
- /**
- * @return the property name that is being intercepted for the AmqpJmsMessageFacade.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return name;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- return name.hashCode();
- }
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object o) {
- if (o == null || !this.getClass().equals(o.getClass())) {
- return false;
- }
- return name.equals(((AmqpJmsMessagePropertyIntercepter) o).name);
- }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7dbfa28c/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
index 9d088aa..f1b6542 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
@@ -50,6 +50,11 @@ public class JmsMessagePropertyIntercepterTest {
//---------- Non-Intercepted -------------------------------------------------//
@Test
+ public void testCreate() throws JMSException {
+ new JmsMessagePropertyIntercepter();
+ }
+
+ @Test
public void testGetPropertyWithNonInterceptedNameCallsIntoFacade() throws JMSException {
JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
assertNull(JmsMessagePropertyIntercepter.getProperty(message, "SomeRandomPropertyName"));
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7dbfa28c/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
index 96c0c79..ee7bcde 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
@@ -37,6 +37,11 @@ public class AmqpJmsMessagePropertyIntercepterTest {
//---------- Non-Intercepted -------------------------------------------------//
@Test
+ public void testCreate() throws JMSException {
+ new AmqpJmsMessagePropertyIntercepter();
+ }
+
+ @Test
public void testGetPropertyWithNonInterceptedNameCallsIntoFacade() throws JMSException {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
assertNull(AmqpJmsMessagePropertyIntercepter.getProperty(message, "SomeRandomPropertyName"));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org