Updates fhir-examples repo to use proto import spellings from FhirPro…

…to v0.6.0

PiperOrigin-RevId: 334947806

cc/google/fhir_examples/BUILD

@@ -13,7 +13,7 @@ cc_library(
         "@com_google_absl//absl/time",
         "@com_google_fhir//cc/google/fhir/r4:json_format",
         "@com_google_fhir//cc/google/fhir/status:statusor",
-        "@com_google_fhir//proto/r4/core/resources:patient_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_cc_proto",
     ],
 )
 
@@ -23,7 +23,7 @@ cc_binary(
     deps = [
         ":example_utils",
         "@com_google_fhir//cc/google/fhir/r4:json_format",
-        "@com_google_fhir//proto/r4/core/resources:patient_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_cc_proto",
     ],
 )
 
@@ -36,8 +36,8 @@ cc_binary(
         "@com_google_fhir//cc/google/fhir/r4:profiles",
         "@com_google_fhir//cc/google/fhir/r4:resource_validation",
         "@com_google_fhir//cc/google/fhir/status",
-        "@com_google_fhir//proto/r4:uscore_cc_proto",
-        "@com_google_fhir//proto/r4/core/resources:patient_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4:uscore_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_cc_proto",
     ],
 )
 
@@ -49,8 +49,8 @@ cc_binary(
         "//proto/google/fhir_examples/myprofile:myprofile_cc_proto",
         "@com_google_fhir//cc/google/fhir:json_format",
         "@com_google_fhir//cc/google/fhir/r4:profiles",
-        "@com_google_fhir//proto/r4:uscore_cc_proto",
-        "@com_google_fhir//proto/r4/core:datatypes_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4:uscore_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core:datatypes_cc_proto",
     ],
 )
 
@@ -62,8 +62,8 @@ cc_binary(
         "@com_google_fhir//cc/google/fhir/r4:json_format",
         "@com_google_fhir//cc/google/fhir/r4:resource_validation",
         "@com_google_fhir//cc/google/fhir/status",
-        "@com_google_fhir//proto/r4:uscore_cc_proto",
-        "@com_google_fhir//proto/r4/core/resources:patient_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4:uscore_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_cc_proto",
     ],
 )
 
@@ -75,6 +75,6 @@ cc_binary(
         "//proto/google/fhir_examples/myprofile:myprofile_cc_proto",
         "@com_google_fhir//cc/google/fhir:json_format",
         "@com_google_fhir//cc/google/fhir/r4:profiles",
-        "@com_google_fhir//proto/r4/core/resources:patient_cc_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_cc_proto",
     ],
 )

cc/google/fhir_examples/example_utils.h

@@ -23,7 +23,7 @@
 #include "absl/time/time.h"
 #include "google/fhir/r4/json_format.h"
 #include "google/fhir/status/statusor.h"
