Add RocketMQQueueTest & RocketMQTopicTest, and refactor their package name
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/commit/33a9a316 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/tree/33a9a316 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/diff/33a9a316 Branch: refs/heads/jms-dev-1.1.0 Commit: 33a9a316da052af2cdc0186eb4d710b0ba8b74eb Parents: 1a425db Author: zhangke <[email protected]> Authored: Tue Feb 28 19:08:41 2017 +0800 Committer: zhangke <[email protected]> Committed: Tue Feb 28 19:08:41 2017 +0800 ---------------------------------------------------------------------- .../org/apache/rocketmq/jms/RocketMQQueue.java | 39 ------------------ .../apache/rocketmq/jms/RocketMQSession.java | 2 + .../org/apache/rocketmq/jms/RocketMQTopic.java | 43 -------------------- .../rocketmq/jms/destination/RocketMQQueue.java | 39 ++++++++++++++++++ .../rocketmq/jms/destination/RocketMQTopic.java | 43 ++++++++++++++++++++ .../jms/msg/convert/RMQ2JMSMessageConvert.java | 2 +- .../jms/destination/RocketMQQueueTest.java | 34 ++++++++++++++++ .../jms/destination/RocketMQTopicTest.java | 35 ++++++++++++++++ .../rocketmq/jms/hook/SendMessageHookTest.java | 2 +- .../msg/convert/JMS2RMQMessageConvertTest.java | 2 +- .../rocketmq/jms/support/JMSUtilsTest.java | 4 +- 11 files changed, 158 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/main/java/org/apache/rocketmq/jms/RocketMQQueue.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/RocketMQQueue.java b/core/src/main/java/org/apache/rocketmq/jms/RocketMQQueue.java deleted file mode 100644 index bec021e..0000000 --- a/core/src/main/java/org/apache/rocketmq/jms/RocketMQQueue.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.rocketmq.jms; - -import javax.jms.JMSException; -import javax.jms.Queue; - -public class RocketMQQueue implements Queue { - - private String name; - - public RocketMQQueue(String name) { - this.name = name; - } - - @Override - public String getQueueName() throws JMSException { - return this.name; - } - - @Override public String toString() { - return this.name; - } -} http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java b/core/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java index d5b64d1..b42d4bb 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java +++ b/core/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java @@ -42,6 +42,8 @@ import javax.jms.TemporaryTopic; import javax.jms.TextMessage; import javax.jms.Topic; import javax.jms.TopicSubscriber; +import org.apache.rocketmq.jms.destination.RocketMQQueue; +import org.apache.rocketmq.jms.destination.RocketMQTopic; import org.apache.rocketmq.jms.msg.JMSBytesMessage; import org.apache.rocketmq.jms.msg.JMSObjectMessage; import org.apache.rocketmq.jms.msg.JMSTextMessage; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/main/java/org/apache/rocketmq/jms/RocketMQTopic.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/RocketMQTopic.java b/core/src/main/java/org/apache/rocketmq/jms/RocketMQTopic.java deleted file mode 100644 index c1ff87b..0000000 --- a/core/src/main/java/org/apache/rocketmq/jms/RocketMQTopic.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.rocketmq.jms; - -import javax.jms.JMSException; -import javax.jms.Topic; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class RocketMQTopic implements Topic { - private static final Logger log = LoggerFactory.getLogger(RocketMQTopic.class); - - private String name; - - public RocketMQTopic(String name) { - this.name = name; - } - - @Override - public String getTopicName() throws JMSException { - return this.name; - } - - @Override - public String toString() { - return this.name; - } -} http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/main/java/org/apache/rocketmq/jms/destination/RocketMQQueue.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/destination/RocketMQQueue.java b/core/src/main/java/org/apache/rocketmq/jms/destination/RocketMQQueue.java new file mode 100644 index 0000000..d7d5b84 --- /dev/null +++ b/core/src/main/java/org/apache/rocketmq/jms/destination/RocketMQQueue.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.jms.destination; + +import javax.jms.JMSException; +import javax.jms.Queue; + +public class RocketMQQueue implements Queue { + + private String name; + + public RocketMQQueue(String name) { + this.name = name; + } + + @Override + public String getQueueName() throws JMSException { + return this.name; + } + + @Override public String toString() { + return this.name; + } +} http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/main/java/org/apache/rocketmq/jms/destination/RocketMQTopic.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/destination/RocketMQTopic.java b/core/src/main/java/org/apache/rocketmq/jms/destination/RocketMQTopic.java new file mode 100644 index 0000000..3214b4c --- /dev/null +++ b/core/src/main/java/org/apache/rocketmq/jms/destination/RocketMQTopic.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.jms.destination; + +import javax.jms.JMSException; +import javax.jms.Topic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RocketMQTopic implements Topic { + private static final Logger log = LoggerFactory.getLogger(RocketMQTopic.class); + + private String name; + + public RocketMQTopic(String name) { + this.name = name; + } + + @Override + public String getTopicName() throws JMSException { + return this.name; + } + + @Override + public String toString() { + return this.name; + } +} http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/main/java/org/apache/rocketmq/jms/msg/convert/RMQ2JMSMessageConvert.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/msg/convert/RMQ2JMSMessageConvert.java b/core/src/main/java/org/apache/rocketmq/jms/msg/convert/RMQ2JMSMessageConvert.java index cc4ad00..7f9bb77 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/msg/convert/RMQ2JMSMessageConvert.java +++ b/core/src/main/java/org/apache/rocketmq/jms/msg/convert/RMQ2JMSMessageConvert.java @@ -21,7 +21,7 @@ import java.util.Map; import javax.jms.JMSException; import javax.jms.Message; import org.apache.rocketmq.common.message.MessageExt; -import org.apache.rocketmq.jms.RocketMQTopic; +import org.apache.rocketmq.jms.destination.RocketMQTopic; import org.apache.rocketmq.jms.msg.AbstractJMSMessage; import org.apache.rocketmq.jms.msg.JMSBytesMessage; import org.apache.rocketmq.jms.msg.JMSMapMessage; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/test/java/org/apache/rocketmq/jms/destination/RocketMQQueueTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/rocketmq/jms/destination/RocketMQQueueTest.java b/core/src/test/java/org/apache/rocketmq/jms/destination/RocketMQQueueTest.java new file mode 100644 index 0000000..0a3b36b --- /dev/null +++ b/core/src/test/java/org/apache/rocketmq/jms/destination/RocketMQQueueTest.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.jms.destination; + +import org.junit.Test; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + +public class RocketMQQueueTest { + + @Test + public void test() throws Exception { + RocketMQQueue queue = new RocketMQQueue("MyQueue"); + + assertThat(queue.getQueueName(), is("MyQueue")); + assertThat(queue.toString(), is("MyQueue")); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/test/java/org/apache/rocketmq/jms/destination/RocketMQTopicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/rocketmq/jms/destination/RocketMQTopicTest.java b/core/src/test/java/org/apache/rocketmq/jms/destination/RocketMQTopicTest.java new file mode 100644 index 0000000..c482e1c --- /dev/null +++ b/core/src/test/java/org/apache/rocketmq/jms/destination/RocketMQTopicTest.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.jms.destination; + +import org.junit.Test; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + +public class RocketMQTopicTest { + + @Test + public void test() throws Exception { + RocketMQTopic topic = new RocketMQTopic("MyTopic"); + + assertThat(topic.getTopicName(), is("MyTopic")); + assertThat(topic.toString(), is("MyTopic")); + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/test/java/org/apache/rocketmq/jms/hook/SendMessageHookTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/rocketmq/jms/hook/SendMessageHookTest.java b/core/src/test/java/org/apache/rocketmq/jms/hook/SendMessageHookTest.java index 6af7786..29e91ec 100644 --- a/core/src/test/java/org/apache/rocketmq/jms/hook/SendMessageHookTest.java +++ b/core/src/test/java/org/apache/rocketmq/jms/hook/SendMessageHookTest.java @@ -20,7 +20,7 @@ package org.apache.rocketmq.jms.hook; import javax.jms.DeliveryMode; import javax.jms.Destination; import org.apache.rocketmq.jms.RocketMQProducer; -import org.apache.rocketmq.jms.RocketMQTopic; +import org.apache.rocketmq.jms.destination.RocketMQTopic; import org.apache.rocketmq.jms.exception.UnsupportDeliveryModelException; import org.apache.rocketmq.jms.msg.JMSTextMessage; import org.apache.rocketmq.jms.msg.enums.JMSHeaderEnum; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/test/java/org/apache/rocketmq/jms/msg/convert/JMS2RMQMessageConvertTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/rocketmq/jms/msg/convert/JMS2RMQMessageConvertTest.java b/core/src/test/java/org/apache/rocketmq/jms/msg/convert/JMS2RMQMessageConvertTest.java index 4830e6a..acb3637 100644 --- a/core/src/test/java/org/apache/rocketmq/jms/msg/convert/JMS2RMQMessageConvertTest.java +++ b/core/src/test/java/org/apache/rocketmq/jms/msg/convert/JMS2RMQMessageConvertTest.java @@ -18,7 +18,7 @@ package org.apache.rocketmq.jms.msg.convert; import org.apache.rocketmq.common.message.MessageExt; -import org.apache.rocketmq.jms.RocketMQTopic; +import org.apache.rocketmq.jms.destination.RocketMQTopic; import org.apache.rocketmq.jms.msg.AbstractJMSMessage; import org.apache.rocketmq.jms.msg.JMSTextMessage; import org.apache.rocketmq.jms.msg.enums.JMSHeaderEnum; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/33a9a316/core/src/test/java/org/apache/rocketmq/jms/support/JMSUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/rocketmq/jms/support/JMSUtilsTest.java b/core/src/test/java/org/apache/rocketmq/jms/support/JMSUtilsTest.java index 0be8445..d926fac 100644 --- a/core/src/test/java/org/apache/rocketmq/jms/support/JMSUtilsTest.java +++ b/core/src/test/java/org/apache/rocketmq/jms/support/JMSUtilsTest.java @@ -17,8 +17,8 @@ package org.apache.rocketmq.jms.support; -import org.apache.rocketmq.jms.RocketMQQueue; -import org.apache.rocketmq.jms.RocketMQTopic; +import org.apache.rocketmq.jms.destination.RocketMQQueue; +import org.apache.rocketmq.jms.destination.RocketMQTopic; import org.junit.Test; import static org.hamcrest.core.Is.is;
