You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/12/06 14:23:00 UTC
svn commit: r1772901 [5/5] - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/
broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpi...
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,15 +23,15 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.type.*;
-import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
-
-
import java.util.Map;
-public class FooterConstructor extends DescribedTypeConstructor<Footer>
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Footer;
+
+public class FooterConstructor extends AbstractDescribedTypeConstructor<Footer>
{
private static final Object[] DESCRIPTORS =
{
Added: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java?rev=1772901&view=auto
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java (added)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java Tue Dec 6 14:22:59 2016
@@ -0,0 +1,54 @@
+
+/*
+*
+* 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.server.protocol.v1_0.type.messaging.codec;
+
+import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.FooterSection;
+
+public class FooterSectionConstructor extends DescribedMapSectionConstructor<FooterSection>
+{
+ private static final Object[] DESCRIPTORS =
+ {
+ Symbol.valueOf("amqp:footer:map"),UnsignedLong.valueOf(0x0000000000000078L),
+ };
+
+ private static final FooterSectionConstructor INSTANCE = new FooterSectionConstructor();
+
+ public static void register(DescribedTypeConstructorRegistry registry)
+ {
+ for(Object descriptor : DESCRIPTORS)
+ {
+ registry.register(descriptor, INSTANCE);
+ }
+ }
+
+ @Override
+ protected FooterSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
+ {
+ return new FooterSection(describedTypeRegistry);
+ }
+
+}
Propchange: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,15 +23,17 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.type.*;
-import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
-
-
import java.util.List;
-public class HeaderConstructor extends DescribedTypeConstructor<Header>
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedByte;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Header;
+
+public class HeaderConstructor extends AbstractDescribedTypeConstructor<Header>
{
private static final Object[] DESCRIPTORS =
{
Added: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java?rev=1772901&view=auto
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java (added)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java Tue Dec 6 14:22:59 2016
@@ -0,0 +1,55 @@
+
+/*
+*
+* 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.server.protocol.v1_0.type.messaging.codec;
+
+import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.HeaderSection;
+
+public class HeaderSectionConstructor extends DescribedListSectionConstructor<HeaderSection>
+{
+ private static final Object[] DESCRIPTORS =
+ {
+ Symbol.valueOf("amqp:header:list"),UnsignedLong.valueOf(0x0000000000000070L),
+ };
+
+ private static final HeaderSectionConstructor INSTANCE = new HeaderSectionConstructor();
+
+ public static void register(DescribedTypeConstructorRegistry registry)
+ {
+ for(Object descriptor : DESCRIPTORS)
+ {
+ registry.register(descriptor, INSTANCE);
+ }
+ }
+
+ @Override
+ protected HeaderSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
+ {
+ return new HeaderSection(describedTypeRegistry);
+ }
+
+
+}
Propchange: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,13 +23,13 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.Symbol;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
import org.apache.qpid.server.protocol.v1_0.type.messaging.JMSSelectorFilter;
-public class JMSSelectorFilterConstructor extends DescribedTypeConstructor<JMSSelectorFilter>
+public class JMSSelectorFilterConstructor extends AbstractDescribedTypeConstructor<JMSSelectorFilter>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,13 +23,13 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.Symbol;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
import org.apache.qpid.server.protocol.v1_0.type.messaging.MatchingSubjectFilter;
-public class MatchingSubjectFilterConstructor extends DescribedTypeConstructor<MatchingSubjectFilter>
+public class MatchingSubjectFilterConstructor extends AbstractDescribedTypeConstructor<MatchingSubjectFilter>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,15 +23,15 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.type.*;
-import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
-
-
import java.util.Map;
-public class MessageAnnotationsConstructor extends DescribedTypeConstructor<MessageAnnotations>
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotations;
+
+public class MessageAnnotationsConstructor extends AbstractDescribedTypeConstructor<MessageAnnotations>
{
private static final Object[] DESCRIPTORS =
{
Added: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java?rev=1772901&view=auto
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java (added)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java Tue Dec 6 14:22:59 2016
@@ -0,0 +1,54 @@
+
+/*
+*
+* 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.server.protocol.v1_0.type.messaging.codec;
+
+import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotationsSection;
+
+public class MessageAnnotationsSectionConstructor extends DescribedMapSectionConstructor<MessageAnnotationsSection>
+{
+ private static final Object[] DESCRIPTORS =
+ {
+ Symbol.valueOf("amqp:message-annotations:map"),UnsignedLong.valueOf(0x0000000000000072L),
+ };
+
+ private static final MessageAnnotationsSectionConstructor INSTANCE = new MessageAnnotationsSectionConstructor();
+
+ public static void register(DescribedTypeConstructorRegistry registry)
+ {
+ for(Object descriptor : DESCRIPTORS)
+ {
+ registry.register(descriptor, INSTANCE);
+ }
+ }
+
+ @Override
+ protected MessageAnnotationsSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
+ {
+ return new MessageAnnotationsSection(describedTypeRegistry);
+ }
+
+}
Propchange: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
@@ -32,7 +32,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
import java.util.Map;
-public class ModifiedConstructor extends DescribedTypeConstructor<Modified>
+public class ModifiedConstructor extends AbstractDescribedTypeConstructor<Modified>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,13 +23,13 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.Symbol;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
import org.apache.qpid.server.protocol.v1_0.type.messaging.NoLocalFilter;
-public class NoLocalFilterConstructor extends DescribedTypeConstructor<NoLocalFilter>
+public class NoLocalFilterConstructor extends AbstractDescribedTypeConstructor<NoLocalFilter>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,16 +23,18 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.type.*;
-import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
-
-
-import java.util.List;
import java.util.Date;
+import java.util.List;
+
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.server.protocol.v1_0.type.Binary;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
-public class PropertiesConstructor extends DescribedTypeConstructor<Properties>
+public class PropertiesConstructor extends AbstractDescribedTypeConstructor<Properties>
{
private static final Object[] DESCRIPTORS =
{
Copied: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java (from r1772546, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java?p2=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java&p1=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java&r1=1772546&r2=1772901&rev=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,23 +23,19 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.type.*;
-import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.PropertiesSection;
-
-import java.util.List;
-import java.util.Date;
-
-public class PropertiesConstructor extends DescribedTypeConstructor<Properties>
+public class PropertiesSectionConstructor extends DescribedListSectionConstructor<PropertiesSection>
{
private static final Object[] DESCRIPTORS =
{
Symbol.valueOf("amqp:properties:list"),UnsignedLong.valueOf(0x0000000000000073L),
};
- private static final PropertiesConstructor INSTANCE = new PropertiesConstructor();
+ private static final PropertiesSectionConstructor INSTANCE = new PropertiesSectionConstructor();
public static void register(DescribedTypeConstructorRegistry registry)
{
@@ -49,375 +45,10 @@ public class PropertiesConstructor exten
}
}
- public Properties construct(Object underlying)
+ @Override
+ protected PropertiesSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
{
- if(underlying instanceof List)
- {
- List list = (List) underlying;
- Properties obj = new Properties();
- int position = 0;
- final int size = list.size();
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setMessageId( val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setUserId( (Binary) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setTo( (String) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setSubject( (String) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setReplyTo( (String) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setCorrelationId( val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setContentType( (Symbol) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setContentEncoding( (Symbol) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setAbsoluteExpiryTime( (Date) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setCreationTime( (Date) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setGroupId( (String) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setGroupSequence( (UnsignedInteger) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
- if(position < size)
- {
- Object val = list.get(position);
- position++;
-
- if(val != null)
- {
-
- try
- {
- obj.setReplyToGroupId( (String) val );
- }
- catch(ClassCastException e)
- {
-
- // TODO Error
- }
-
- }
-
-
- }
- else
- {
- return obj;
- }
-
-
- return obj;
- }
- else
- {
- // TODO - error
- return null;
- }
+ return new PropertiesSection(describedTypeRegistry);
}
-
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class ReceivedConstructor extends DescribedTypeConstructor<Received>
+public class ReceivedConstructor extends AbstractDescribedTypeConstructor<Received>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class RejectedConstructor extends DescribedTypeConstructor<Rejected>
+public class RejectedConstructor extends AbstractDescribedTypeConstructor<Rejected>
{
public static final Symbol SYMBOL_CONSTRUCTOR = Symbol.valueOf("amqp:rejected:list");
private static final Object[] DESCRIPTORS =
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class ReleasedConstructor extends DescribedTypeConstructor<Released>
+public class ReleasedConstructor extends AbstractDescribedTypeConstructor<Released>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
@@ -33,7 +33,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
import java.util.Map;
-public class SourceConstructor extends DescribedTypeConstructor<Source>
+public class SourceConstructor extends AbstractDescribedTypeConstructor<Source>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.messaging.*;
@@ -33,7 +33,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
import java.util.Map;
-public class TargetConstructor extends DescribedTypeConstructor<Target>
+public class TargetConstructor extends AbstractDescribedTypeConstructor<Target>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.security.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.security.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class SaslChallengeConstructor extends DescribedTypeConstructor<SaslChallenge>
+public class SaslChallengeConstructor extends AbstractDescribedTypeConstructor<SaslChallenge>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.security.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.security.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class SaslInitConstructor extends DescribedTypeConstructor<SaslInit>
+public class SaslInitConstructor extends AbstractDescribedTypeConstructor<SaslInit>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.security.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.security.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class SaslMechanismsConstructor extends DescribedTypeConstructor<SaslMechanisms>
+public class SaslMechanismsConstructor extends AbstractDescribedTypeConstructor<SaslMechanisms>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.security.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.security.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class SaslOutcomeConstructor extends DescribedTypeConstructor<SaslOutcome>
+public class SaslOutcomeConstructor extends AbstractDescribedTypeConstructor<SaslOutcome>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.security.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.security.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class SaslResponseConstructor extends DescribedTypeConstructor<SaslResponse>
+public class SaslResponseConstructor extends AbstractDescribedTypeConstructor<SaslResponse>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transaction.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transaction.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class CoordinatorConstructor extends DescribedTypeConstructor<Coordinator>
+public class CoordinatorConstructor extends AbstractDescribedTypeConstructor<Coordinator>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transaction.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transaction.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class DeclareConstructor extends DescribedTypeConstructor<Declare>
+public class DeclareConstructor extends AbstractDescribedTypeConstructor<Declare>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transaction.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transaction.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class DeclaredConstructor extends DescribedTypeConstructor<Declared>
+public class DeclaredConstructor extends AbstractDescribedTypeConstructor<Declared>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transaction.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transaction.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class DischargeConstructor extends DescribedTypeConstructor<Discharge>
+public class DischargeConstructor extends AbstractDescribedTypeConstructor<Discharge>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transaction.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transaction.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class TransactionalStateConstructor extends DescribedTypeConstructor<TransactionalState>
+public class TransactionalStateConstructor extends AbstractDescribedTypeConstructor<TransactionalState>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java Tue Dec 6 14:22:59 2016
@@ -24,16 +24,22 @@
package org.apache.qpid.server.protocol.v1_0.type.transport;
-import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
-import org.apache.qpid.server.protocol.v1_0.type.*;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
+import org.apache.qpid.server.protocol.v1_0.type.Binary;
+import org.apache.qpid.server.protocol.v1_0.type.DeliveryState;
+import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
public class Transfer
implements FrameBody
{
- private volatile QpidByteBuffer _payload;
+ private volatile List<QpidByteBuffer> _payload;
private UnsignedInteger _handle;
@@ -281,21 +287,47 @@ public class Transfer
conn.receiveTransfer(channel, this);
}
- public void setPayload(QpidByteBuffer payload)
+ public void setPayload(List<QpidByteBuffer> payload)
{
- _payload = payload;
+ if(payload == null)
+ {
+ _payload = null;
+ }
+ else
+ {
+ _payload = new ArrayList<>(payload.size());
+ for(QpidByteBuffer buf : payload)
+ {
+ _payload.add(buf.duplicate());
+ }
+ }
}
- public QpidByteBuffer getPayload()
+ public List<QpidByteBuffer> getPayload()
{
- return _payload;
+ if(_payload == null)
+ {
+ return null;
+ }
+ else
+ {
+ List<QpidByteBuffer> payloadDup = new ArrayList<>(_payload.size());
+ for(QpidByteBuffer buf : _payload)
+ {
+ payloadDup.add(buf.duplicate());
+ }
+ return payloadDup;
+ }
}
public void dispose()
{
if (_payload != null)
{
- _payload.dispose();
+ for(QpidByteBuffer buf : _payload)
+ {
+ buf.dispose();
+ }
_payload = null;
}
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
@@ -32,7 +32,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
import java.util.Map;
-public class AttachConstructor extends DescribedTypeConstructor<Attach>
+public class AttachConstructor extends AbstractDescribedTypeConstructor<Attach>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
@@ -32,7 +32,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
import java.util.Map;
-public class BeginConstructor extends DescribedTypeConstructor<Begin>
+public class BeginConstructor extends AbstractDescribedTypeConstructor<Begin>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class CloseConstructor extends DescribedTypeConstructor<Close>
+public class CloseConstructor extends AbstractDescribedTypeConstructor<Close>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class DetachConstructor extends DescribedTypeConstructor<Detach>
+public class DetachConstructor extends AbstractDescribedTypeConstructor<Detach>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class DispositionConstructor extends DescribedTypeConstructor<Disposition>
+public class DispositionConstructor extends AbstractDescribedTypeConstructor<Disposition>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class EndConstructor extends DescribedTypeConstructor<End>
+public class EndConstructor extends AbstractDescribedTypeConstructor<End>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,17 +23,18 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transaction.TransactionErrors;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
import java.util.List;
import java.util.Map;
-public class ErrorConstructor extends DescribedTypeConstructor<org.apache.qpid.server.protocol.v1_0.type.transport.Error>
+public class ErrorConstructor extends AbstractDescribedTypeConstructor<Error>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
@@ -32,7 +32,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
import java.util.Map;
-public class FlowConstructor extends DescribedTypeConstructor<Flow>
+public class FlowConstructor extends AbstractDescribedTypeConstructor<Flow>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,16 +23,18 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.type.*;
-import org.apache.qpid.server.protocol.v1_0.type.transport.*;
-
-
import java.util.List;
import java.util.Map;
-public class OpenConstructor extends DescribedTypeConstructor<Open>
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedShort;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Open;
+
+public class OpenConstructor extends AbstractDescribedTypeConstructor<Open>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java Tue Dec 6 14:22:59 2016
@@ -23,7 +23,7 @@
package org.apache.qpid.server.protocol.v1_0.type.transport.codec;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.server.protocol.v1_0.type.*;
import org.apache.qpid.server.protocol.v1_0.type.transport.*;
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
import java.util.List;
-public class TransferConstructor extends DescribedTypeConstructor<Transfer>
+public class TransferConstructor extends AbstractDescribedTypeConstructor<Transfer>
{
private static final Object[] DESCRIPTORS =
{
Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java Tue Dec 6 14:22:59 2016
@@ -32,7 +32,9 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.server.protocol.v1_0.type.Symbol;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedByte;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.AbstractSection;
import org.apache.qpid.server.protocol.v1_0.type.messaging.ApplicationProperties;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Data;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Header;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
import org.apache.qpid.server.plugin.PluggableService;
@@ -42,6 +44,7 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.transport.DeliveryProperties;
import org.apache.qpid.transport.MessageDeliveryMode;
import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.util.GZIPUtils;
@PluggableService
public class MessageConverter_0_10_to_1_0 extends MessageConverter_to_1_0<MessageTransferMessage>
@@ -55,7 +58,9 @@ public class MessageConverter_0_10_to_1_
@Override
protected MessageMetaData_1_0 convertMetaData(MessageTransferMessage serverMessage,
- final Section bodySection, SectionEncoder sectionEncoder)
+ final Section bodySection,
+ SectionEncoder sectionEncoder,
+ final ArrayList<AbstractSection<?>> bodySections)
{
List<Section> sections = new ArrayList<Section>(3);
final MessageProperties msgProps = serverMessage.getHeader().getMessageProperties();
@@ -91,7 +96,9 @@ public class MessageConverter_0_10_to_1_
if(msgProps != null)
{
- if(msgProps.hasContentEncoding())
+ if(msgProps.hasContentEncoding()
+ && !GZIPUtils.GZIP_CONTENT_ENCODING.equals(msgProps.getContentEncoding())
+ && bodySection instanceof Data)
{
props.setContentEncoding(Symbol.valueOf(msgProps.getContentEncoding()));
}
@@ -139,7 +146,7 @@ public class MessageConverter_0_10_to_1_
applicationProperties = new LinkedHashMap<>(applicationProperties);
applicationProperties.remove("qpid.subject");
}
- sections.add(new ApplicationProperties(applicationProperties));
+ sections.add(new ApplicationProperties((Map)applicationProperties));
}
}
@@ -147,7 +154,7 @@ public class MessageConverter_0_10_to_1_
{
sections.add(bodySection);
}
- return new MessageMetaData_1_0(sections, sectionEncoder);
+ return new MessageMetaData_1_0(sections, sectionEncoder, bodySections);
}
@Override
Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java Tue Dec 6 14:22:59 2016
@@ -32,7 +32,9 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.server.protocol.v1_0.type.Symbol;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedByte;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.AbstractSection;
import org.apache.qpid.server.protocol.v1_0.type.messaging.ApplicationProperties;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Data;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Header;
import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties;
import org.apache.qpid.framing.AMQShortString;
@@ -43,6 +45,7 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.server.protocol.v1_0.MessageConverter_to_1_0;
import org.apache.qpid.server.protocol.v1_0.MessageMetaData_1_0;
import org.apache.qpid.url.AMQBindingURL;
+import org.apache.qpid.util.GZIPUtils;
@PluggableService
public class MessageConverter_0_8_to_1_0 extends MessageConverter_to_1_0<AMQMessage>
@@ -55,7 +58,8 @@ public class MessageConverter_0_8_to_1_0
protected MessageMetaData_1_0 convertMetaData(final AMQMessage serverMessage,
final Section bodySection,
- SectionEncoder sectionEncoder)
+ SectionEncoder sectionEncoder,
+ final ArrayList<AbstractSection<?>> bodySections)
{
List<Section> sections = new ArrayList<>(3);
@@ -90,7 +94,10 @@ public class MessageConverter_0_8_to_1_0
to
*/
- props.setContentEncoding(Symbol.valueOf(contentHeader.getEncodingAsString()));
+ if(!GZIPUtils.GZIP_CONTENT_ENCODING.equals(contentHeader.getEncodingAsString()) && bodySection instanceof Data)
+ {
+ props.setContentEncoding(Symbol.valueOf(contentHeader.getEncodingAsString()));
+ }
props.setContentType(Symbol.valueOf(contentHeader.getContentTypeAsString()));
@@ -168,12 +175,12 @@ public class MessageConverter_0_8_to_1_0
// TODO: http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-application
// Adhere to "the values are restricted to be of simple types only, that is, excluding map, list, and array types".
// 0-8..0-91 for instance suppoorted field tables with maps as values.
- sections.add(new ApplicationProperties(applicationProperties));
+ sections.add(new ApplicationProperties((Map)applicationProperties));
if(bodySection != null)
{
sections.add(bodySection);
}
- return new MessageMetaData_1_0(sections, sectionEncoder);
+ return new MessageMetaData_1_0(sections, sectionEncoder, bodySections);
}
@Override
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java Tue Dec 6 14:22:59 2016
@@ -256,15 +256,15 @@ public class QueueRestTest extends QpidR
statistics.get("persistentDequeuedMessages"));
assertEquals("Unexpected queue statistics attribute " + "totalDequeuedMessages", DEQUEUED_MESSAGES,
statistics.get("totalDequeuedMessages"));
- assertEquals("Unexpected queue statistics attribute " + "totalDequeuedBytes", isBroker10() ? 164 : MESSAGE_PAYLOAD_SIZE,
+ assertEquals("Unexpected queue statistics attribute " + "totalDequeuedBytes", isBroker10() ? 11 : MESSAGE_PAYLOAD_SIZE,
statistics.get("totalDequeuedBytes"));
- assertEquals("Unexpected queue statistics attribute " + "persistentDequeuedBytes", isBroker10() ? 164 : MESSAGE_PAYLOAD_SIZE,
+ assertEquals("Unexpected queue statistics attribute " + "persistentDequeuedBytes", isBroker10() ? 11 : MESSAGE_PAYLOAD_SIZE,
statistics.get("totalDequeuedBytes"));
- assertEquals("Unexpected queue statistics attribute " + "persistentEnqueuedBytes", isBroker10() ? 328 : 2*MESSAGE_PAYLOAD_SIZE,
+ assertEquals("Unexpected queue statistics attribute " + "persistentEnqueuedBytes", isBroker10() ? 22 : 2*MESSAGE_PAYLOAD_SIZE,
statistics.get("persistentEnqueuedBytes"));
- assertEquals("Unexpected queue statistics attribute " + "totalEnqueuedBytes", isBroker10() ? 328 : 2*MESSAGE_PAYLOAD_SIZE,
+ assertEquals("Unexpected queue statistics attribute " + "totalEnqueuedBytes", isBroker10() ? 22 : 2*MESSAGE_PAYLOAD_SIZE,
statistics.get("totalEnqueuedBytes"));
- assertEquals("Unexpected queue statistics attribute " + "queueDepthBytes", isBroker10() ? 164 : MESSAGE_PAYLOAD_SIZE,
+ assertEquals("Unexpected queue statistics attribute " + "queueDepthBytes", isBroker10() ? 11 : MESSAGE_PAYLOAD_SIZE,
statistics.get("queueDepthBytes"));
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java?rev=1772901&r1=1772900&r2=1772901&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java Tue Dec 6 14:22:59 2016
@@ -58,65 +58,61 @@ public class LargeMessageTest extends Qp
super.tearDown();
}
- // Test boundary of 1 packet to 2 packets
- public void test64kminus9()
+ public void test64kminus9() throws JMSException
{
checkLargeMessage((64 * 1024) - 9);
}
- public void test64kminus8()
+ public void test64kminus8() throws JMSException
{
checkLargeMessage((64 * 1024)-8);
}
- public void test64kminus7()
+ public void test64kminus7() throws JMSException
{
checkLargeMessage((64 * 1024)-7);
}
- public void test64kplus1()
+ public void test64kplus1() throws JMSException
{
checkLargeMessage((64 * 1024) + 1);
}
- // Test packet boundary of 3 packtes
- public void test128kminus1()
+ public void test128kminus1() throws JMSException
{
checkLargeMessage((128 * 1024) - 1);
}
- public void test128k()
+ public void test128k() throws JMSException
{
checkLargeMessage(128 * 1024);
}
- public void test128kplus1()
+ public void test128kplus1() throws JMSException
{
checkLargeMessage((128 * 1024) + 1);
}
// Testing larger messages
- public void test256k()
+ public void test256k() throws JMSException
{
checkLargeMessage(256 * 1024);
}
- public void test512k()
+ public void test512k() throws JMSException
{
checkLargeMessage(512 * 1024);
}
- public void test1024k()
+ public void test1024k() throws JMSException
{
checkLargeMessage(1024 * 1024);
}
- protected void checkLargeMessage(int messageSize)
+ protected void checkLargeMessage(int messageSize) throws JMSException
{
- try
- {
MessageConsumer consumer = _session.createConsumer(_destination);
MessageProducer producer = _session.createProducer(_destination);
_logger.info("Testing message of size:" + messageSize);
@@ -132,12 +128,7 @@ public class LargeMessageTest extends Qp
assertNotNull("Null message received", result);
assertEquals("Message Size", _messageText.length(), result.getText().length());
assertEquals("Message content differs", _messageText, result.getText());
- }
- catch (JMSException e)
- {
- _logger.error("Exception occurred", e);
- fail("Exception occurred:" + e.getCause());
- }
+
}
private String buildLargeMessage(int size)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org