diff options
Diffstat (limited to 'java/common/src')
16 files changed, 19 insertions, 407 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java b/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java index f4d1b795bd..4fa98ac2dc 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java +++ b/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java @@ -32,7 +32,6 @@ import java.io.IOException; import org.apache.qpid.AMQException; import org.apache.qpid.codec.MarkableDataInput; -import org.apache.qpid.framing.amqp_0_91.MethodDispatcher_0_91; public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { @@ -92,7 +91,7 @@ public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements Encodable public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_0_91)dispatcher).dispatchBasicRecoverSync(this, channelId); + return dispatcher.dispatchBasicRecoverSync(this, channelId); } public String toString() diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java index e0a1e05e58..9f0e5ecdf5 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java +++ b/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java @@ -27,12 +27,11 @@ package org.apache.qpid.framing; -import org.apache.qpid.codec.MarkableDataInput; import java.io.DataOutput; import java.io.IOException; import org.apache.qpid.AMQException; -import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0; +import org.apache.qpid.codec.MarkableDataInput; public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { @@ -104,7 +103,7 @@ public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQD public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchChannelAlert(this, channelId); + return dispatcher.dispatchChannelAlert(this, channelId); } public String toString() diff --git a/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java b/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java index 038963f4e1..97de0ac487 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java +++ b/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java @@ -70,4 +70,6 @@ public interface ClientMethodDispatcher boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody basicRecoverSyncOkBody, int channelId) throws AMQException; + + boolean dispatchChannelAlert(ChannelAlertBody channelAlertBody, int channelId) throws AMQException; } diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java b/java/common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java index 53c70c8d71..1381fadbdc 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java +++ b/java/common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java @@ -18,23 +18,23 @@ * under the License. * */ -package org.apache.qpid.framing.abstraction; +package org.apache.qpid.framing; import org.apache.qpid.framing.AMQShortString; -public class MessagePublishInfoImpl implements MessagePublishInfo +public final class MessagePublishInfo { private AMQShortString _exchange; private boolean _immediate; private boolean _mandatory; private AMQShortString _routingKey; - public MessagePublishInfoImpl() + public MessagePublishInfo() { } - public MessagePublishInfoImpl(AMQShortString exchange, boolean immediate, boolean mandatory, - AMQShortString routingKey) + public MessagePublishInfo(AMQShortString exchange, boolean immediate, boolean mandatory, + AMQShortString routingKey) { _exchange = exchange; _immediate = immediate; @@ -69,7 +69,7 @@ public class MessagePublishInfoImpl implements MessagePublishInfo public void setMandatory(boolean mandatory) { - _mandatory = mandatory; + _mandatory = mandatory; } public AMQShortString getRoutingKey() @@ -81,4 +81,5 @@ public class MessagePublishInfoImpl implements MessagePublishInfo { _routingKey = routingKey; } + } diff --git a/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java b/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java index fd87911b26..f4ab67dad4 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java +++ b/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java @@ -66,4 +66,6 @@ public interface ServerMethodDispatcher public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException; boolean dispatchQueueUnbind(QueueUnbindBody queueUnbindBody, int channelId) throws AMQException; + + boolean dispatchBasicRecoverSync(BasicRecoverSyncBody basicRecoverSyncBody, int channelId) throws AMQException; } diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java b/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java deleted file mode 100644 index a96bdcc171..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java +++ /dev/null @@ -1,38 +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.qpid.framing.abstraction; - -import org.apache.qpid.framing.AMQShortString; - -public interface MessagePublishInfo -{ - - public AMQShortString getExchange(); - - public void setExchange(AMQShortString exchange); - - public boolean isImmediate(); - - public boolean isMandatory(); - - public AMQShortString getRoutingKey(); - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java deleted file mode 100644 index 7c636140e9..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java +++ /dev/null @@ -1,41 +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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 0-9 - */ - -package org.apache.qpid.framing.amqp_0_9; - -import org.apache.qpid.AMQException; -import org.apache.qpid.framing.*; - -public interface ClientMethodDispatcher_0_9 extends ClientMethodDispatcher -{ - - public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException; - public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException; - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java deleted file mode 100644 index 00c81e1180..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java +++ /dev/null @@ -1,38 +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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 0-9 - */ - -package org.apache.qpid.framing.amqp_0_9; - -import org.apache.qpid.framing.*; - -public interface MethodDispatcher_0_9 - extends MethodDispatcher, - ServerMethodDispatcher_0_9, - ClientMethodDispatcher_0_9 -{ - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java deleted file mode 100644 index 128af0e2a7..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java +++ /dev/null @@ -1,41 +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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 0-9 - */ - -package org.apache.qpid.framing.amqp_0_9; - -import org.apache.qpid.AMQException; -import org.apache.qpid.framing.*; - - -public interface ServerMethodDispatcher_0_9 extends ServerMethodDispatcher -{ - - public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException; - public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException; - public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException; - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java deleted file mode 100644 index 11fd973ec8..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 0-91 - */ - -package org.apache.qpid.framing.amqp_0_91; - -import org.apache.qpid.AMQException; -import org.apache.qpid.framing.*; - -public interface ClientMethodDispatcher_0_91 extends ClientMethodDispatcher -{ - - public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException; - public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException; - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java deleted file mode 100644 index 9846ce4b48..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java +++ /dev/null @@ -1,38 +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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 0-91 - */ - -package org.apache.qpid.framing.amqp_0_91; - -import org.apache.qpid.framing.*; - -public interface MethodDispatcher_0_91 - extends MethodDispatcher, - ServerMethodDispatcher_0_91, - ClientMethodDispatcher_0_91 -{ - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java deleted file mode 100644 index 7f85c2beb7..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java +++ /dev/null @@ -1,40 +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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 0-91 - */ - -package org.apache.qpid.framing.amqp_0_91; - -import org.apache.qpid.AMQException; -import org.apache.qpid.framing.*; - - -public interface ServerMethodDispatcher_0_91 extends ServerMethodDispatcher -{ - - public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException; - public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException; - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java deleted file mode 100644 index 7274e4c3bd..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java +++ /dev/null @@ -1,40 +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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 8-0 - */ - -package org.apache.qpid.framing.amqp_8_0; - -import org.apache.qpid.AMQException; -import org.apache.qpid.framing.*; - -public interface ClientMethodDispatcher_8_0 extends ClientMethodDispatcher -{ - - public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId) throws AMQException; - public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException; - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java deleted file mode 100644 index dc4f33ab6d..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java +++ /dev/null @@ -1,38 +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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 8-0 - */ - -package org.apache.qpid.framing.amqp_8_0; - -import org.apache.qpid.framing.*; - -public interface MethodDispatcher_8_0 - extends MethodDispatcher, - ServerMethodDispatcher_8_0, - ClientMethodDispatcher_8_0 -{ - -} diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java deleted file mode 100644 index 0a9fc2d893..0000000000 --- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.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. - * - */ - -/* - * This file is auto-generated by Qpid Gentools v.0.1 - do not modify. - * Supported AMQP version: - * 8-0 - */ - -package org.apache.qpid.framing.amqp_8_0; - -import org.apache.qpid.AMQException; -import org.apache.qpid.framing.*; - - -public interface ServerMethodDispatcher_8_0 extends ServerMethodDispatcher -{ - - public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException; - -} diff --git a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java b/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java index 5a57db1650..aece8ed4e2 100644 --- a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java +++ b/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java @@ -23,16 +23,17 @@ package org.apache.qpid.framing.abstraction; import junit.framework.TestCase; import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.framing.MessagePublishInfo; public class MessagePublishInfoImplTest extends TestCase { - private MessagePublishInfoImpl _mpi; + private MessagePublishInfo _mpi; private final AMQShortString _exchange = new AMQShortString("exchange"); private final AMQShortString _routingKey = new AMQShortString("routingKey"); public void setUp() { - _mpi = new MessagePublishInfoImpl(_exchange, true, true, _routingKey); + _mpi = new MessagePublishInfo(_exchange, true, true, _routingKey); } /** Test that we can update the exchange value. */ @@ -55,7 +56,7 @@ public class MessagePublishInfoImplTest extends TestCase //Check that the set value is correct assertTrue("Set value for immediate not as expected", _mpi.isImmediate()); - MessagePublishInfoImpl mpi = new MessagePublishInfoImpl(); + MessagePublishInfo mpi = new MessagePublishInfo(); assertFalse("Default value for immediate should be false", mpi.isImmediate()); @@ -72,7 +73,7 @@ public class MessagePublishInfoImplTest extends TestCase { assertTrue("Set value for mandatory not as expected", _mpi.isMandatory()); - MessagePublishInfoImpl mpi = new MessagePublishInfoImpl(); + MessagePublishInfo mpi = new MessagePublishInfo(); assertFalse("Default value for mandatory should be false", mpi.isMandatory()); |