Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

latest generated OpenWire commands and marshallers - updated WireFormatInfo so that it has boolean flags for the various options like stack trace and the like (we should avoid int based bitflags going forwards now as they are harder to support in other languages and are more brittle) 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@380778 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2006-02-24 18:45:01 +00:00
parent 0461466367
commit 79d28688df
55 changed files with 365 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-core/maven.xml
View File

@ -110,10 +110,12 @@
<classpath refid="openwire.classpath" /> <classpath refid="openwire.classpath" />
<sysproperty key="openwire.version" value="${openwire.version}" /> <sysproperty key="openwire.version" value="${openwire.version}" />
<arg value="src/main/java/org/apache/activemq/command" /> <arg value="src/main/java/org/apache/activemq/command" />
<arg value="src/gram/script/GenerateJavaTests.groovy" />
<arg value="src/gram/script/GenerateCSharpClasses.groovy" />
<arg value="src/gram/script/GenerateCSharpMarshalling.groovy" />
<arg value="src/gram/script/GenerateJavaMarshalling.groovy" /> <arg value="src/gram/script/GenerateJavaMarshalling.groovy" />
<arg value="src/gram/script/GenerateJavaTests.groovy" />
<arg value="src/gram/script/GenerateCSharpMarshalling.groovy" />
<arg value="src/gram/script/GenerateCSharpClasses.groovy" />
<arg value="src/gram/script/GenerateCppHeaders.groovy" />
<arg value="src/gram/script/GenerateCppClasses.groovy" />
<arg value="src/gram/script/GenerateCMarshalling.groovy" /> <arg value="src/gram/script/GenerateCMarshalling.groovy" />
</java> </java>

89
activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
View File