-#include "proto/r4/core/resources/patient.pb.h"
+#include "proto/google/fhir/proto/r4/core/resources/patient.pb.h"
 
 namespace fhir_examples {
 

cc/google/fhir_examples/parse_patients.cc

@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "google/fhir/r4/json_format.h"
-#include "proto/r4/core/resources/patient.pb.h"
+#include "proto/google/fhir/proto/r4/core/resources/patient.pb.h"
 #include "google/fhir_examples/example_utils.h"
 
 using std::string;

cc/google/fhir_examples/print_to_analytic_ndjson.cc

@@ -20,7 +20,7 @@
 
 #include "google/fhir/json_format.h"
 #include "google/fhir/r4/profiles.h"
-#include "proto/r4/core/resources/patient.pb.h"
+#include "proto/google/fhir/proto/r4/core/resources/patient.pb.h"
 #include "google/fhir_examples/example_utils.h"
 #include "proto/google/fhir_examples/myprofile/myprofile.pb.h"
 

cc/google/fhir_examples/profile_patients_to_custom_profile.cc

@@ -19,8 +19,8 @@
 
 #include "google/fhir/json_format.h"
 #include "google/fhir/r4/profiles.h"
-#include "proto/r4/core/datatypes.pb.h"
-#include "proto/r4/uscore.pb.h"
+#include "proto/google/fhir/proto/r4/core/datatypes.pb.h"
+#include "proto/google/fhir/proto/r4/uscore.pb.h"
 #include "google/fhir_examples/example_utils.h"
 #include "proto/google/fhir_examples/myprofile/myprofile.pb.h"
 

cc/google/fhir_examples/profile_patients_to_uscore.cc

@@ -21,8 +21,8 @@
 #include "google/fhir/r4/profiles.h"
 #include "google/fhir/r4/resource_validation.h"
 #include "google/fhir/status/status.h"
-#include "proto/r4/core/resources/patient.pb.h"
-#include "proto/r4/uscore.pb.h"
+#include "proto/google/fhir/proto/r4/core/resources/patient.pb.h"
+#include "proto/google/fhir/proto/r4/uscore.pb.h"
 #include "google/fhir_examples/example_utils.h"
 
 using std::string;

cc/google/fhir_examples/validate_patients.cc

@@ -23,8 +23,8 @@
 #include "google/fhir/r4/json_format.h"
 #include "google/fhir/r4/resource_validation.h"
 #include "google/fhir/status/status.h"
-#include "proto/r4/core/resources/patient.pb.h"
-#include "proto/r4/uscore.pb.h"
+#include "proto/google/fhir/proto/r4/core/resources/patient.pb.h"
+#include "proto/google/fhir/proto/r4/uscore.pb.h"
 #include "google/fhir_examples/example_utils.h"
 
 using std::string;

go/google/fhir_examples/BUILD

@@ -11,6 +11,6 @@ go_binary(
     srcs = ["parse_patients.go"],
     deps = [
         "@com_google_fhir//go/jsonformat",
-        "@com_google_fhir//proto/r4/core/resources:bundle_and_contained_resource_go_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_go_proto",
     ],
 )

go/google/fhir_examples/parse_patients.go

@@ -33,7 +33,7 @@ import (
 
 	"github.com/google/fhir/go/jsonformat"
 
-	r4pb "google/fhir/proto/r4/core/resources/bundle_and_contained_resource_go_proto"
+	r4pb "proto/google/fhir/proto/r4/core/resources/bundle_and_contained_resource_go_proto"
 )
 
 const (

java/BUILD

@@ -15,7 +15,7 @@ java_binary(
     main_class = "com.google.fhirexamples.ParsePatients",
     deps = [
         "@com_google_fhir//java:json_format",
-        "@com_google_fhir//proto/r4/core/resources:patient_java_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_java_proto",
     ],
 )
 
@@ -27,7 +27,7 @@ java_binary(
         ":example_utils",
         "@com_google_fhir//java:common",
         "@com_google_fhir//java:resource_validator",
-        "@com_google_fhir//proto/r4/core/resources:patient_java_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_java_proto",
     ],
 )
 

proto/google/fhir_examples/myprofile/BUILD

@@ -10,8 +10,8 @@ licenses(["notice"])
 gen_fhir_definitions_and_protos(
     name = "myprofile",
     additional_proto_imports = [
-        "proto/r4/uscore.proto",
-        "proto/r4/uscore_codes.proto",
+        "proto/google/fhir/proto/r4/uscore.proto",
+        "proto/google/fhir/proto/r4/uscore_codes.proto",
     ],
     extensions = [
         "extensions.prototxt",
@@ -29,12 +29,12 @@ fhir_proto_library(
     ],
     proto_deps = [
         "@com_google_protobuf//:any_proto",
-        "@com_google_fhir//proto:annotations_proto",
-        "@com_google_fhir//proto/r4:uscore_codes_proto",
-        "@com_google_fhir//proto/r4:uscore_proto",
-        "@com_google_fhir//proto/r4/core:codes_proto",
-        "@com_google_fhir//proto/r4/core:datatypes_proto",
-        "@com_google_fhir//proto/r4/core:extensions_proto",
+        "@com_google_fhir//proto/google/fhir/proto:annotations_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4:uscore_codes_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4:uscore_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core:codes_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core:datatypes_proto",
+        "@com_google_fhir//proto/google/fhir/proto/r4/core:extensions_proto",
     ],
     proto_library_prefix = "myprofile",
 )

proto/google/fhir_examples/myprofile/myprofile.proto

@@ -3,11 +3,11 @@ syntax = "proto3";
 package fhirexamples.myprofile;
 
 import "google/protobuf/any.proto";
-import "proto/annotations.proto";
-import "proto/r4/core/codes.proto";
-import "proto/r4/core/datatypes.proto";
-import "proto/r4/uscore.proto";
-import "proto/r4/uscore_codes.proto";
+import "proto/google/fhir/proto/annotations.proto";
+import "proto/google/fhir/proto/r4/core/codes.proto";
+import "proto/google/fhir/proto/r4/core/datatypes.proto";
+import "proto/google/fhir/proto/r4/uscore.proto";
+import "proto/google/fhir/proto/r4/uscore_codes.proto";
 
 option java_multiple_files = true;
 option java_package = "com.mycompany.fhirexamples.myprofile";