Switch to use absl::string_view when accepting JSON strings for parsing.

PiperOrigin-RevId: 491953185
google · Nov 30, 2022 · 0f15c80 · 0f15c80
1 parent eb53e7c
commit 0f15c80
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/cc/google/fhir/json/json_sax_handler.cc b/cc/google/fhir/json/json_sax_handler.cc
@@ -312,7 +312,7 @@ class JsonSaxHandler {
 } // namespace
 
 absl::Status ParseJsonValue(
- const std::string& raw_json, FhirJson& json_value) {
+ const absl::string_view raw_json, FhirJson& json_value) {
  JsonSaxHandler sax_handler(&json_value);
 
  if (nlohmann::json::sax_parse(raw_json, &sax_handler)) {

diff --git a/cc/google/fhir/json/json_sax_handler.h b/cc/google/fhir/json/json_sax_handler.h
@@ -18,7 +18,8 @@
 #include <memory>
 #include <string>
 
-#include "absl/status/statusor.h"
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "google/fhir/json/fhir_json.h"
 
 namespace google {
@@ -28,7 +29,7 @@ namespace internal {
 // Parse input string into FhirJson, returns error if `raw_json` is not
 // well-formatted.
 absl::Status ParseJsonValue(
- const std::string& raw_json, FhirJson& json_value);
+ absl::string_view raw_json, FhirJson& json_value);
 
 } // namespace internal
 } // namespace fhir

diff --git a/cc/google/fhir/json_format.h b/cc/google/fhir/json_format.h
@@ -22,6 +22,7 @@
 
 #include "google/protobuf/message.h"
 #include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "google/fhir/error_reporter.h"
 #include "google/fhir/json/fhir_json.h"
@@ -46,7 +47,7 @@ class Parser {
  // For reading JSON into a new resource, it is recommended to use
  // JsonFhirStringToProto or JsonFhirStringToProtoWithoutValidating.
  ::absl::StatusOr<ParseResult> MergeJsonFhirStringIntoProto(
- const std::string& raw_json, google::protobuf::Message* target,
+ absl::string_view raw_json, google::protobuf::Message* target,
  absl::TimeZone default_timezone, const bool validate,
  ErrorHandler& error_handler) const;
 
@@ -66,7 +67,7 @@ class Parser {
  // timezone for timelike data that does not specify timezone.
  template <typename R>
  ::absl::StatusOr<R> JsonFhirStringToProto(
- const std::string& raw_json, const absl::TimeZone default_timezone,
+ absl::string_view raw_json, const absl::TimeZone default_timezone,
  ErrorHandler& error_handler) const {
  R resource;
  RETURN_IF_ERROR(MergeJsonFhirStringIntoProto(
@@ -81,7 +82,7 @@ class Parser {
  // Takes a default timezone for timelike data that does not specify timezone.
  template <typename R>
  ::absl::StatusOr<R> JsonFhirStringToProtoWithoutValidating(
- const std::string& raw_json, const absl::TimeZone default_timezone,
+ absl::string_view raw_json, const absl::TimeZone default_timezone,
  ErrorHandler& error_handler) const {
  R resource;
  RETURN_IF_ERROR(MergeJsonFhirStringIntoProto(

diff --git a/cc/google/fhir/json_parser.cc b/cc/google/fhir/json_parser.cc
@@ -535,7 +535,7 @@ class Parser {
 } // namespace internal
 
 absl::StatusOr<ParseResult> Parser::MergeJsonFhirStringIntoProto(
- const std::string& raw_json, Message* target,
+ const absl::string_view raw_json, Message* target,
  const absl::TimeZone default_timezone, const bool validate,
  ErrorHandler& error_handler) const {
  internal::FhirJson json_object;

diff --git a/cc/google/fhir/r4/json_format.cc b/cc/google/fhir/r4/json_format.cc
@@ -45,7 +45,7 @@ const Printer* GetPrinter() {
 
 } // namespace
 
-absl::Status MergeJsonFhirStringIntoProto(const std::string& raw_json,
+absl::Status MergeJsonFhirStringIntoProto(const absl::string_view raw_json,
  google::protobuf::Message* target,
  absl::TimeZone default_timezone,
  const bool validate,

diff --git a/cc/google/fhir/r4/json_format.h b/cc/google/fhir/r4/json_format.h
@@ -21,6 +21,7 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "google/fhir/error_reporter.h"
 #include "google/fhir/json/fhir_json.h"
@@ -34,7 +35,7 @@ namespace r4 {
 // See cc/google/fhir/json_format.h for documentation on these methods
 
 absl::Status MergeJsonFhirStringIntoProto(
- const std::string& raw_json, google::protobuf::Message* target,
+ absl::string_view raw_json, google::protobuf::Message* target,
  absl::TimeZone default_timezone, const bool validate,
  ErrorHandler& error_handler = FailFastErrorHandler::FailOnErrorOrFatal());
 
@@ -46,7 +47,7 @@ absl::Status MergeJsonFhirObjectIntoProto(
 
 template <typename R>
 absl::StatusOr<R> JsonFhirStringToProto(
- const std::string& raw_json, const absl::TimeZone default_timezone,
+ absl::string_view raw_json, const absl::TimeZone default_timezone,
  ErrorHandler& error_handler = FailFastErrorHandler::FailOnErrorOrFatal()) {
  R resource;
  FHIR_RETURN_IF_ERROR(MergeJsonFhirStringIntoProto(
@@ -67,7 +68,7 @@ absl::StatusOr<R> JsonFhirObjectToProto(
 
 template <typename R>
 absl::StatusOr<R> JsonFhirStringToProtoWithoutValidating(
- const std::string& raw_json, const absl::TimeZone default_timezone) {
+ absl::string_view raw_json, const absl::TimeZone default_timezone) {
  R resource;
 
  // This uses a "Fail On Fatal Only" error handler, meaning it will succeed on

diff --git a/cc/google/fhir/stu3/BUILD b/cc/google/fhir/stu3/BUILD
@@ -128,6 +128,7 @@ cc_library(
  "//cc/google/fhir/status:statusor",
  "@com_google_absl//absl/status",
  "@com_google_absl//absl/status:statusor",
+ "@com_google_absl//absl/strings",
  ],
 )
 

diff --git a/cc/google/fhir/stu3/json_format.cc b/cc/google/fhir/stu3/json_format.cc
@@ -44,7 +44,7 @@ const Printer* GetPrinter() {
 
 } // namespace
 
-absl::Status MergeJsonFhirStringIntoProto(const std::string& raw_json,
+absl::Status MergeJsonFhirStringIntoProto(const absl::string_view raw_json,
  google::protobuf::Message* target,
  absl::TimeZone default_timezone,
  const bool validate,

diff --git a/cc/google/fhir/stu3/json_format.h b/cc/google/fhir/stu3/json_format.h
@@ -20,6 +20,7 @@
 #include <string>
 
 #include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "google/fhir/error_reporter.h"
 #include "google/fhir/json_format.h"
 #include "google/fhir/status/status.h"
@@ -32,13 +33,13 @@ namespace stu3 {
 // See cc/google/fhir/json_format.h for documentation on these methods
 
 absl::Status MergeJsonFhirStringIntoProto(
- const std::string& raw_json, google::protobuf::Message* target,
+ absl::string_view raw_json, google::protobuf::Message* target,
  absl::TimeZone default_timezone, const bool validate,
  ErrorHandler& error_handler = FailFastErrorHandler::FailOnErrorOrFatal());
 
 template <typename R>
 absl::StatusOr<R> JsonFhirStringToProto(
- const std::string& raw_json, const absl::TimeZone default_timezone,
+ absl::string_view raw_json, const absl::TimeZone default_timezone,
  ErrorHandler& error_handler = FailFastErrorHandler::FailOnErrorOrFatal()) {
  R resource;
  FHIR_RETURN_IF_ERROR(MergeJsonFhirStringIntoProto(
@@ -48,7 +49,7 @@ absl::StatusOr<R> JsonFhirStringToProto(
 
 template <typename R>
 absl::StatusOr<R> JsonFhirStringToProtoWithoutValidating(
- const std::string& raw_json, const absl::TimeZone default_timezone,
+ absl::string_view raw_json, const absl::TimeZone default_timezone,
  ErrorHandler& error_handler = FailFastErrorHandler::FailOnErrorOrFatal()) {
  R resource;
  FHIR_RETURN_IF_ERROR(MergeJsonFhirStringIntoProto(