@ -30,14 +30,13 @@ public class WireFormatInfo implements Command {
public static final byte DATA_STRUCTURE_TYPE = CommandTypes.WIREFORMAT_INFO; public static final byte DATA_STRUCTURE_TYPE = CommandTypes.WIREFORMAT_INFO;
static final private byte MAGIC[] = new byte[] { 'A', 'c', 't', 'i', 'v', 'e', 'M', 'Q' }; static final private byte MAGIC[] = new byte[] { 'A', 'c', 't', 'i', 'v', 'e', 'M', 'Q' };
static final public long STACK_TRACE_MASK = 0x00000001;
static final public long TCP_NO_DELAY_MASK = 0x00000002;
static final public long CACHE_MASK = 0x00000004;
static final public long COMPRESSION_MASK = 0x00000008;
protected int version; protected int version;
protected byte magic[] = MAGIC; protected byte magic[] = MAGIC;
protected int options;
private boolean stackTraceEnabled;
private boolean tcpNoDelayEnabled;
private boolean cacheEnabled;
private boolean compressionEnabled;
public byte getDataStructureType() { public byte getDataStructureType() {
return DATA_STRUCTURE_TYPE; return DATA_STRUCTURE_TYPE;
@ -114,51 +113,45 @@ public class WireFormatInfo implements Command {
/** /**
* @openwire:property version=1 * @openwire:property version=1
*/ */
public int getOptions() {
return options;
}
public void setOptions(int options) {
this.options = options;
}
public boolean isStackTraceEnabled() {
return (options & STACK_TRACE_MASK) != 0;
}
public void setStackTraceEnabled(boolean enable) {
if (enable) {
options |= STACK_TRACE_MASK;
}
else {
options &= ~STACK_TRACE_MASK;
}
}
public boolean isTcpNoDelayEnabled() {
return (options & TCP_NO_DELAY_MASK) != 0;
}
public void setTcpNoDelayEnabled(boolean enable) {
if (enable) {
options |= TCP_NO_DELAY_MASK;
}
else {
options &= ~TCP_NO_DELAY_MASK;
}
}
public boolean isCacheEnabled() { public boolean isCacheEnabled() {
return (options & CACHE_MASK) != 0; return cacheEnabled;
} }
public void setCacheEnabled(boolean enable) { public void setCacheEnabled(boolean cacheEnabled) {
if (enable) { this.cacheEnabled = cacheEnabled;
options |= CACHE_MASK; }
}
else { /**
options &= ~CACHE_MASK; * @openwire:property version=1
} */
public boolean isCompressionEnabled() {
return compressionEnabled;
}
public void setCompressionEnabled(boolean compressionEnabled) {
this.compressionEnabled = compressionEnabled;
}
/**
* @openwire:property version=1
*/
public boolean isStackTraceEnabled() {
return stackTraceEnabled;
}
public void setStackTraceEnabled(boolean stackTraceEnabled) {
this.stackTraceEnabled = stackTraceEnabled;
}
/**
* @openwire:property version=1
*/
public boolean isTcpNoDelayEnabled() {
return tcpNoDelayEnabled;
}
public void setTcpNoDelayEnabled(boolean tcpNoDelayEnabled) {
this.tcpNoDelayEnabled = tcpNoDelayEnabled;
} }
public Response visit(CommandVisitor visitor) throws Throwable { public Response visit(CommandVisitor visitor) throws Throwable {

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQBytesMessage * Marshalling code for Open Wire Format for ActiveMQBytesMessageMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQDestination * Marshalling code for Open Wire Format for ActiveMQDestinationMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,7 +64,7 @@ public abstract class ActiveMQDestinationMarshaller extends DataStreamMarshaller
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += writeString(info.getPhysicalName(), bs); rc += writeString(info.getPhysicalName(), bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQMapMessage * Marshalling code for Open Wire Format for ActiveMQMapMessageMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQMessage * Marshalling code for Open Wire Format for ActiveMQMessageMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQObjectMessage * Marshalling code for Open Wire Format for ActiveMQObjectMessageMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQQueue * Marshalling code for Open Wire Format for ActiveMQQueueMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQStreamMessage * Marshalling code for Open Wire Format for ActiveMQStreamMessageMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQTempDestination * Marshalling code for Open Wire Format for ActiveMQTempDestinationMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -58,7 +58,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQTempQueue * Marshalling code for Open Wire Format for ActiveMQTempQueueMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQTempTopic * Marshalling code for Open Wire Format for ActiveMQTempTopicMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQTextMessage * Marshalling code for Open Wire Format for ActiveMQTextMessageMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ActiveMQTopic * Marshalling code for Open Wire Format for ActiveMQTopicMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

7
activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for BaseCommand * Marshalling code for Open Wire Format for BaseCommandMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -63,10 +63,9 @@ public abstract class BaseCommandMarshaller extends DataStreamMarshaller {
BaseCommand info = (BaseCommand)o; BaseCommand info = (BaseCommand)o;
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
bs.writeBoolean(info.isResponseRequired());
bs.writeBoolean(info.isResponseRequired());
return rc+2; return rc + 1;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for BrokerId * Marshalling code for Open Wire Format for BrokerIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -79,7 +79,7 @@ public class BrokerIdMarshaller extends DataStreamMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += writeString(info.getValue(), bs); rc += writeString(info.getValue(), bs);
return rc+0; return rc + 0;
} }
/** /**

30
activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for BrokerInfo * Marshalling code for Open Wire Format for BrokerInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,20 +64,20 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
BrokerInfo info = (BrokerInfo)o; BrokerInfo info = (BrokerInfo)o;
info.setBrokerId((org.apache.activemq.command.BrokerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrokerId((BrokerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setBrokerURL(readString(dataIn, bs)); info.setBrokerURL(readString(dataIn, bs));
if( bs.readBoolean() ) { if (bs.readBoolean()) {
short size = dataIn.readShort(); short size = dataIn.readShort();
org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size]; BrokerInfo value[] = new BrokerInfo[size];
for( int i=0; i < size; i++ ) { for( int i=0; i < size; i++ ) {
value[i] = (org.apache.activemq.command.BrokerInfo)unmarsalNestedObject(wireFormat,dataIn, bs); value[i] = (BrokerInfo) unmarsalNestedObject(wireFormat,dataIn, bs);
} }
info.setPeerBrokerInfos(value); info.setPeerBrokerInfos(value);
} else { }
info.setPeerBrokerInfos(null); else {
} info.setPeerBrokerInfos(null);
}
info.setBrokerName(readString(dataIn, bs)); info.setBrokerName(readString(dataIn, bs));
info.setSlaveBroker(bs.readBoolean()); info.setSlaveBroker(bs.readBoolean());
@ -98,7 +98,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller {
rc += writeString(info.getBrokerName(), bs); rc += writeString(info.getBrokerName(), bs);
bs.writeBoolean(info.isSlaveBroker()); bs.writeBoolean(info.isSlaveBroker());
return rc+0; return rc + 0;
} }
/** /**

8
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ConnectionError * Marshalling code for Open Wire Format for ConnectionErrorMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,8 +64,8 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
ConnectionError info = (ConnectionError)o; ConnectionError info = (ConnectionError)o;
info.setException((java.lang.Throwable) unmarsalThrowable(wireFormat, dataIn, bs)); info.setException((Throwable) unmarsalThrowable(wireFormat, dataIn, bs));
info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setConnectionId((ConnectionId) unmarsalNestedObject(wireFormat, dataIn, bs));
} }
@ -81,7 +81,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller {
rc += marshalThrowable(wireFormat, info.getException(), bs); rc += marshalThrowable(wireFormat, info.getException(), bs);
rc += marshal1NestedObject(wireFormat, info.getConnectionId(), bs); rc += marshal1NestedObject(wireFormat, info.getConnectionId(), bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ConnectionId * Marshalling code for Open Wire Format for ConnectionIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -79,7 +79,7 @@ public class ConnectionIdMarshaller extends DataStreamMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += writeString(info.getValue(), bs); rc += writeString(info.getValue(), bs);
return rc+0; return rc + 0;
} }
/** /**

30
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ConnectionInfo * Marshalling code for Open Wire Format for ConnectionInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,22 +64,22 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
ConnectionInfo info = (ConnectionInfo)o; ConnectionInfo info = (ConnectionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setClientId(readString(dataIn, bs)); info.setClientId(readString(dataIn, bs));
info.setPassword(readString(dataIn, bs)); info.setPassword(readString(dataIn, bs));
info.setUserName(readString(dataIn, bs)); info.setUserName(readString(dataIn, bs));
if( bs.readBoolean() ) { if (bs.readBoolean()) {
short size = dataIn.readShort(); short size = dataIn.readShort();
org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; BrokerId value[] = new BrokerId[size];
for( int i=0; i < size; i++ ) { for( int i=0; i < size; i++ ) {
value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
} }
info.setBrokerPath(value); info.setBrokerPath(value);
} else { }
info.setBrokerPath(null); else {
} info.setBrokerPath(null);
}
} }
@ -98,7 +98,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller {
rc += writeString(info.getUserName(), bs); rc += writeString(info.getUserName(), bs);
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs); rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ConsumerId * Marshalling code for Open Wire Format for ConsumerIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -83,7 +83,7 @@ public class ConsumerIdMarshaller extends DataStreamMarshaller {
rc+=marshal1Long(wireFormat, info.getSessionId(), bs); rc+=marshal1Long(wireFormat, info.getSessionId(), bs);
rc+=marshal1Long(wireFormat, info.getValue(), bs); rc+=marshal1Long(wireFormat, info.getValue(), bs);
return rc+0; return rc + 0;
} }
/** /**

38
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ConsumerInfo * Marshalling code for Open Wire Format for ConsumerInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,9 +64,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
ConsumerInfo info = (ConsumerInfo)o; ConsumerInfo info = (ConsumerInfo)o;
info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setBrowser(bs.readBoolean()); info.setBrowser(bs.readBoolean());
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setPrefetchSize(dataIn.readInt()); info.setPrefetchSize(dataIn.readInt());
info.setDispatchAsync(bs.readBoolean()); info.setDispatchAsync(bs.readBoolean());
info.setSelector(readString(dataIn, bs)); info.setSelector(readString(dataIn, bs));
@ -75,18 +75,18 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
info.setExclusive(bs.readBoolean()); info.setExclusive(bs.readBoolean());
info.setRetroactive(bs.readBoolean()); info.setRetroactive(bs.readBoolean());
info.setPriority(dataIn.readByte()); info.setPriority(dataIn.readByte());
if( bs.readBoolean() ) { if (bs.readBoolean()) {
short size = dataIn.readShort(); short size = dataIn.readShort();
org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; BrokerId value[] = new BrokerId[size];
for( int i=0; i < size; i++ ) { for( int i=0; i < size; i++ ) {
value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
} }
info.setBrokerPath(value); info.setBrokerPath(value);
} else { }
info.setBrokerPath(null); else {
} info.setBrokerPath(null);
}
info.setNetworkSubscription(bs.readBoolean()); info.setNetworkSubscription(bs.readBoolean());
} }
@ -103,18 +103,16 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
rc += marshal1CachedObject(wireFormat, info.getConsumerId(), bs); rc += marshal1CachedObject(wireFormat, info.getConsumerId(), bs);
bs.writeBoolean(info.isBrowser()); bs.writeBoolean(info.isBrowser());
rc += marshal1CachedObject(wireFormat, info.getDestination(), bs); rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
bs.writeBoolean(info.isDispatchAsync());
bs.writeBoolean(info.isDispatchAsync());
rc += writeString(info.getSelector(), bs); rc += writeString(info.getSelector(), bs);
rc += writeString(info.getSubcriptionName(), bs); rc += writeString(info.getSubcriptionName(), bs);
bs.writeBoolean(info.isNoLocal()); bs.writeBoolean(info.isNoLocal());
bs.writeBoolean(info.isExclusive()); bs.writeBoolean(info.isExclusive());
bs.writeBoolean(info.isRetroactive()); bs.writeBoolean(info.isRetroactive());
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
bs.writeBoolean(info.isNetworkSubscription()); bs.writeBoolean(info.isNetworkSubscription());
return rc+5; return rc + 2;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ControlCommand * Marshalling code for Open Wire Format for ControlCommandMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -79,7 +79,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += writeString(info.getCommand(), bs); rc += writeString(info.getCommand(), bs);
return rc+0; return rc + 0;
} }
/** /**

28
activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for DataArrayResponse * Marshalling code for Open Wire Format for DataArrayResponseMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,18 +64,18 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
DataArrayResponse info = (DataArrayResponse)o; DataArrayResponse info = (DataArrayResponse)o;
if( bs.readBoolean() ) { if (bs.readBoolean()) {
short size = dataIn.readShort(); short size = dataIn.readShort();
org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size]; DataStructure value[] = new DataStructure[size];
for( int i=0; i < size; i++ ) { for( int i=0; i < size; i++ ) {
value[i] = (org.apache.activemq.command.DataStructure)unmarsalNestedObject(wireFormat,dataIn, bs); value[i] = (DataStructure) unmarsalNestedObject(wireFormat,dataIn, bs);
} }
info.setData(value); info.setData(value);
} else { }
info.setData(null); else {
} info.setData(null);
}
} }
@ -90,7 +90,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += marshalObjectArray(wireFormat, info.getData(), bs); rc += marshalObjectArray(wireFormat, info.getData(), bs);
return rc+0; return rc + 0;
} }
/** /**

6
activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for DataResponse * Marshalling code for Open Wire Format for DataResponseMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,7 +64,7 @@ public class DataResponseMarshaller extends ResponseMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
DataResponse info = (DataResponse)o; DataResponse info = (DataResponse)o;
info.setData((org.apache.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setData((DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
} }
@ -79,7 +79,7 @@ public class DataResponseMarshaller extends ResponseMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += marshal1NestedObject(wireFormat, info.getData(), bs); rc += marshal1NestedObject(wireFormat, info.getData(), bs);
return rc+0; return rc + 0;
} }
/** /**

35
activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for DestinationInfo * Marshalling code for Open Wire Format for DestinationInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,22 +64,22 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
DestinationInfo info = (DestinationInfo)o; DestinationInfo info = (DestinationInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setOperationType(dataIn.readByte()); info.setOperationType(dataIn.readByte());
info.setTimeout(unmarshalLong(wireFormat, dataIn, bs)); info.setTimeout(unmarshalLong(wireFormat, dataIn, bs));
if( bs.readBoolean() ) { if (bs.readBoolean()) {
short size = dataIn.readShort(); short size = dataIn.readShort();
org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; BrokerId value[] = new BrokerId[size];
for( int i=0; i < size; i++ ) { for( int i=0; i < size; i++ ) {
value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
} }
info.setBrokerPath(value); info.setBrokerPath(value);
} else { }
info.setBrokerPath(null); else {
} info.setBrokerPath(null);
}
} }
@ -94,11 +94,10 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs); rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs);
rc += marshal1CachedObject(wireFormat, info.getDestination(), bs); rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
rc+=marshal1Long(wireFormat, info.getTimeout(), bs);
rc+=marshal1Long(wireFormat, info.getTimeout(), bs);
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs); rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
return rc+1; return rc + 1;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for DiscoveryEvent * Marshalling code for Open Wire Format for DiscoveryEventMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -81,7 +81,7 @@ public class DiscoveryEventMarshaller extends DataStreamMarshaller {
rc += writeString(info.getServiceName(), bs); rc += writeString(info.getServiceName(), bs);
rc += writeString(info.getBrokerName(), bs); rc += writeString(info.getBrokerName(), bs);
return rc+0; return rc + 0;
} }
/** /**

6
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ExceptionResponse * Marshalling code for Open Wire Format for ExceptionResponseMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,7 +64,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
ExceptionResponse info = (ExceptionResponse)o; ExceptionResponse info = (ExceptionResponse)o;
info.setException((java.lang.Throwable) unmarsalThrowable(wireFormat, dataIn, bs)); info.setException((Throwable) unmarsalThrowable(wireFormat, dataIn, bs));
} }
@ -79,7 +79,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += marshalThrowable(wireFormat, info.getException(), bs); rc += marshalThrowable(wireFormat, info.getException(), bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for FlushCommand * Marshalling code for Open Wire Format for FlushCommandMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

5
activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for IntegerResponse * Marshalling code for Open Wire Format for IntegerResponseMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -78,8 +78,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc + 1;
return rc+4;
} }
/** /**

8
activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for JournalQueueAck * Marshalling code for Open Wire Format for JournalQueueAckMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,8 +64,8 @@ public class JournalQueueAckMarshaller extends DataStreamMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
JournalQueueAck info = (JournalQueueAck)o; JournalQueueAck info = (JournalQueueAck)o;
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setMessageAck((org.apache.activemq.command.MessageAck) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageAck((MessageAck) unmarsalNestedObject(wireFormat, dataIn, bs));
} }
@ -81,7 +81,7 @@ public class JournalQueueAckMarshaller extends DataStreamMarshaller {
rc += marshal1NestedObject(wireFormat, info.getDestination(), bs); rc += marshal1NestedObject(wireFormat, info.getDestination(), bs);
rc += marshal1NestedObject(wireFormat, info.getMessageAck(), bs); rc += marshal1NestedObject(wireFormat, info.getMessageAck(), bs);
return rc+0; return rc + 0;
} }
/** /**

10
activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for JournalTopicAck * Marshalling code for Open Wire Format for JournalTopicAckMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,12 +64,12 @@ public class JournalTopicAckMarshaller extends DataStreamMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
JournalTopicAck info = (JournalTopicAck)o; JournalTopicAck info = (JournalTopicAck)o;
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setMessageSequenceId(unmarshalLong(wireFormat, dataIn, bs)); info.setMessageSequenceId(unmarshalLong(wireFormat, dataIn, bs));
info.setSubscritionName(readString(dataIn, bs)); info.setSubscritionName(readString(dataIn, bs));
info.setClientId(readString(dataIn, bs)); info.setClientId(readString(dataIn, bs));
info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setTransactionId((TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
} }
@ -89,7 +89,7 @@ public class JournalTopicAckMarshaller extends DataStreamMarshaller {
rc += writeString(info.getClientId(), bs); rc += writeString(info.getClientId(), bs);
rc += marshal1NestedObject(wireFormat, info.getTransactionId(), bs); rc += marshal1NestedObject(wireFormat, info.getTransactionId(), bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for JournalTrace * Marshalling code for Open Wire Format for JournalTraceMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -79,7 +79,7 @@ public class JournalTraceMarshaller extends DataStreamMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += writeString(info.getMessage(), bs); rc += writeString(info.getMessage(), bs);
return rc+0; return rc + 0;
} }
/** /**

9
activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for JournalTransaction * Marshalling code for Open Wire Format for JournalTransactionMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,7 +64,7 @@ public class JournalTransactionMarshaller extends DataStreamMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
JournalTransaction info = (JournalTransaction)o; JournalTransaction info = (JournalTransaction)o;
info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setTransactionId((TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setType(dataIn.readByte()); info.setType(dataIn.readByte());
info.setWasPrepared(bs.readBoolean()); info.setWasPrepared(bs.readBoolean());
@ -80,10 +80,9 @@ public class JournalTransactionMarshaller extends DataStreamMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += marshal1NestedObject(wireFormat, info.getTransactionId(), bs); rc += marshal1NestedObject(wireFormat, info.getTransactionId(), bs);
bs.writeBoolean(info.getWasPrepared());
bs.writeBoolean(info.getWasPrepared());
return rc+1; return rc + 1;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for KeepAliveInfo * Marshalling code for Open Wire Format for KeepAliveInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class KeepAliveInfoMarshaller extends DataStreamMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

6
activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for LocalTransactionId * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -65,7 +65,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller {
LocalTransactionId info = (LocalTransactionId)o; LocalTransactionId info = (LocalTransactionId)o;
info.setValue(unmarshalLong(wireFormat, dataIn, bs)); info.setValue(unmarshalLong(wireFormat, dataIn, bs));
info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
} }
@ -81,7 +81,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller {
rc+=marshal1Long(wireFormat, info.getValue(), bs); rc+=marshal1Long(wireFormat, info.getValue(), bs);
rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs); rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs);
return rc+0; return rc + 0;
} }
/** /**

18
activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for MessageAck * Marshalling code for Open Wire Format for MessageAckMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,12 +64,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
MessageAck info = (MessageAck)o; MessageAck info = (MessageAck)o;
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setTransactionId((TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setAckType(dataIn.readByte()); info.setAckType(dataIn.readByte());
info.setFirstMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setFirstMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setLastMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setLastMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setMessageCount(dataIn.readInt()); info.setMessageCount(dataIn.readInt());
} }
@ -86,12 +86,10 @@ public class MessageAckMarshaller extends BaseCommandMarshaller {
rc += marshal1CachedObject(wireFormat, info.getDestination(), bs); rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
rc += marshal1CachedObject(wireFormat, info.getTransactionId(), bs); rc += marshal1CachedObject(wireFormat, info.getTransactionId(), bs);
rc += marshal1CachedObject(wireFormat, info.getConsumerId(), bs); rc += marshal1CachedObject(wireFormat, info.getConsumerId(), bs);
rc += marshal1NestedObject(wireFormat, info.getFirstMessageId(), bs);
rc += marshal1NestedObject(wireFormat, info.getFirstMessageId(), bs);
rc += marshal1NestedObject(wireFormat, info.getLastMessageId(), bs); rc += marshal1NestedObject(wireFormat, info.getLastMessageId(), bs);
return rc + 2;
return rc+5;
} }
/** /**

11
activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for MessageDispatch * Marshalling code for Open Wire Format for MessageDispatchMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,9 +64,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
MessageDispatch info = (MessageDispatch)o; MessageDispatch info = (MessageDispatch)o;
info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setMessage((org.apache.activemq.command.Message) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessage((Message) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setRedeliveryCounter(dataIn.readInt()); info.setRedeliveryCounter(dataIn.readInt());
} }
@ -84,8 +84,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller {
rc += marshal1CachedObject(wireFormat, info.getDestination(), bs); rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
rc += marshal1NestedObject(wireFormat, info.getMessage(), bs); rc += marshal1NestedObject(wireFormat, info.getMessage(), bs);
return rc + 1;
return rc+4;
} }
/** /**

10
activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for MessageDispatchNotification * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,10 +64,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
MessageDispatchNotification info = (MessageDispatchNotification)o; MessageDispatchNotification info = (MessageDispatchNotification)o;
info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setDeliverySequenceId(unmarshalLong(wireFormat, dataIn, bs)); info.setDeliverySequenceId(unmarshalLong(wireFormat, dataIn, bs));
info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
} }
@ -85,7 +85,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller
rc+=marshal1Long(wireFormat, info.getDeliverySequenceId(), bs); rc+=marshal1Long(wireFormat, info.getDeliverySequenceId(), bs);
rc += marshal1NestedObject(wireFormat, info.getMessageId(), bs); rc += marshal1NestedObject(wireFormat, info.getMessageId(), bs);
return rc+0; return rc + 0;
} }
/** /**

6
activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for MessageId * Marshalling code for Open Wire Format for MessageIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,7 +64,7 @@ public class MessageIdMarshaller extends DataStreamMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
MessageId info = (MessageId)o; MessageId info = (MessageId)o;
info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerId((ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setProducerSequenceId(unmarshalLong(wireFormat, dataIn, bs)); info.setProducerSequenceId(unmarshalLong(wireFormat, dataIn, bs));
info.setBrokerSequenceId(unmarshalLong(wireFormat, dataIn, bs)); info.setBrokerSequenceId(unmarshalLong(wireFormat, dataIn, bs));
@ -83,7 +83,7 @@ public class MessageIdMarshaller extends DataStreamMarshaller {
rc+=marshal1Long(wireFormat, info.getProducerSequenceId(), bs); rc+=marshal1Long(wireFormat, info.getProducerSequenceId(), bs);
rc+=marshal1Long(wireFormat, info.getBrokerSequenceId(), bs); rc+=marshal1Long(wireFormat, info.getBrokerSequenceId(), bs);
return rc+0; return rc + 0;
} }
/** /**

127
activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for Message * Marshalling code for Open Wire Format for MessageMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -52,57 +52,53 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller {
info.beforeUnmarshall(wireFormat); info.beforeUnmarshall(wireFormat);
info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerId((ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setTransactionId((TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setOriginalDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setOriginalTransactionId((TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setGroupID(readString(dataIn, bs)); info.setGroupID(readString(dataIn, bs));
info.setGroupSequence(dataIn.readInt()); info.setGroupSequence(dataIn.readInt());
info.setCorrelationId(readString(dataIn, bs)); info.setCorrelationId(readString(dataIn, bs));
info.setPersistent(bs.readBoolean()); info.setPersistent(bs.readBoolean());
info.setExpiration(unmarshalLong(wireFormat, dataIn, bs)); info.setExpiration(unmarshalLong(wireFormat, dataIn, bs));
info.setPriority(dataIn.readByte()); info.setPriority(dataIn.readByte());
info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs)); info.setReplyTo((ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setTimestamp(unmarshalLong(wireFormat, dataIn, bs)); info.setTimestamp(unmarshalLong(wireFormat, dataIn, bs));
info.setType(readString(dataIn, bs)); info.setType(readString(dataIn, bs));
if( bs.readBoolean() ) {
if( bs.readBoolean() ) { int size = dataIn.readInt();
int size = dataIn.readInt(); byte data[] = new byte[size];
byte data[] = new byte[size]; dataIn.readFully(data);
dataIn.readFully(data); info.setContent(new org.activeio.ByteSequence(data,0,size));
info.setContent(new org.activeio.ByteSequence(data,0,size)); } else {
} else { info.setContent(null);
info.setContent(null); }
} if( bs.readBoolean() ) {
int size = dataIn.readInt();
byte data[] = new byte[size];
if( bs.readBoolean() ) { dataIn.readFully(data);
int size = dataIn.readInt(); info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,size));
byte data[] = new byte[size]; } else {
dataIn.readFully(data); info.setMarshalledProperties(null);
info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,size)); }
} else { info.setDataStructure((DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setMarshalledProperties(null); info.setTargetConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
}
info.setDataStructure((org.apache.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setCompressed(bs.readBoolean()); info.setCompressed(bs.readBoolean());
info.setRedeliveryCounter(dataIn.readInt()); info.setRedeliveryCounter(dataIn.readInt());
if( bs.readBoolean() ) { if (bs.readBoolean()) {
short size = dataIn.readShort(); short size = dataIn.readShort();
org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; BrokerId value[] = new BrokerId[size];
for( int i=0; i < size; i++ ) { for( int i=0; i < size; i++ ) {
value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
} }
info.setBrokerPath(value); info.setBrokerPath(value);
} else { }
info.setBrokerPath(null); else {
} info.setBrokerPath(null);
}
info.setArrival(unmarshalLong(wireFormat, dataIn, bs)); info.setArrival(unmarshalLong(wireFormat, dataIn, bs));
info.setUserID(readString(dataIn, bs)); info.setUserID(readString(dataIn, bs));
info.setRecievedByDFBridge(bs.readBoolean()); info.setRecievedByDFBridge(bs.readBoolean());
@ -129,32 +125,25 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller {
rc += marshal1NestedObject(wireFormat, info.getMessageId(), bs); rc += marshal1NestedObject(wireFormat, info.getMessageId(), bs);
rc += marshal1CachedObject(wireFormat, info.getOriginalTransactionId(), bs); rc += marshal1CachedObject(wireFormat, info.getOriginalTransactionId(), bs);
rc += writeString(info.getGroupID(), bs); rc += writeString(info.getGroupID(), bs);
rc += writeString(info.getCorrelationId(), bs);
rc += writeString(info.getCorrelationId(), bs);
bs.writeBoolean(info.isPersistent()); bs.writeBoolean(info.isPersistent());
rc+=marshal1Long(wireFormat, info.getExpiration(), bs); rc+=marshal1Long(wireFormat, info.getExpiration(), bs);
rc += marshal1NestedObject(wireFormat, info.getReplyTo(), bs);
rc += marshal1NestedObject(wireFormat, info.getReplyTo(), bs);
rc+=marshal1Long(wireFormat, info.getTimestamp(), bs); rc+=marshal1Long(wireFormat, info.getTimestamp(), bs);
rc += writeString(info.getType(), bs); rc += writeString(info.getType(), bs);
bs.writeBoolean(info.getContent()!=null);
bs.writeBoolean(info.getContent()!=null); rc += info.getContent()==null ? 0 : info.getContent().getLength()+4;
rc += info.getContent()==null ? 0 : info.getContent().getLength()+4; bs.writeBoolean(info.getMarshalledProperties()!=null);
rc += info.getMarshalledProperties()==null ? 0 : info.getMarshalledProperties().getLength()+4;
bs.writeBoolean(info.getMarshalledProperties()!=null);
rc += info.getMarshalledProperties()==null ? 0 : info.getMarshalledProperties().getLength()+4;
rc += marshal1NestedObject(wireFormat, info.getDataStructure(), bs); rc += marshal1NestedObject(wireFormat, info.getDataStructure(), bs);
rc += marshal1CachedObject(wireFormat, info.getTargetConsumerId(), bs); rc += marshal1CachedObject(wireFormat, info.getTargetConsumerId(), bs);
bs.writeBoolean(info.isCompressed()); bs.writeBoolean(info.isCompressed());
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
rc+=marshal1Long(wireFormat, info.getArrival(), bs); rc+=marshal1Long(wireFormat, info.getArrival(), bs);
rc += writeString(info.getUserID(), bs); rc += writeString(info.getUserID(), bs);
bs.writeBoolean(info.isRecievedByDFBridge()); bs.writeBoolean(info.isRecievedByDFBridge());
return rc+9; return rc + 3;
} }
/** /**
@ -183,20 +172,16 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller {
marshal2NestedObject(wireFormat, info.getReplyTo(), dataOut, bs); marshal2NestedObject(wireFormat, info.getReplyTo(), dataOut, bs);
marshal2Long(wireFormat, info.getTimestamp(), dataOut, bs); marshal2Long(wireFormat, info.getTimestamp(), dataOut, bs);
writeString(info.getType(), dataOut, bs); writeString(info.getType(), dataOut, bs);
if(bs.readBoolean()) {
if(bs.readBoolean()) { org.activeio.ByteSequence data = info.getContent();
org.activeio.ByteSequence data = info.getContent(); dataOut.writeInt(data.getLength());
dataOut.writeInt(data.getLength()); dataOut.write(data.getData(), data.getOffset(), data.getLength());
dataOut.write(data.getData(), data.getOffset(), data.getLength()); }
} if(bs.readBoolean()) {
org.activeio.ByteSequence data = info.getMarshalledProperties();
dataOut.writeInt(data.getLength());
if(bs.readBoolean()) { dataOut.write(data.getData(), data.getOffset(), data.getLength());
org.activeio.ByteSequence data = info.getMarshalledProperties(); }
dataOut.writeInt(data.getLength());
dataOut.write(data.getData(), data.getOffset(), data.getLength());
}
marshal2NestedObject(wireFormat, info.getDataStructure(), dataOut, bs); marshal2NestedObject(wireFormat, info.getDataStructure(), dataOut, bs);
marshal2CachedObject(wireFormat, info.getTargetConsumerId(), dataOut, bs); marshal2CachedObject(wireFormat, info.getTargetConsumerId(), dataOut, bs);
bs.readBoolean(); bs.readBoolean();

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ProducerId * Marshalling code for Open Wire Format for ProducerIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -83,7 +83,7 @@ public class ProducerIdMarshaller extends DataStreamMarshaller {
rc+=marshal1Long(wireFormat, info.getValue(), bs); rc+=marshal1Long(wireFormat, info.getValue(), bs);
rc+=marshal1Long(wireFormat, info.getSessionId(), bs); rc+=marshal1Long(wireFormat, info.getSessionId(), bs);
return rc+0; return rc + 0;
} }
/** /**

32
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ProducerInfo * Marshalling code for Open Wire Format for ProducerInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,20 +64,20 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
ProducerInfo info = (ProducerInfo)o; ProducerInfo info = (ProducerInfo)o;
info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerId((ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
if( bs.readBoolean() ) { if (bs.readBoolean()) {
short size = dataIn.readShort(); short size = dataIn.readShort();
org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; BrokerId value[] = new BrokerId[size];
for( int i=0; i < size; i++ ) { for( int i=0; i < size; i++ ) {
value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs); value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
} }
info.setBrokerPath(value); info.setBrokerPath(value);
} else { }
info.setBrokerPath(null); else {
} info.setBrokerPath(null);
}
} }
@ -94,7 +94,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller {
rc += marshal1CachedObject(wireFormat, info.getDestination(), bs); rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs); rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
return rc+0; return rc + 0;
} }
/** /**

6
activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for RemoveInfo * Marshalling code for Open Wire Format for RemoveInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,7 +64,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
RemoveInfo info = (RemoveInfo)o; RemoveInfo info = (RemoveInfo)o;
info.setObjectId((org.apache.activemq.command.DataStructure) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setObjectId((DataStructure) unmarsalCachedObject(wireFormat, dataIn, bs));
} }
@ -79,7 +79,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += marshal1CachedObject(wireFormat, info.getObjectId(), bs); rc += marshal1CachedObject(wireFormat, info.getObjectId(), bs);
return rc+0; return rc + 0;
} }
/** /**

6
activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for RemoveSubscriptionInfo * Marshalling code for Open Wire Format for RemoveSubscriptionInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,7 +64,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setSubcriptionName(readString(dataIn, bs)); info.setSubcriptionName(readString(dataIn, bs));
info.setClientId(readString(dataIn, bs)); info.setClientId(readString(dataIn, bs));
@ -83,7 +83,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller {
rc += writeString(info.getSubcriptionName(), bs); rc += writeString(info.getSubcriptionName(), bs);
rc += writeString(info.getClientId(), bs); rc += writeString(info.getClientId(), bs);
return rc+0; return rc + 0;
} }
/** /**

5
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for Response * Marshalling code for Open Wire Format for ResponseMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -78,8 +78,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc + 1;
return rc+2;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for SessionId * Marshalling code for Open Wire Format for SessionIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -81,7 +81,7 @@ public class SessionIdMarshaller extends DataStreamMarshaller {
rc += writeString(info.getConnectionId(), bs); rc += writeString(info.getConnectionId(), bs);
rc+=marshal1Long(wireFormat, info.getValue(), bs); rc+=marshal1Long(wireFormat, info.getValue(), bs);
return rc+0; return rc + 0;
} }
/** /**

6
activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for SessionInfo * Marshalling code for Open Wire Format for SessionInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,7 +64,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
SessionInfo info = (SessionInfo)o; SessionInfo info = (SessionInfo)o;
info.setSessionId((org.apache.activemq.command.SessionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setSessionId((SessionId) unmarsalCachedObject(wireFormat, dataIn, bs));
} }
@ -79,7 +79,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
rc += marshal1CachedObject(wireFormat, info.getSessionId(), bs); rc += marshal1CachedObject(wireFormat, info.getSessionId(), bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for ShutdownInfo * Marshalling code for Open Wire Format for ShutdownInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -73,7 +73,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

6
activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for SubscriptionInfo * Marshalling code for Open Wire Format for SubscriptionInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -65,7 +65,7 @@ public class SubscriptionInfoMarshaller extends DataStreamMarshaller {
SubscriptionInfo info = (SubscriptionInfo)o; SubscriptionInfo info = (SubscriptionInfo)o;
info.setClientId(readString(dataIn, bs)); info.setClientId(readString(dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setSelector(readString(dataIn, bs)); info.setSelector(readString(dataIn, bs));
info.setSubcriptionName(readString(dataIn, bs)); info.setSubcriptionName(readString(dataIn, bs));
@ -85,7 +85,7 @@ public class SubscriptionInfoMarshaller extends DataStreamMarshaller {
rc += writeString(info.getSelector(), bs); rc += writeString(info.getSelector(), bs);
rc += writeString(info.getSubcriptionName(), bs); rc += writeString(info.getSubcriptionName(), bs);
return rc+0; return rc + 0;
} }
/** /**

4
activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for TransactionId * Marshalling code for Open Wire Format for TransactionIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -58,7 +58,7 @@ public abstract class TransactionIdMarshaller extends DataStreamMarshaller {
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
return rc+0; return rc + 0;
} }
/** /**

9
activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for TransactionInfo * Marshalling code for Open Wire Format for TransactionInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -64,8 +64,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller {
super.unmarshal(wireFormat, o, dataIn, bs); super.unmarshal(wireFormat, o, dataIn, bs);
TransactionInfo info = (TransactionInfo)o; TransactionInfo info = (TransactionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs)); info.setTransactionId((TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
info.setType(dataIn.readByte()); info.setType(dataIn.readByte());
} }
@ -82,8 +82,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller {
rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs); rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs);
rc += marshal1CachedObject(wireFormat, info.getTransactionId(), bs); rc += marshal1CachedObject(wireFormat, info.getTransactionId(), bs);
return rc + 1;
return rc+1;
} }
/** /**

30
activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for WireFormatInfo * Marshalling code for Open Wire Format for WireFormatInfoMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -65,13 +65,15 @@ public class WireFormatInfoMarshaller extends DataStreamMarshaller {
WireFormatInfo info = (WireFormatInfo)o; WireFormatInfo info = (WireFormatInfo)o;
{ {
byte data[] = new byte[8]; byte data[] = new byte[8];
dataIn.readFully(data); dataIn.readFully(data);
info.setMagic(data); info.setMagic(data);
} }
info.setVersion(dataIn.readInt()); info.setVersion(dataIn.readInt());
info.setOptions(dataIn.readInt()); info.setCacheEnabled(bs.readBoolean());
info.setCompressionEnabled(bs.readBoolean());
info.setStackTraceEnabled(bs.readBoolean());
info.setTcpNoDelayEnabled(bs.readBoolean());
} }
@ -84,11 +86,12 @@ public class WireFormatInfoMarshaller extends DataStreamMarshaller {
WireFormatInfo info = (WireFormatInfo)o; WireFormatInfo info = (WireFormatInfo)o;
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
bs.writeBoolean(info.isCacheEnabled());
bs.writeBoolean(info.isCompressionEnabled());
bs.writeBoolean(info.isStackTraceEnabled());
bs.writeBoolean(info.isTcpNoDelayEnabled());
return rc+16; return rc + 9;
} }
/** /**
@ -104,7 +107,10 @@ public class WireFormatInfoMarshaller extends DataStreamMarshaller {
WireFormatInfo info = (WireFormatInfo)o; WireFormatInfo info = (WireFormatInfo)o;
dataOut.write(info.getMagic(), 0, 8); dataOut.write(info.getMagic(), 0, 8);
dataOut.writeInt(info.getVersion()); dataOut.writeInt(info.getVersion());
dataOut.writeInt(info.getOptions()); bs.readBoolean();
bs.readBoolean();
bs.readBoolean();
bs.readBoolean();
} }
} }

71
activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.command.*;
/** /**
* Marshalling code for Open Wire Format for XATransactionId * Marshalling code for Open Wire Format for XATransactionIdMarshaller
* *
* *
* NOTE!: This file is auto generated - do not modify! * NOTE!: This file is auto generated - do not modify!
@ -65,28 +65,22 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller {
XATransactionId info = (XATransactionId)o; XATransactionId info = (XATransactionId)o;
info.setFormatId(dataIn.readInt()); info.setFormatId(dataIn.readInt());
{ if( bs.readBoolean() ) {
if( bs.readBoolean() ) { int size = dataIn.readInt();
int size = dataIn.readInt(); byte data[] = new byte[size];
byte data[] = new byte[size]; dataIn.readFully(data);
dataIn.readFully(data); info.setGlobalTransactionId(data);
info.setGlobalTransactionId(data); } else {
} else { info.setGlobalTransactionId(null);
info.setGlobalTransactionId(null);
}
} }
if( bs.readBoolean() ) {
{ int size = dataIn.readInt();
if( bs.readBoolean() ) { byte data[] = new byte[size];
int size = dataIn.readInt(); dataIn.readFully(data);
byte data[] = new byte[size]; info.setBranchQualifier(data);
dataIn.readFully(data); } else {
info.setBranchQualifier(data); info.setBranchQualifier(null);
} else {
info.setBranchQualifier(null);
}
} }
} }
@ -99,17 +93,12 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller {
XATransactionId info = (XATransactionId)o; XATransactionId info = (XATransactionId)o;
int rc = super.marshal1(wireFormat, o, bs); int rc = super.marshal1(wireFormat, o, bs);
bs.writeBoolean(info.getGlobalTransactionId()!=null);
rc += info.getGlobalTransactionId()==null ? 0 : info.getGlobalTransactionId().length+4;
bs.writeBoolean(info.getGlobalTransactionId()!=null); bs.writeBoolean(info.getBranchQualifier()!=null);
rc += info.getGlobalTransactionId()==null ? 0 : info.getGlobalTransactionId().length+4; rc += info.getBranchQualifier()==null ? 0 : info.getBranchQualifier().length+4;
bs.writeBoolean(info.getBranchQualifier()!=null);
rc += info.getBranchQualifier()==null ? 0 : info.getBranchQualifier().length+4;
return rc+4; return rc + 1;
} }
/** /**
@ -124,18 +113,14 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller {
XATransactionId info = (XATransactionId)o; XATransactionId info = (XATransactionId)o;
dataOut.writeInt(info.getFormatId()); dataOut.writeInt(info.getFormatId());
if(bs.readBoolean()) {
if(bs.readBoolean()) { dataOut.writeInt(info.getGlobalTransactionId().length);
dataOut.writeInt(info.getGlobalTransactionId().length); dataOut.write(info.getGlobalTransactionId());
dataOut.write(info.getGlobalTransactionId()); }
} if(bs.readBoolean()) {
dataOut.writeInt(info.getBranchQualifier().length);
dataOut.write(info.getBranchQualifier());
if(bs.readBoolean()) { }
dataOut.writeInt(info.getBranchQualifier().length);
dataOut.write(info.getBranchQualifier());
}
} }
} }

5
activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
View File

@ -51,7 +51,10 @@ public class WireFormatInfoTest extends DataFileGeneratorTestSupport {
super.populateObject(object); super.populateObject(object);
WireFormatInfo info = (WireFormatInfo) object; WireFormatInfo info = (WireFormatInfo) object;
info.setVersion(1); info.setVersion(1);
info.setOptions(2); info.setCacheEnabled(true);
info.setCompressionEnabled(false);
info.setStackTraceEnabled(true);
info.setTcpNoDelayEnabled(false);
} }
} }