Skip to content

Commit

Permalink
FhirProto Java has grown beyond a single BUILD file. Moves to per-dir…
Browse files Browse the repository at this point in the history
…ectory BUILD files. To avoid long and redundant paths, collapses:

`@com_google_fhirproto//java/src/main/java` to `@com_google_fhirproto//java`

and

`@com_google_fhirproto//java/src/test/java` to `@com_google_fhirproto//javatests`

PiperOrigin-RevId: 345293915
  • Loading branch information
nickgeorge committed Dec 2, 2020
1 parent 2ae336d commit cb3cec7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions generate-synthea.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ cp $1/synthea/output/fhir/*.json $1/bundles/

echo 'Finished generating Synthea dataset. Running SplitBundle...'
mkdir $1/ndjson/
bazel build @com_google_fhir//java:SplitBundle
bazel-bin/external/com_google_fhir/java/SplitBundle $1/ndjson $1/bundles/*.json
bazel build @com_google_fhir//java/com/google/fhir/examples:SplitBundle
bazel-bin/external/com_google_fhir/java/com/google/fhir/examples/SplitBundle $1/ndjson $1/bundles/*.json

mkdir $1/analytic/
mv $1/ndjson/*.schema.json $1/analytic
Expand Down
10 changes: 5 additions & 5 deletions java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ java_library(
name = "example_utils",
srcs = ["com/google/fhirexamples/ExampleUtils.java"],
deps = [
"@com_google_fhir//java:json_format",
"@com_google_fhir//java/com/google/fhir/common:json_format",
"@com_google_protobuf//:protobuf_java",
],
)
Expand All @@ -14,7 +14,7 @@ java_binary(
srcs = ["com/google/fhirexamples/ParsePatients.java"],
main_class = "com.google.fhirexamples.ParsePatients",
deps = [
"@com_google_fhir//java:json_format",
"@com_google_fhir//java/com/google/fhir/common:json_format",
"@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_java_proto",
],
)
Expand All @@ -25,8 +25,8 @@ java_binary(
main_class = "com.google.fhirexamples.ValidatePatients",
deps = [
":example_utils",
"@com_google_fhir//java:common",
"@com_google_fhir//java:resource_validator",
"@com_google_fhir//java/com/google/fhir/common",
"@com_google_fhir//java/com/google/fhir/common:resource_validator",
"@com_google_fhir//proto/google/fhir/proto/r4/core/resources:patient_java_proto",
],
)
Expand All @@ -37,7 +37,7 @@ java_binary(
main_class = "com.google.fhirexamples.GenerateBigQuerySchema",
deps = [
"//proto/google/fhir_examples/myprofile:myprofile_java_proto",
"@com_google_fhir//java:big_query_schema",
"@com_google_fhir//java/com/google/fhir/common:big_query_schema",
"@com_google_protobuf//:protobuf_java",
"@maven//:com_google_apis_google_api_services_bigquery",
"@maven//:com_google_guava_guava",
Expand Down

0 comments on commit cb3cec7

Please sign in to comment.