Merge pull request #4133 from mitza-oci/typesupport-data-conversions

Extend JSON data conversions via TypeSupport

Author: jrw972

dds/DCPS/TypeSupportImpl.cpp

@@ -209,10 +209,12 @@ void TypeSupportImpl::get_type_from_type_lookup_service()
 }
 #endif
 
-struct JsonRepresentationFormatImpl : JsonRepresentationFormat {
+struct JsonRepresentationFormatImpl
+  : JsonRepresentationFormat, PoolAllocationBase {
 };
 
-struct CdrRepresentationFormatImpl : CdrRepresentationFormat {
+struct CdrRepresentationFormatImpl
+  : CdrRepresentationFormat, PoolAllocationBase {
   CdrRepresentationFormatImpl(DDS::DataRepresentationId_t)
   {}
 };

dds/idl/ts_generator.cpp

@@ -401,42 +401,68 @@ bool ts_generator::generate_ts(AST_Decl* node, UTL_ScopedName* name)
       "  }\n"
       "#else\n"
       "  ACE_UNUSED_ARG(in);\n"
-      "  ACE_UNUSED_ARG(out);\n"
       "  ACE_UNUSED_ARG(format);\n"
       "#endif\n"
+      "  out = \"\";\n"
       "  return ::DDS::RETCODE_UNSUPPORTED;\n"
       "}\n\n"
       "::DDS::ReturnCode_t " << ts_short_name << "TypeSupportImpl::encode_to_bytes(const " << short_name << "& in, ::DDS::OctetSeq_out out, OpenDDS::DCPS::RepresentationFormat* format)\n"
       "{\n"
+      "#if OPENDDS_HAS_JSON_VALUE_WRITER\n"
+      "  OpenDDS::DCPS::JsonRepresentationFormat_var jrf = OpenDDS::DCPS::JsonRepresentationFormat::_narrow(format);\n"
+      "  if (jrf) {\n"
+      "    CORBA::String_var buffer;\n"
+      "    const ::DDS::ReturnCode_t ret = encode_to_string(in, buffer, format);\n"
+      "    const ::DDS::UInt32 len = static_cast< ::DDS::UInt32>(std::strlen(buffer));\n"
+      "    out = new ::DDS::OctetSeq(len);\n"
+      "    out->length(len);\n"
+      "    std::memcpy(out->get_buffer(), buffer, len);\n"
+      "    return ::DDS::RETCODE_OK;\n"
+      "  }\n"
+      "#else\n"
       "  ACE_UNUSED_ARG(in);\n"
-      "  ACE_UNUSED_ARG(out);\n"
       "  ACE_UNUSED_ARG(format);\n"
+      "#endif\n"
+      "  out = new ::DDS::OctetSeq();\n"
       "  return ::DDS::RETCODE_UNSUPPORTED;\n"
       "}\n\n"
       "::DDS::ReturnCode_t " << ts_short_name << "TypeSupportImpl::decode_from_string(const char* in, " << short_name << "_out " <<
       (alloc_out ? "out" : "param") << ", OpenDDS::DCPS::RepresentationFormat* format)\n"
-      "{\n"
+      "{\n";
+
+    if (alloc_out) {
+      be_global->impl_ << "  out = new " << short_name << ";\n";
+    } else {
+      be_global->impl_ <<  "  " << short_name << "* out = &param;\n";
+    }
+
+    be_global->impl_ <<
+      "  OpenDDS::DCPS::set_default(*out);\n"
       "#if OPENDDS_HAS_JSON_VALUE_READER\n"
       "  OpenDDS::DCPS::JsonRepresentationFormat_var jrf = OpenDDS::DCPS::JsonRepresentationFormat::_narrow(format);\n"
       "  if (jrf) {\n"
       "    rapidjson::StringStream buffer(in);\n"
       "    OpenDDS::DCPS::JsonValueReader<> jvr(buffer);\n" <<
-      (alloc_out ? "    out = new " + short_name + ";\n" : "    " + short_name + "* out = &param;\n") <<
-      "    OpenDDS::DCPS::set_default(*out);\n"
       "    return vread(jvr, *out) ? ::DDS::RETCODE_OK : ::DDS::RETCODE_ERROR;\n"
       "  }\n"
       "#else\n"
       "  ACE_UNUSED_ARG(in);\n"
-      "  ACE_UNUSED_ARG(" << (alloc_out ? "out" : "param") << ");\n"
       "  ACE_UNUSED_ARG(format);\n"
       "#endif\n"
       "  return ::DDS::RETCODE_UNSUPPORTED;\n"
       "}\n\n"
       "::DDS::ReturnCode_t " << ts_short_name << "TypeSupportImpl::decode_from_bytes(const ::DDS::OctetSeq& in, " << short_name << "_out out, OpenDDS::DCPS::RepresentationFormat* format)\n"
       "{\n"
+      "#if OPENDDS_HAS_JSON_VALUE_READER\n"
+      "  OpenDDS::DCPS::JsonRepresentationFormat_var jrf = OpenDDS::DCPS::JsonRepresentationFormat::_narrow(format);\n"
+      "  if (jrf) {\n"
+      "    return decode_from_string(reinterpret_cast<const char*>(in.get_buffer()), out, format);\n"
+      "  }\n"
+      "#else\n"
       "  ACE_UNUSED_ARG(in);\n"
-      "  ACE_UNUSED_ARG(out);\n"
       "  ACE_UNUSED_ARG(format);\n"
+      "#endif\n"
+      "  out = " << (alloc_out ? "new " : "") << short_name << "();\n"
       "  return ::DDS::RETCODE_UNSUPPORTED;\n"
       "}\n\n"
       << ts_short_name << "TypeSupport::_ptr_type " << ts_short_name << "TypeSupportImpl::_narrow(CORBA::Object_ptr obj)\n"

java/tests/vread_vwrite/VreadVwrite.java

@@ -29,5 +29,40 @@ public static void main(String[] args) throws Exception {
             System.out.println("ERROR: round-trip JSON doesn't match: " + holder.value);
             System.exit(1);
         }
+
+        DDS.OctetSeqHolder bytesHolder = new DDS.OctetSeqHolder();
+        ret = ts.encode_to_bytes(sample.value, bytesHolder, format);
+        if (ret != DDS.RETCODE_OK.value) {
+            System.out.println("ERROR: encode_to_bytes failed " + ret);
+            System.exit(1);
+        }
+
+        String bytesAsString = new String(bytesHolder.value, StandardCharsets.ISO_8859_1);
+        if (bytesAsString.length() != holder.value.length()) {
+            System.out.println("ERROR: byte[].length " + bytesAsString.length() + " doesn't match String: " + holder.value.length());
+            System.exit(1);
+        }
+        if (!bytesAsString.equals(holder.value)) {
+            System.out.println("ERROR: byte[] " + bytesAsString + " doesn't match String: " + holder.value);
+            System.exit(1);
+        }
+
+        SampleHolder sample2 = new SampleHolder();
+        ret = ts.decode_from_bytes(bytesHolder.value, sample2, format);
+        if (ret != DDS.RETCODE_OK.value) {
+            System.out.println("ERROR: decode_from_bytes failed " + ret);
+            System.exit(1);
+        }
+
+        StringHolder holder2 = new StringHolder();
+        ret = ts.encode_to_string(sample2.value, holder2, format);
+        if (ret != DDS.RETCODE_OK.value) {
+            System.out.println("ERROR: encode_to_string (sample2) failed " + ret);
+            System.exit(1);
+        }
+        if (!holder.value.equals(holder2.value)) {
+            System.out.println("ERROR: direct to string and byte[] to sample to string don't match");
+            System.exit(1);
+        }
     }
 }

