diff options
Diffstat (limited to 'src/components/utils')
3 files changed, 116 insertions, 2 deletions
diff --git a/src/components/utils/include/utils/jsoncpp_reader_wrapper.h b/src/components/utils/include/utils/jsoncpp_reader_wrapper.h new file mode 100644 index 0000000000..deebe23cae --- /dev/null +++ b/src/components/utils/include/utils/jsoncpp_reader_wrapper.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2019, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_JSONCPP_READER_WRAPPER_H_ +#define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_JSONCPP_READER_WRAPPER_H_ + +#include <memory> +#include <string> +#include "json/reader.h" + +namespace utils { + +class JsonReader { + public: + JsonReader(); + bool parse(const std::string& json, Json::Value* root); + + private: + std::unique_ptr<Json::CharReader> reader_; + Json::CharReaderBuilder reader_builder_; +}; +} // namespace utils +#endif // SRC_COMPONENTS_UTILS_INCLUDE_UTILS_JSONCPP_READER_WRAPPER_H_ diff --git a/src/components/utils/src/jsoncpp_reader_wrapper.cc b/src/components/utils/src/jsoncpp_reader_wrapper.cc new file mode 100644 index 0000000000..69da386eed --- /dev/null +++ b/src/components/utils/src/jsoncpp_reader_wrapper.cc @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2019, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "utils/jsoncpp_reader_wrapper.h" +#include "utils/logger.h" + +namespace utils { + +CREATE_LOGGERPTR_GLOBAL(logger_, "JsoncppReaderWrapper") + +JsonReader::JsonReader() { + reader_ = std::unique_ptr<Json::CharReader>(reader_builder_.newCharReader()); +} + +bool JsonReader::parse(const std::string& json, Json::Value* root) { + LOG4CXX_AUTO_TRACE(logger_); + JSONCPP_STRING err; + bool is_parsing_ok = false; + const size_t json_len = json.length(); + try { + is_parsing_ok = + reader_->parse(json.c_str(), json.c_str() + json_len, root, &err); + } catch (Json::RuntimeError& e) { + LOG4CXX_DEBUG(logger_, "Exception caught during parse json: " << e.what()); + return false; + } + + if (!is_parsing_ok) { + LOG4CXX_ERROR(logger_, "Json parsing fails: " << err); + } + return is_parsing_ok; +} +} // namespace utils diff --git a/src/components/utils/test/test_generator/CMakeLists.txt b/src/components/utils/test/test_generator/CMakeLists.txt index 5a7f939659..cd4243930a 100644 --- a/src/components/utils/test/test_generator/CMakeLists.txt +++ b/src/components/utils/test/test_generator/CMakeLists.txt @@ -41,8 +41,8 @@ include_directories ( set(XML_NAME ${CMAKE_SOURCE_DIR}/src/components/interfaces/MOBILE_API.xml) add_custom_target(generate_version - COMMAND ${INTEFRACE_GENERATOR_CMD} ${XML_NAME} "mobile_apis" - ${CMAKE_CURRENT_BINARY_DIR} "--parser-type" "sdlrpcv2" + COMMAND ${INTEFRACE_GENERATOR_CMD} "--source-xml" "${XML_NAME}" "--namespace" "mobile_apis" + "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}" "--parser-type" "sdlrpcv2" "-y" DEPENDS ${INTERFACE_GENERATOR_DEPENDENCIES} ${XML_NAME} VERBATIM ) |