update

Author: lperron

ortools/util/BUILD.bazel

@@ -349,7 +349,6 @@ cc_library(
     srcs = ["file_util.cc"],
     hdrs = ["file_util.h"],
     deps = [
-        "//ortools/base",
         "//ortools/base:file",
         "//ortools/base:gzipstring",
         "//ortools/base:recordio",
@@ -475,10 +474,10 @@ cc_library(
     deps = [
         "//ortools/base:intops",
         "//ortools/base:linked_hash_map",
-        "//ortools/base:logging",
         "@abseil-cpp//absl/base:core_headers",
         "@abseil-cpp//absl/base:nullability",
         "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/log:check",
         "@abseil-cpp//absl/synchronization",
     ],
 )

ortools/util/file_util.cc

@@ -31,15 +31,11 @@
 #include "ortools/base/file.h"
 #include "ortools/base/gzipstring.h"
 #include "ortools/base/helpers.h"
-#include "ortools/base/logging.h"
 #include "ortools/base/options.h"
 #include "ortools/base/status_macros.h"
 
 namespace operations_research {
 
-using google::protobuf::util::JsonParseOptions;
-using google::protobuf::util::JsonStringToMessage;
-
 absl::StatusOr<std::string> ReadFileToString(absl::string_view filename) {
   std::string contents;
   RETURN_IF_ERROR(file::GetContents(filename, &contents, file::Defaults()));
@@ -119,7 +115,7 @@ absl::Status StringToProto(absl::string_view data,
   }
   std::string json_error;
   absl::Status json_status =
-      JsonStringToMessage(data, proto, JsonParseOptions());
+      ::google::protobuf::util::JsonStringToMessage(data, proto);
   if (json_status.ok()) {
     // NOTE(user): We protect against the JSON proto3 parser being very lenient
     // and easily accepting any JSON as a valid JSON for our proto: if the
@@ -164,34 +160,30 @@ absl::Status WriteProtoToFile(absl::string_view filename,
       }
       break;
     case ProtoWriteFormat::kJson: {
-      google::protobuf::util::JsonPrintOptions options;
+      google::protobuf::json::PrintOptions options;
       options.add_whitespace = true;
-#if PROTOBUF_VERSION >= 5026000  // Version 26.0.0
+      options.unquote_int64_if_possible = true;
       options.always_print_fields_with_no_presence = true;
-#else
-      options.always_print_primitive_fields = true;
-#endif
       options.preserve_proto_field_names = true;
-      if (!google::protobuf::util::MessageToJsonString(proto, &output_string,
+      if (!google::protobuf::json::MessageToJsonString(proto, &output_string,
                                                        options)
                .ok()) {
-        LOG(WARNING) << "Printing to stream failed.";
-        return make_error("google::protobuf::util::MessageToJsonString()");
+        return make_error("google::protobuf::json::MessageToJsonString()");
       }
       file_type_suffix = ".json";
       break;
     }
-    case ProtoWriteFormat::kCanonicalJson:
+    case ProtoWriteFormat::kCanonicalJson: {
       google::protobuf::util::JsonPrintOptions options;
       options.add_whitespace = true;
       if (!google::protobuf::util::MessageToJsonString(proto, &output_string,
                                                        options)
                .ok()) {
-        LOG(WARNING) << "Printing to stream failed.";
         return make_error("google::protobuf::util::MessageToJsonString()");
       }
       file_type_suffix = ".json";
       break;
+    }
   }
   if (gzipped) {
     std::string gzip_string;

ortools/util/solve_interrupter.cc

@@ -19,9 +19,8 @@
 
 #include "absl/base/nullability.h"
 #include "absl/functional/any_invocable.h"
+#include "absl/log/check.h"
 #include "absl/synchronization/mutex.h"
-#include "ortools/base/linked_hash_map.h"
-#include "ortools/base/logging.h"
 
 namespace operations_research {