tests/DCPS/Compiler/vread_vwrite/VreadVwriteTest.cpp

@@ -21,13 +21,24 @@ TEST(VreadVwriteTest, ParseTest)
   Mod::SampleTypeSupport_var ts = new Mod::SampleTypeSupportImpl;
   OpenDDS::DCPS::RepresentationFormat_var format = ts->make_format(OpenDDS::DCPS::JSON_DATA_REPRESENTATION);
   Mod::Sample_var samplev;
-  ASSERT_EQ(ts->decode_from_string(stream.str().c_str(), samplev, format), DDS::RETCODE_OK);
-  Mod::Sample& sample = *samplev;
+  std::string as_string = stream.str();
+  ASSERT_EQ(ts->decode_from_string(as_string.c_str(), samplev, format), DDS::RETCODE_OK);
+  const Mod::Sample sample = *samplev;
+
+  const unsigned int len = static_cast<unsigned int>(as_string.size());
+  DDS::OctetSeq octets(len, len, reinterpret_cast<unsigned char*>(&as_string[0]));
+  ASSERT_EQ(ts->decode_from_bytes(octets, samplev, format), DDS::RETCODE_OK);
+  const Mod::Sample sample2 = *samplev;
+  // sample2 should be exactly the same as sample, a few of the members are checked below
 
   ASSERT_EQ(sample.id, 5);
+  ASSERT_EQ(sample2.id, 5);
   ASSERT_EQ(std::string(sample.data.in()), "The most rapid of JSONs");
+  ASSERT_EQ(std::string(sample2.data.in()), "The most rapid of JSONs");
   ASSERT_EQ(sample.enu, Mod::three);
+  ASSERT_EQ(sample2.enu, Mod::three);
   ASSERT_EQ(sample.enu2, Mod::two);
+  ASSERT_EQ(sample2.enu2, Mod::two);
   ASSERT_EQ(sample.bt.o, 129);
 #if OPENDDS_HAS_EXPLICIT_INTS
   ASSERT_EQ(sample.bt.u8, 130);
@@ -166,6 +177,12 @@ TEST(VreadVwriteTest, SerializeTest)
   CORBA::String_var buffer;
   ASSERT_EQ(DDS::RETCODE_OK, ts->encode_to_string(sample, buffer, format));
 
+  DDS::OctetSeq_var bytes;
+  ASSERT_EQ(DDS::RETCODE_OK, ts->encode_to_bytes(sample, bytes, format));
+  const unsigned int n = bytes->length();
+  ASSERT_EQ(n, std::strlen(buffer));
+  ASSERT_EQ(0, std::memcmp(buffer.in(), bytes->get_buffer(), n));
+
   // Then parse.
   rapidjson::Document document;
   document.Parse(buffer.in());