QPID-2489 - Remove references to boost:: and qpid::framing:: from QMF-generated cpp files

Added a wrapper class for framing::Buffer in the qpid::management namespace.  This wrapper class
has no reference to framing or boost and is now used in the generated C++ code to encode
QMFv1 content.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@932236 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 109 insertions, 0 deletions

diff --git a/cpp/include/qpid/amqp_0_10/Codecs.h b/cpp/include/qpid/amqp_0_10/Codecs.h
index 62370a0e5e..08275402fc 100644
--- a/cpp/include/qpid/amqp_0_10/Codecs.h
+++ b/cpp/include/qpid/amqp_0_10/Codecs.h
@@ -40,6 +40,7 @@ class QPID_COMMON_EXTERN MapCodec
     typedef qpid::types::Variant::Map ObjectType;
     static void encode(const ObjectType&, std::string&);
     static void decode(const std::string&, ObjectType&);
+    static size_t encodedSize(const ObjectType&);
     static const std::string contentType;
   private:
 };
@@ -54,6 +55,7 @@ class QPID_COMMON_EXTERN ListCodec
     typedef qpid::types::Variant::List ObjectType;
     static void encode(const ObjectType&, std::string&);
     static void decode(const std::string&, ObjectType&);
+    static size_t encodedSize(const ObjectType&);
     static const std::string contentType;
   private:
 };
diff --git a/cpp/include/qpid/framing/Buffer.h b/cpp/include/qpid/framing/Buffer.h
index 50cc6fefe4..04583433c5 100644
--- a/cpp/include/qpid/framing/Buffer.h
+++ b/cpp/include/qpid/framing/Buffer.h
@@ -75,6 +75,7 @@ class Buffer
     QPID_COMMON_EXTERN uint32_t available() { return size - position; }
     QPID_COMMON_EXTERN uint32_t getSize() { return size; }
     QPID_COMMON_EXTERN uint32_t getPosition() { return position; }
+    QPID_COMMON_EXTERN void setPosition(uint32_t p) { position = p; }
     QPID_COMMON_EXTERN Iterator getIterator() { return Iterator(*this); }
     QPID_COMMON_EXTERN char* getPointer() { return data; }
 
diff --git a/cpp/include/qpid/management/Buffer.h b/cpp/include/qpid/management/Buffer.h
new file mode 100644
index 0000000000..81710171f5
--- /dev/null
+++ b/cpp/include/qpid/management/Buffer.h
@@ -0,0 +1,106 @@
+#ifndef _Management_Buffer_
+#define _Management_Buffer_
+/*
+ * 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.
+ *
+ */
+#include "qpid/Exception.h"
+#include "qpid/CommonImportExport.h"
+#include "qpid/types/Variant.h"
+#include <string>
+
+namespace qpid {
+namespace framing {
+    class Buffer;
+}
+
+namespace management {
+
+struct OutOfBounds : qpid::Exception {
+    OutOfBounds() : qpid::Exception(std::string("Out of Bounds")) {}
+};
+
+
+/**
+ * This class is a wrapper around qpid::framing::Buffer that does not include any dependencies
+ * from boost or from qpid::framing.
+ */
+class Buffer
+{
+public:
+    QPID_COMMON_EXTERN Buffer(char* data=0, uint32_t size=0);
+    QPID_COMMON_EXTERN ~Buffer();
+
+    QPID_COMMON_EXTERN void record();
+    QPID_COMMON_EXTERN void restore(bool reRecord = false);
+    QPID_COMMON_EXTERN void reset();
+
+    QPID_COMMON_EXTERN uint32_t available();
+    QPID_COMMON_EXTERN uint32_t getSize();
+    QPID_COMMON_EXTERN uint32_t getPosition();
+    QPID_COMMON_EXTERN char* getPointer();
+
+    QPID_COMMON_EXTERN void putOctet(uint8_t i);
+    QPID_COMMON_EXTERN void putShort(uint16_t i);
+    QPID_COMMON_EXTERN void putLong(uint32_t i);
+    QPID_COMMON_EXTERN void putLongLong(uint64_t i);
+    QPID_COMMON_EXTERN void putInt8(int8_t i);
+    QPID_COMMON_EXTERN void putInt16(int16_t i);
+    QPID_COMMON_EXTERN void putInt32(int32_t i);
+    QPID_COMMON_EXTERN void putInt64(int64_t i);
+    QPID_COMMON_EXTERN void putFloat(float f);
+    QPID_COMMON_EXTERN void putDouble(double f);
+    QPID_COMMON_EXTERN void putBin128(const uint8_t* b);
+
+    QPID_COMMON_EXTERN uint8_t  getOctet();
+    QPID_COMMON_EXTERN uint16_t getShort();
+    QPID_COMMON_EXTERN uint32_t getLong();
+    QPID_COMMON_EXTERN uint64_t getLongLong();
+    QPID_COMMON_EXTERN int8_t   getInt8();
+    QPID_COMMON_EXTERN int16_t  getInt16();
+    QPID_COMMON_EXTERN int32_t  getInt32();
+    QPID_COMMON_EXTERN int64_t  getInt64();
+    QPID_COMMON_EXTERN float    getFloat();
+    QPID_COMMON_EXTERN double   getDouble();
+
+    QPID_COMMON_EXTERN void putShortString(const std::string& s);
+    QPID_COMMON_EXTERN void putMediumString(const std::string& s);
+    QPID_COMMON_EXTERN void putLongString(const std::string& s);
+    QPID_COMMON_EXTERN void getShortString(std::string& s);
+    QPID_COMMON_EXTERN void getMediumString(std::string& s);
+    QPID_COMMON_EXTERN void getLongString(std::string& s);
+    QPID_COMMON_EXTERN void getBin128(uint8_t* b);
+
+    QPID_COMMON_EXTERN void putMap(const types::Variant::Map& map);
+    QPID_COMMON_EXTERN void putList(const types::Variant::List& list);
+    QPID_COMMON_EXTERN void getMap(types::Variant::Map& map);
+    QPID_COMMON_EXTERN void getList(types::Variant::List& list);
+
+    QPID_COMMON_EXTERN void putRawData(const std::string& s);
+    QPID_COMMON_EXTERN void getRawData(std::string& s, uint32_t size);
+
+    QPID_COMMON_EXTERN void putRawData(const uint8_t* data, size_t size);
+    QPID_COMMON_EXTERN void getRawData(uint8_t* data, size_t size);
+
+private:
+    framing::Buffer* impl;
+};
+
+}} // namespace qpid::management
+
+#endif