You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2015/12/01 20:17:46 UTC
[27/41] activemq-openwire git commit: OPENWIRE-19
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/DestinationInfoMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/DestinationInfoMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/DestinationInfoMarshaller.java
deleted file mode 100644
index e19d6c3..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/DestinationInfoMarshaller.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.BrokerId;
-import org.apache.activemq.openwire.commands.ConnectionId;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.DestinationInfo;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-
-public class DestinationInfoMarshaller extends BaseCommandMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return DestinationInfo.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new DestinationInfo();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- DestinationInfo info = (DestinationInfo) o;
- info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setDestination((OpenWireDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setOperationType(dataIn.readByte());
- info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs));
-
- if (bs.readBoolean()) {
- short size = dataIn.readShort();
- BrokerId value[] = new BrokerId[size];
- for (int i = 0; i < size; i++) {
- value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat, dataIn, bs);
- }
- info.setBrokerPath(value);
- } else {
- info.setBrokerPath(null);
- }
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- DestinationInfo info = (DestinationInfo) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
- rc += tightMarshalLong1(wireFormat, info.getTimeout(), bs);
- rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
-
- return rc + 1;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- DestinationInfo info = (DestinationInfo) o;
- tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
- tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
- dataOut.writeByte(info.getOperationType());
- tightMarshalLong2(wireFormat, info.getTimeout(), dataOut, bs);
- tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- DestinationInfo info = (DestinationInfo) o;
- info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setDestination((OpenWireDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setOperationType(dataIn.readByte());
- info.setTimeout(looseUnmarshalLong(wireFormat, dataIn));
-
- if (dataIn.readBoolean()) {
- short size = dataIn.readShort();
- BrokerId value[] = new BrokerId[size];
- for (int i = 0; i < size; i++) {
- value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat, dataIn);
- }
- info.setBrokerPath(value);
- } else {
- info.setBrokerPath(null);
- }
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- DestinationInfo info = (DestinationInfo) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
- looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
- dataOut.writeByte(info.getOperationType());
- looseMarshalLong(wireFormat, info.getTimeout(), dataOut);
- looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/DiscoveryEventMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/DiscoveryEventMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/DiscoveryEventMarshaller.java
deleted file mode 100644
index 15af7c2..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/DiscoveryEventMarshaller.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BaseDataStreamMarshaller;
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.DiscoveryEvent;
-
-public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return DiscoveryEvent.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new DiscoveryEvent();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- DiscoveryEvent info = (DiscoveryEvent) o;
- info.setServiceName(tightUnmarshalString(dataIn, bs));
- info.setBrokerName(tightUnmarshalString(dataIn, bs));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- DiscoveryEvent info = (DiscoveryEvent) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalString1(info.getServiceName(), bs);
- rc += tightMarshalString1(info.getBrokerName(), bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- DiscoveryEvent info = (DiscoveryEvent) o;
- tightMarshalString2(info.getServiceName(), dataOut, bs);
- tightMarshalString2(info.getBrokerName(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- DiscoveryEvent info = (DiscoveryEvent) o;
- info.setServiceName(looseUnmarshalString(dataIn));
- info.setBrokerName(looseUnmarshalString(dataIn));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- DiscoveryEvent info = (DiscoveryEvent) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalString(info.getServiceName(), dataOut);
- looseMarshalString(info.getBrokerName(), dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/ExceptionResponseMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/ExceptionResponseMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/ExceptionResponseMarshaller.java
deleted file mode 100644
index e6caa70..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/ExceptionResponseMarshaller.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.ExceptionResponse;
-
-public class ExceptionResponseMarshaller extends ResponseMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return ExceptionResponse.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new ExceptionResponse();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- ExceptionResponse info = (ExceptionResponse) o;
- info.setException(tightUnmarsalThrowable(wireFormat, dataIn, bs));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- ExceptionResponse info = (ExceptionResponse) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalThrowable1(wireFormat, info.getException(), bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- ExceptionResponse info = (ExceptionResponse) o;
- tightMarshalThrowable2(wireFormat, info.getException(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- ExceptionResponse info = (ExceptionResponse) o;
- info.setException(looseUnmarsalThrowable(wireFormat, dataIn));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- ExceptionResponse info = (ExceptionResponse) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalThrowable(wireFormat, info.getException(), dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/FlushCommandMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/FlushCommandMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/FlushCommandMarshaller.java
deleted file mode 100644
index 503b24e..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/FlushCommandMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.FlushCommand;
-
-public class FlushCommandMarshaller extends BaseCommandMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return FlushCommand.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new FlushCommand();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- int rc = super.tightMarshal1(wireFormat, o, bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- super.looseMarshal(wireFormat, o, dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/IntegerResponseMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/IntegerResponseMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/IntegerResponseMarshaller.java
deleted file mode 100644
index f01e94b..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/IntegerResponseMarshaller.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.IntegerResponse;
-
-public class IntegerResponseMarshaller extends ResponseMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return IntegerResponse.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new IntegerResponse();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- IntegerResponse info = (IntegerResponse) o;
- info.setResult(dataIn.readInt());
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- int rc = super.tightMarshal1(wireFormat, o, bs);
- return rc + 4;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- IntegerResponse info = (IntegerResponse) o;
- dataOut.writeInt(info.getResult());
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- IntegerResponse info = (IntegerResponse) o;
- info.setResult(dataIn.readInt());
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- IntegerResponse info = (IntegerResponse) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- dataOut.writeInt(info.getResult());
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalQueueAckMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalQueueAckMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalQueueAckMarshaller.java
deleted file mode 100644
index 6c0a59d..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalQueueAckMarshaller.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BaseDataStreamMarshaller;
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.JournalQueueAck;
-import org.apache.activemq.openwire.commands.MessageAck;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-
-public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return JournalQueueAck.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new JournalQueueAck();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- JournalQueueAck info = (JournalQueueAck) o;
- info.setDestination((OpenWireDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- info.setMessageAck((MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- JournalQueueAck info = (JournalQueueAck) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getDestination(), bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getMessageAck(), bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- JournalQueueAck info = (JournalQueueAck) o;
- tightMarshalNestedObject2(wireFormat, info.getDestination(), dataOut, bs);
- tightMarshalNestedObject2(wireFormat, info.getMessageAck(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- JournalQueueAck info = (JournalQueueAck) o;
- info.setDestination((OpenWireDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
- info.setMessageAck((MessageAck) looseUnmarsalNestedObject(wireFormat, dataIn));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- JournalQueueAck info = (JournalQueueAck) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalNestedObject(wireFormat, info.getDestination(), dataOut);
- looseMarshalNestedObject(wireFormat, info.getMessageAck(), dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTopicAckMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTopicAckMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTopicAckMarshaller.java
deleted file mode 100644
index ff0d8e1..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTopicAckMarshaller.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BaseDataStreamMarshaller;
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.JournalTopicAck;
-import org.apache.activemq.openwire.commands.MessageId;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-import org.apache.activemq.openwire.commands.TransactionId;
-
-public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return JournalTopicAck.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new JournalTopicAck();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- JournalTopicAck info = (JournalTopicAck) o;
- info.setDestination((OpenWireDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- info.setMessageSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
- info.setSubscritionName(tightUnmarshalString(dataIn, bs));
- info.setClientId(tightUnmarshalString(dataIn, bs));
- info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- JournalTopicAck info = (JournalTopicAck) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getDestination(), bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
- rc += tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs);
- rc += tightMarshalString1(info.getSubscritionName(), bs);
- rc += tightMarshalString1(info.getClientId(), bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getTransactionId(), bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- JournalTopicAck info = (JournalTopicAck) o;
- tightMarshalNestedObject2(wireFormat, info.getDestination(), dataOut, bs);
- tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
- tightMarshalLong2(wireFormat, info.getMessageSequenceId(), dataOut, bs);
- tightMarshalString2(info.getSubscritionName(), dataOut, bs);
- tightMarshalString2(info.getClientId(), dataOut, bs);
- tightMarshalNestedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- JournalTopicAck info = (JournalTopicAck) o;
- info.setDestination((OpenWireDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
- info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
- info.setMessageSequenceId(looseUnmarshalLong(wireFormat, dataIn));
- info.setSubscritionName(looseUnmarshalString(dataIn));
- info.setClientId(looseUnmarshalString(dataIn));
- info.setTransactionId((TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- JournalTopicAck info = (JournalTopicAck) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalNestedObject(wireFormat, info.getDestination(), dataOut);
- looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
- looseMarshalLong(wireFormat, info.getMessageSequenceId(), dataOut);
- looseMarshalString(info.getSubscritionName(), dataOut);
- looseMarshalString(info.getClientId(), dataOut);
- looseMarshalNestedObject(wireFormat, info.getTransactionId(), dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTraceMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTraceMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTraceMarshaller.java
deleted file mode 100644
index 8df50f5..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTraceMarshaller.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BaseDataStreamMarshaller;
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.JournalTrace;
-
-public class JournalTraceMarshaller extends BaseDataStreamMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return JournalTrace.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new JournalTrace();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- JournalTrace info = (JournalTrace) o;
- info.setMessage(tightUnmarshalString(dataIn, bs));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- JournalTrace info = (JournalTrace) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalString1(info.getMessage(), bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- JournalTrace info = (JournalTrace) o;
- tightMarshalString2(info.getMessage(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- JournalTrace info = (JournalTrace) o;
- info.setMessage(looseUnmarshalString(dataIn));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- JournalTrace info = (JournalTrace) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalString(info.getMessage(), dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTransactionMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTransactionMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTransactionMarshaller.java
deleted file mode 100644
index b6545e1..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/JournalTransactionMarshaller.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BaseDataStreamMarshaller;
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.JournalTransaction;
-import org.apache.activemq.openwire.commands.TransactionId;
-
-public class JournalTransactionMarshaller extends BaseDataStreamMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return JournalTransaction.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new JournalTransaction();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- JournalTransaction info = (JournalTransaction) o;
- info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- info.setType(dataIn.readByte());
- info.setWasPrepared(bs.readBoolean());
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- JournalTransaction info = (JournalTransaction) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getTransactionId(), bs);
- bs.writeBoolean(info.getWasPrepared());
-
- return rc + 1;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- JournalTransaction info = (JournalTransaction) o;
- tightMarshalNestedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
- dataOut.writeByte(info.getType());
- bs.readBoolean();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- JournalTransaction info = (JournalTransaction) o;
- info.setTransactionId((TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
- info.setType(dataIn.readByte());
- info.setWasPrepared(dataIn.readBoolean());
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- JournalTransaction info = (JournalTransaction) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalNestedObject(wireFormat, info.getTransactionId(), dataOut);
- dataOut.writeByte(info.getType());
- dataOut.writeBoolean(info.getWasPrepared());
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/KeepAliveInfoMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/KeepAliveInfoMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/KeepAliveInfoMarshaller.java
deleted file mode 100644
index df792db..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/KeepAliveInfoMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.KeepAliveInfo;
-
-public class KeepAliveInfoMarshaller extends BaseCommandMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return KeepAliveInfo.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new KeepAliveInfo();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- int rc = super.tightMarshal1(wireFormat, o, bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- super.looseMarshal(wireFormat, o, dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/LastPartialCommandMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/LastPartialCommandMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/LastPartialCommandMarshaller.java
deleted file mode 100644
index dab3a3a..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/LastPartialCommandMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.LastPartialCommand;
-
-public class LastPartialCommandMarshaller extends PartialCommandMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return LastPartialCommand.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new LastPartialCommand();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- int rc = super.tightMarshal1(wireFormat, o, bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- super.looseMarshal(wireFormat, o, dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/LocalTransactionIdMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/LocalTransactionIdMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/LocalTransactionIdMarshaller.java
deleted file mode 100644
index 4697ffd..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/LocalTransactionIdMarshaller.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.ConnectionId;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.LocalTransactionId;
-
-public class LocalTransactionIdMarshaller extends TransactionIdMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return LocalTransactionId.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new LocalTransactionId();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- LocalTransactionId info = (LocalTransactionId) o;
- info.setValue(tightUnmarshalLong(wireFormat, dataIn, bs));
- info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- LocalTransactionId info = (LocalTransactionId) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalLong1(wireFormat, info.getValue(), bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- LocalTransactionId info = (LocalTransactionId) o;
- tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs);
- tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- LocalTransactionId info = (LocalTransactionId) o;
- info.setValue(looseUnmarshalLong(wireFormat, dataIn));
- info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- LocalTransactionId info = (LocalTransactionId) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalLong(wireFormat, info.getValue(), dataOut);
- looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MarshallerFactory.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MarshallerFactory.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MarshallerFactory.java
deleted file mode 100644
index 2bea307..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MarshallerFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import org.apache.activemq.openwire.codec.DataStreamMarshaller;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-
-public class MarshallerFactory {
-
- /**
- * Creates a Map of command type -> Marshallers
- */
- static final private DataStreamMarshaller marshaller[] = new DataStreamMarshaller[256];
- static {
-
- add(new OpenWireBlobMessageMarshaller());
- add(new OpenWireBytesMessageMarshaller());
- add(new OpenWireMapMessageMarshaller());
- add(new OpenWireMessageMarshaller());
- add(new OpenWireObjectMessageMarshaller());
- add(new OpenWireQueueMarshaller());
- add(new OpenWireStreamMessageMarshaller());
- add(new OpenWireTempQueueMarshaller());
- add(new OpenWireTempTopicMarshaller());
- add(new OpenWireTextMessageMarshaller());
- add(new OpenWireTopicMarshaller());
- add(new BrokerIdMarshaller());
- add(new BrokerInfoMarshaller());
- add(new ConnectionControlMarshaller());
- add(new ConnectionErrorMarshaller());
- add(new ConnectionIdMarshaller());
- add(new ConnectionInfoMarshaller());
- add(new ConsumerControlMarshaller());
- add(new ConsumerIdMarshaller());
- add(new ConsumerInfoMarshaller());
- add(new ControlCommandMarshaller());
- add(new DataArrayResponseMarshaller());
- add(new DataResponseMarshaller());
- add(new DestinationInfoMarshaller());
- add(new DiscoveryEventMarshaller());
- add(new ExceptionResponseMarshaller());
- add(new FlushCommandMarshaller());
- add(new IntegerResponseMarshaller());
- add(new JournalQueueAckMarshaller());
- add(new JournalTopicAckMarshaller());
- add(new JournalTraceMarshaller());
- add(new JournalTransactionMarshaller());
- add(new KeepAliveInfoMarshaller());
- add(new LastPartialCommandMarshaller());
- add(new LocalTransactionIdMarshaller());
- add(new MessageAckMarshaller());
- add(new MessageDispatchMarshaller());
- add(new MessageDispatchNotificationMarshaller());
- add(new MessageIdMarshaller());
- add(new MessagePullMarshaller());
- add(new NetworkBridgeFilterMarshaller());
- add(new PartialCommandMarshaller());
- add(new ProducerAckMarshaller());
- add(new ProducerIdMarshaller());
- add(new ProducerInfoMarshaller());
- add(new RemoveInfoMarshaller());
- add(new RemoveSubscriptionInfoMarshaller());
- add(new ReplayCommandMarshaller());
- add(new ResponseMarshaller());
- add(new SessionIdMarshaller());
- add(new SessionInfoMarshaller());
- add(new ShutdownInfoMarshaller());
- add(new SubscriptionInfoMarshaller());
- add(new TransactionInfoMarshaller());
- add(new WireFormatInfoMarshaller());
- add(new XATransactionIdMarshaller());
- }
-
- static private void add(DataStreamMarshaller dsm) {
- marshaller[dsm.getDataStructureType()] = dsm;
- }
-
- static public DataStreamMarshaller[] createMarshallerMap(OpenWireFormat wireFormat) {
- return marshaller;
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageAckMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageAckMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageAckMarshaller.java
deleted file mode 100644
index b1010b8..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageAckMarshaller.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.ConsumerId;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.MessageAck;
-import org.apache.activemq.openwire.commands.MessageId;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-import org.apache.activemq.openwire.commands.TransactionId;
-
-public class MessageAckMarshaller extends BaseCommandMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return MessageAck.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new MessageAck();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- MessageAck info = (MessageAck) o;
- info.setDestination((OpenWireDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setAckType(dataIn.readByte());
- info.setFirstMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- info.setLastMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- info.setMessageCount(dataIn.readInt());
- info.setPoisonCause(tightUnmarsalThrowable(wireFormat, dataIn, bs));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- MessageAck info = (MessageAck) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getFirstMessageId(), bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getLastMessageId(), bs);
- rc += tightMarshalThrowable1(wireFormat, info.getPoisonCause(), bs);
-
- return rc + 5;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- MessageAck info = (MessageAck) o;
- tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
- tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
- tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
- dataOut.writeByte(info.getAckType());
- tightMarshalNestedObject2(wireFormat, info.getFirstMessageId(), dataOut, bs);
- tightMarshalNestedObject2(wireFormat, info.getLastMessageId(), dataOut, bs);
- dataOut.writeInt(info.getMessageCount());
- tightMarshalThrowable2(wireFormat, info.getPoisonCause(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- MessageAck info = (MessageAck) o;
- info.setDestination((OpenWireDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setAckType(dataIn.readByte());
- info.setFirstMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
- info.setLastMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
- info.setMessageCount(dataIn.readInt());
- info.setPoisonCause(looseUnmarsalThrowable(wireFormat, dataIn));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- MessageAck info = (MessageAck) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
- looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut);
- looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
- dataOut.writeByte(info.getAckType());
- looseMarshalNestedObject(wireFormat, info.getFirstMessageId(), dataOut);
- looseMarshalNestedObject(wireFormat, info.getLastMessageId(), dataOut);
- dataOut.writeInt(info.getMessageCount());
- looseMarshalThrowable(wireFormat, info.getPoisonCause(), dataOut);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageDispatchMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageDispatchMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageDispatchMarshaller.java
deleted file mode 100644
index 0409116..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageDispatchMarshaller.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.ConsumerId;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.Message;
-import org.apache.activemq.openwire.commands.MessageDispatch;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-
-public class MessageDispatchMarshaller extends BaseCommandMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return MessageDispatch.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new MessageDispatch();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- MessageDispatch info = (MessageDispatch) o;
- info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setDestination((OpenWireDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setMessage((Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- info.setRedeliveryCounter(dataIn.readInt());
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- MessageDispatch info = (MessageDispatch) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getMessage(), bs);
-
- return rc + 4;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- MessageDispatch info = (MessageDispatch) o;
- tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
- tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
- tightMarshalNestedObject2(wireFormat, info.getMessage(), dataOut, bs);
- dataOut.writeInt(info.getRedeliveryCounter());
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- MessageDispatch info = (MessageDispatch) o;
- info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setDestination((OpenWireDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setMessage((Message) looseUnmarsalNestedObject(wireFormat, dataIn));
- info.setRedeliveryCounter(dataIn.readInt());
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- MessageDispatch info = (MessageDispatch) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
- looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
- looseMarshalNestedObject(wireFormat, info.getMessage(), dataOut);
- dataOut.writeInt(info.getRedeliveryCounter());
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageDispatchNotificationMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageDispatchNotificationMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageDispatchNotificationMarshaller.java
deleted file mode 100644
index 7003b3b..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v11/MessageDispatchNotificationMarshaller.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.openwire.codec.v11;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.ConsumerId;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.MessageDispatchNotification;
-import org.apache.activemq.openwire.commands.MessageId;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-
-public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller {
-
- /**
- * Return the type of Data Structure we marshal
- *
- * @return short representation of the type data structure
- */
- @Override
- public byte getDataStructureType() {
- return MessageDispatchNotification.DATA_STRUCTURE_TYPE;
- }
-
- /**
- * @return a new object instance
- */
- @Override
- public DataStructure createObject() {
- return new MessageDispatchNotification();
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
- super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
- MessageDispatchNotification info = (MessageDispatchNotification) o;
- info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setDestination((OpenWireDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setDeliverySequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
- info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
- MessageDispatchNotification info = (MessageDispatchNotification) o;
-
- int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
- rc += tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
-
- return rc + 0;
- }
-
- /**
- * Write a object instance to data output stream
- *
- * @param o
- * the instance to be marshaled
- * @param dataOut
- * the output stream
- * @throws IOException
- * thrown if an error occurs
- */
- @Override
- public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
- super.tightMarshal2(wireFormat, o, dataOut, bs);
-
- MessageDispatchNotification info = (MessageDispatchNotification) o;
- tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
- tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
- tightMarshalLong2(wireFormat, info.getDeliverySequenceId(), dataOut, bs);
- tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
- }
-
- /**
- * Un-marshal an object instance from the data input stream
- *
- * @param o
- * the object to un-marshal
- * @param dataIn
- * the data input stream to build the object from
- * @throws IOException
- */
- @Override
- public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
- super.looseUnmarshal(wireFormat, o, dataIn);
-
- MessageDispatchNotification info = (MessageDispatchNotification) o;
- info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setDestination((OpenWireDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setDeliverySequenceId(looseUnmarshalLong(wireFormat, dataIn));
- info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
- }
-
- /**
- * Write the booleans that this object uses to a BooleanStream
- */
- @Override
- public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
- MessageDispatchNotification info = (MessageDispatchNotification) o;
-
- super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
- looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
- looseMarshalLong(wireFormat, info.getDeliverySequenceId(), dataOut);
- looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
- }
-}