Skip to content

Stringify json if value is an object #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GilbertLS wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Stringify json if value is an object #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e731798
Fix to use the correct type on conversion.
engebret Mar 13, 2019
7bf0d5b
Merge pull request #115 from engebret/develop
rnostream Mar 19, 2019
842b8ee
Version bump v1.5.1 -> v1.5.2
rnostream Mar 19, 2019
a5e7594
Globalization support - updated messages
rnostream Feb 13, 2020
53bd7c0
version bump v1.5.2 -> v1.5.3
rnostream Feb 13, 2020
b70e665
Stringify json if value is an object
Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion com.ibm.streamsx.json/impl/include/JsonReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,14 @@ namespace com { namespace ibm { namespace streamsx { namespace json {

if(!value) status = 4;
else if(value->IsNull()) status = 3;
else if(value->IsObject()) {
// Return json string if value is an object
status = 0;
rapidjson::StringBuffer str;
rapidjson::Writer<rapidjson::StringBuffer> writer(str);
value->Accept(writer);
return SPL::rstring(str.GetString());
}
else {
try {
switch (value->GetType()) {
Expand Down Expand Up @@ -1216,4 +1224,3 @@ namespace com { namespace ibm { namespace streamsx { namespace json {
}}}}

/* JSON_READER_H_ */

Empty file modified com.ibm.streamsx.json/impl/java/src/com/ibm/streamsx/json/JsonMessages_de_DE.properties
100755 → 100644
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion com.ibm.streamsx.json/impl/java/src/com/ibm/streamsx/json/JsonMessages_es_ES.properties
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# NLS_MESSAGEFORMAT_VAR
# NLS_ENCODING=UNICODE
SPECIFY_FILE_CONTAINING_JSON=CDIST0950E Especifique un archivo que contenga una serie JSON.
UNABLE_TO_GENERATE_SPL_TYPES=CDIST0951E No se han podido generar tipos SPL
UNABLE_TO_GENERATE_SPL_TYPES=CDIST0951E No se han podido generar los tipos SPL
UNSUPPORTED_TYPE=CDIST0952E Tipo no soportado:
Empty file modified com.ibm.streamsx.json/impl/java/src/com/ibm/streamsx/json/JsonMessages_fr_FR.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified com.ibm.streamsx.json/impl/java/src/com/ibm/streamsx/json/JsonMessages_it_IT.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified com.ibm.streamsx.json/impl/java/src/com/ibm/streamsx/json/JsonMessages_ja_JP.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified com.ibm.streamsx.json/impl/java/src/com/ibm/streamsx/json/JsonMessages_pt_BR.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified com.ibm.streamsx.json/impl/java/src/com/ibm/streamsx/json/JsonMessages_zh_CN.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified com.ibm.streamsx.json/impl/java/src/com/ibm/streamsx/json/JsonMessages_zh_TW.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified ...son/impl/java/src/com/ibm/streamsx/json/converters/JsonConverterMessages_de_DE.properties
100755 → 100644
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion ...son/impl/java/src/com/ibm/streamsx/json/converters/JsonConverterMessages_es_ES.properties
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NLS_MESSAGEFORMAT_VAR
# NLS_ENCODING=UNICODE
UNHANDLED_ARRAY_TYPE=CDIST0953E Tipo de matriz no gestionado: {0}
UNHANDLED_ARRAY_TYPE=CDIST0953E Tipo de matriz no manejado: {0}
ATTRIBUTE_MUST_BE_SPECIFIED=CDIST0954E Se debe especificar el atributo {0}
ATTRIBUTE_MUST_BE_OF_TYPES=CDIST0955E El atributo {0} debe ser uno de los tipos siguientes: {1}

Empty file modified ...son/impl/java/src/com/ibm/streamsx/json/converters/JsonConverterMessages_fr_FR.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified ...son/impl/java/src/com/ibm/streamsx/json/converters/JsonConverterMessages_it_IT.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified ...son/impl/java/src/com/ibm/streamsx/json/converters/JsonConverterMessages_ja_JP.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified ...son/impl/java/src/com/ibm/streamsx/json/converters/JsonConverterMessages_pt_BR.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified ...son/impl/java/src/com/ibm/streamsx/json/converters/JsonConverterMessages_zh_CN.properties
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified ...son/impl/java/src/com/ibm/streamsx/json/converters/JsonConverterMessages_zh_TW.properties
100755 → 100644
View file
Open in desktop
Empty file.
15 changes: 2 additions & 13 deletions com.ibm.streamsx.json/impl/nl/de_DE/JSONResource.xlf
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- begin_generated_IBM_copyright_prolog -->
<!-- -->
<!-- This is an automatically generated copyright prolog. -->
<!-- After initializing, DO NOT MODIFY OR MOVE -->
<!-- **************************************************************** -->
<!-- Licensed Materials - Property of IBM -->
<!-- 5724-Y95 -->
<!-- (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. -->
<!-- US Government Users Restricted Rights - Use, duplication or -->
<!-- disclosure restricted by GSA ADP Schedule Contract with -->
<!-- IBM Corp. -->
<!-- -->
<!-- end_generated_IBM_copyright_prolog -->
<!-- Copyright (C) 2012-2017, International Business Machines Corporation -->
<!-- All Rights Reserved -->
<xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 _path_/xliff-core-1.1.xsd">
Expand Down
15 changes: 2 additions & 13 deletions com.ibm.streamsx.json/impl/nl/es_ES/JSONResource.xlf
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- begin_generated_IBM_copyright_prolog -->
<!-- -->
<!-- This is an automatically generated copyright prolog. -->
<!-- After initializing, DO NOT MODIFY OR MOVE -->
<!-- **************************************************************** -->
<!-- Licensed Materials - Property of IBM -->
<!-- 5724-Y95 -->
<!-- (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. -->
<!-- US Government Users Restricted Rights - Use, duplication or -->
<!-- disclosure restricted by GSA ADP Schedule Contract with -->
<!-- IBM Corp. -->
<!-- -->
<!-- end_generated_IBM_copyright_prolog -->
<!-- Copyright (C) 2012-2017, International Business Machines Corporation -->
<!-- All Rights Reserved -->
<xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 _path_/xliff-core-1.1.xsd">
Expand Down
15 changes: 2 additions & 13 deletions com.ibm.streamsx.json/impl/nl/fr_FR/JSONResource.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- begin_generated_IBM_copyright_prolog -->
<!-- -->
<!-- This is an automatically generated copyright prolog. -->
<!-- After initializing, DO NOT MODIFY OR MOVE -->
<!-- **************************************************************** -->
<!-- Licensed Materials - Property of IBM -->
<!-- 5724-Y95 -->
<!-- (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. -->
<!-- US Government Users Restricted Rights - Use, duplication or -->
<!-- disclosure restricted by GSA ADP Schedule Contract with -->
<!-- IBM Corp. -->
<!-- -->
<!-- end_generated_IBM_copyright_prolog -->
<!-- Copyright (C) 2012-2017, International Business Machines Corporation -->
<!-- All Rights Reserved -->
<xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 _path_/xliff-core-1.1.xsd">
Expand Down
15 changes: 2 additions & 13 deletions com.ibm.streamsx.json/impl/nl/it_IT/JSONResource.xlf
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- begin_generated_IBM_copyright_prolog -->
<!-- -->
<!-- This is an automatically generated copyright prolog. -->
<!-- After initializing, DO NOT MODIFY OR MOVE -->
<!-- **************************************************************** -->
<!-- Licensed Materials - Property of IBM -->
<!-- 5724-Y95 -->
<!-- (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. -->
<!-- US Government Users Restricted Rights - Use, duplication or -->
<!-- disclosure restricted by GSA ADP Schedule Contract with -->
<!-- IBM Corp. -->
<!-- -->
<!-- end_generated_IBM_copyright_prolog -->
<!-- Copyright (C) 2012-2017, International Business Machines Corporation -->
<!-- All Rights Reserved -->
<xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 _path_/xliff-core-1.1.xsd">
Expand Down
15 changes: 2 additions & 13 deletions com.ibm.streamsx.json/impl/nl/ja_JP/JSONResource.xlf
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- begin_generated_IBM_copyright_prolog -->
<!-- -->
<!-- This is an automatically generated copyright prolog. -->
<!-- After initializing, DO NOT MODIFY OR MOVE -->
<!-- **************************************************************** -->
<!-- Licensed Materials - Property of IBM -->
<!-- 5724-Y95 -->
<!-- (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. -->
<!-- US Government Users Restricted Rights - Use, duplication or -->
<!-- disclosure restricted by GSA ADP Schedule Contract with -->
<!-- IBM Corp. -->
<!-- -->
<!-- end_generated_IBM_copyright_prolog -->
<!-- Copyright (C) 2012-2017, International Business Machines Corporation -->
<!-- All Rights Reserved -->
<xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 _path_/xliff-core-1.1.xsd">
Expand Down
15 changes: 2 additions & 13 deletions com.ibm.streamsx.json/impl/nl/pt_BR/JSONResource.xlf
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- begin_generated_IBM_copyright_prolog -->
<!-- -->
<!-- This is an automatically generated copyright prolog. -->
<!-- After initializing, DO NOT MODIFY OR MOVE -->
<!-- **************************************************************** -->
<!-- Licensed Materials - Property of IBM -->
<!-- 5724-Y95 -->
<!-- (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. -->
<!-- US Government Users Restricted Rights - Use, duplication or -->
<!-- disclosure restricted by GSA ADP Schedule Contract with -->
<!-- IBM Corp. -->
<!-- -->
<!-- end_generated_IBM_copyright_prolog -->
<!-- Copyright (C) 2012-2017, International Business Machines Corporation -->
<!-- All Rights Reserved -->
<xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 _path_/xliff-core-1.1.xsd">
Expand Down
15 changes: 2 additions & 13 deletions com.ibm.streamsx.json/impl/nl/zh_CN/JSONResource.xlf
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- begin_generated_IBM_copyright_prolog -->
<!-- -->
<!-- This is an automatically generated copyright prolog. -->
<!-- After initializing, DO NOT MODIFY OR MOVE -->
<!-- **************************************************************** -->
<!-- Licensed Materials - Property of IBM -->
<!-- 5724-Y95 -->
<!-- (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. -->
<!-- US Government Users Restricted Rights - Use, duplication or -->
<!-- disclosure restricted by GSA ADP Schedule Contract with -->
<!-- IBM Corp. -->
<!-- -->
<!-- end_generated_IBM_copyright_prolog -->
<!-- Copyright (C) 2012-2017, International Business Machines Corporation -->
<!-- All Rights Reserved -->
<xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 _path_/xliff-core-1.1.xsd">
Expand Down
15 changes: 2 additions & 13 deletions com.ibm.streamsx.json/impl/nl/zh_TW/JSONResource.xlf
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- begin_generated_IBM_copyright_prolog -->
<!-- -->
<!-- This is an automatically generated copyright prolog. -->
<!-- After initializing, DO NOT MODIFY OR MOVE -->
<!-- **************************************************************** -->
<!-- Licensed Materials - Property of IBM -->
<!-- 5724-Y95 -->
<!-- (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. -->
<!-- US Government Users Restricted Rights - Use, duplication or -->
<!-- disclosure restricted by GSA ADP Schedule Contract with -->
<!-- IBM Corp. -->
<!-- -->
<!-- end_generated_IBM_copyright_prolog -->
<!-- Copyright (C) 2012-2017, International Business Machines Corporation -->
<!-- All Rights Reserved -->
<xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 _path_/xliff-core-1.1.xsd">
Expand Down
2 changes: 1 addition & 1 deletion com.ibm.streamsx.json/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ them subscribe to the stream of JSON objects.
The toolkit supports optional types. For detailed information have a look
at the separate items of this toolkit.
</info:description>
<info:version>1.5.1</info:version>
<info:version>1.5.3</info:version>
<info:requiredProductVersion>4.3.0</info:requiredProductVersion>
</info:identity>
<info:dependencies/>
Expand Down
2 changes: 1 addition & 1 deletion samples/JSONToTupleConvert/com.ibm.streamsx.json.sample.jtot/SimpleConversion.spl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public composite SimpleJsonConvert {
//Read and parse the json into a SPL tuple
//Note that the [JSONTuTuple] operator will match the tuple attributes
//to their respective JSON ones. Attribute names have to match exactly
stream<Json> ParsedS = JSONToTuple(JsonS) {
stream<JsonType> ParsedS = JSONToTuple(JsonS) {
}

() as SinkOp = Custom(ParsedS) {
Expand Down