diff --git a/bazel/protogen.bzl b/bazel/protogen.bzl index 332fb3602..f0a1fa97c 100644 --- a/bazel/protogen.bzl +++ b/bazel/protogen.bzl @@ -16,8 +16,8 @@ STU3_PACKAGE_DEP = "@com_google_fhir//spec:fhir_stu3_package" R4_PACKAGE_DEP = "@com_google_fhir//spec:fhir_r4_package" -PROTO_GENERATOR = "@com_google_fhir//java:ProtoGenerator" -PROFILE_GENERATOR = "@com_google_fhir//java:ProfileGenerator" +PROTO_GENERATOR = "@com_google_fhir//java/com/google/fhir/protogen:ProtoGenerator" +PROFILE_GENERATOR = "@com_google_fhir//java/com/google/fhir/protogen:ProfileGenerator" MANUAL_TAGS = ["manual"] diff --git a/bazel/workspace.bzl b/bazel/workspace.bzl index a2013746b..09bbf792a 100644 --- a/bazel/workspace.bzl +++ b/bazel/workspace.bzl @@ -49,13 +49,13 @@ def fhirproto_workspace(core_lib = False): protogen_prefix = "//" if core_lib else "@com_google_fhir//" native.bind( name = "proto_generator_test_utils", - actual = protogen_prefix + "java:proto_generator_test_utils", + actual = protogen_prefix + "java/com/google/fhir/protogen:proto_generator_test_utils", ) native.bind( name = "protogen", - actual = protogen_prefix + "java:protogen", + actual = protogen_prefix + "java/com/google/fhir/protogen:protogen", ) native.bind( name = "GeneratedProtoTest.java", - actual = protogen_prefix + "java:GeneratedProtoTest.java", + actual = protogen_prefix + "javatests/com/google/fhir/protogen:GeneratedProtoTest.java", ) diff --git a/examples/bigquery/02-split-bundles-by-resource-type.sh b/examples/bigquery/02-split-bundles-by-resource-type.sh index 2d4758351..eac3502e7 100755 --- a/examples/bigquery/02-split-bundles-by-resource-type.sh +++ b/examples/bigquery/02-split-bundles-by-resource-type.sh @@ -18,9 +18,9 @@ if [[ $# -eq 0 ]] ; then exit 1 fi -bazel build //java:SplitBundle +bazel build //java/com/google/fhir/examples:SplitBundle -SPLIT_BUNDLE=bazel-bin/java/SplitBundle +SPLIT_BUNDLE=bazel-bin/java/com/google/examples/SplitBundle $SPLIT_BUNDLE $1 $1/synthea/output/fhir/*.json diff --git a/examples/bulkdata/02-parse-into-protobuf.sh b/examples/bulkdata/02-parse-into-protobuf.sh index 1d742a68d..c73b51014 100755 --- a/examples/bulkdata/02-parse-into-protobuf.sh +++ b/examples/bulkdata/02-parse-into-protobuf.sh @@ -20,5 +20,5 @@ fi echo "converting FHIR files in $1" -bazel run //java:ConvertNdJsonForBigQuery -- --output_directory $1 $1/*.ndjson +bazel run //java/com/google/fhir/examples:ConvertNdJsonForBigQuery -- --output_directory $1 $1/*.ndjson gzip $1/*.prototxt diff --git a/examples/gcp_datalab/05-gen-bundles.sh b/examples/gcp_datalab/05-gen-bundles.sh index 23b5a82e0..c61653cd9 100755 --- a/examples/gcp_datalab/05-gen-bundles.sh +++ b/examples/gcp_datalab/05-gen-bundles.sh @@ -18,7 +18,7 @@ if [[ $# -eq 0 ]] ; then exit 1 fi -bazel build -c opt //java:SyntheaToTFRecords +bazel build -c opt //java/com/google/fhir/examples:SyntheaToTFRecords SYNTHEA_TO_TF_RECORDS=$(pwd)/../../bazel-bin/java/SyntheaToTFRecords diff --git a/examples/protogen/generate-r4-proto.sh b/examples/protogen/generate-r4-proto.sh index 92e60a655..ee8985fb4 100755 --- a/examples/protogen/generate-r4-proto.sh +++ b/examples/protogen/generate-r4-proto.sh @@ -31,7 +31,7 @@ COMMON_FLAGS=" \ --descriptor_output_directory $DESCRIPTOR_OUTPUT_PATH " # # Build the binary. -bazel build //java:ProtoGenerator +bazel build //java/com/google/fhir/protogen:ProtoGenerator if [ $? -ne 0 ] then diff --git a/java/BUILD b/java/BUILD deleted file mode 100644 index e258750ac..000000000 --- a/java/BUILD +++ /dev/null @@ -1,829 +0,0 @@ -# Tools for working with FHIR protocol buffers in java. -package( - default_visibility = ["//visibility:public"], -) - -licenses(["notice"]) - -java_library( - name = "primitive_wrappers", - srcs = glob(["src/main/java/com/google/fhir/wrappers/*"]), - deps = [ - ":common", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto/r4:fhirproto_extensions_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/stu3:datatypes_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_code_gson_gson", - "@maven//:com_google_guava_guava", - ], -) - -java_library( - name = "protogen", - srcs = glob( - ["src/main/java/com/google/fhir/protogen/*"], - exclude = [ - "src/main/java/com/google/fhir/protogen/*Main.java", - "src/main/java/com/google/fhir/protogen/ProtoGeneratorTestUtils.java", - ], - ), - deps = [ - ":common", - ":fhir_version", - ":json_format", - ":primitive_wrappers", - ":resource_utils", - ":resource_validator", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto:profile_config_java_proto", - "//proto/google/fhir/proto:protogenerator_annotations_java_proto", - "//proto/google/fhir/proto/r4/core:codes_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/r4/core:extensions_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/r4/core/resources:code_system_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:value_set_java_proto", - "//proto/google/fhir/proto/stu3:datatypes_java_proto", - "//proto/google/fhir/proto/stu3:extensions_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - ], -) - -java_library( - name = "examples", - srcs = [ - "src/main/java/com/google/fhir/examples/ConvertNdJsonForBigQueryMain.java", - "src/main/java/com/google/fhir/examples/JsonParserArgs.java", - "src/main/java/com/google/fhir/examples/JsonToProtoMain.java", - "src/main/java/com/google/fhir/examples/SplitBundleMain.java", - ], - deps = [ - ":big_query_schema", - ":json_format", - ":resource_utils", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "@com_google_protobuf//:protobuf_java", - "@com_google_protobuf//:protobuf_java_util", - "@maven//:com_beust_jcommander", - "@maven//:com_google_apis_google_api_services_bigquery", - "@maven//:com_google_guava_guava", - "@maven//:com_google_http_client_google_http_client_gson", - ], -) - -java_binary( - name = "ConvertNdJsonForBigQuery", - main_class = "com.google.fhir.examples.ConvertNdJsonForBigQueryMain", - runtime_deps = [":examples"], -) - -java_binary( - name = "JsonToProto", - main_class = "com.google.fhir.examples.JsonToProtoMain", - runtime_deps = [":examples"], -) - -java_binary( - name = "SplitBundle", - main_class = "com.google.fhir.examples.SplitBundleMain", - runtime_deps = [":examples"], -) - -java_library( - name = "common", - srcs = [ - "src/main/java/com/google/fhir/common/AnnotationUtils.java", - "src/main/java/com/google/fhir/common/InvalidFhirException.java", - "src/main/java/com/google/fhir/common/ProtoUtils.java", - ], - deps = [ - "//proto/google/fhir/proto:annotations_java_proto", - "@com_google_protobuf//:protobuf_java", - ], -) - -java_library( - name = "fhir_version", - srcs = [ - "src/main/java/com/google/fhir/common/FhirVersion.java", - ], - deps = [ - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto/r4/core:codes_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/r4/core:extensions_java_proto", - "//proto/google/fhir/proto/r4/core:valuesets_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/stu3:codes_java_proto", - "//proto/google/fhir/proto/stu3:datatypes_java_proto", - "//proto/google/fhir/proto/stu3:extensions_java_proto", - "//proto/google/fhir/proto/stu3:metadatatypes_java_proto", - "//proto/google/fhir/proto/stu3:resources_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - ], -) - -java_library( - name = "resource_utils", - srcs = [ - "src/main/java/com/google/fhir/common/ResourceUtils.java", - ], - deps = [ - ":common", - ":primitive_wrappers", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/stu3:resources_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - ], -) - -java_library( - name = "json_format", - srcs = ["src/main/java/com/google/fhir/common/JsonFormat.java"], - deps = [ - ":common", - ":primitive_wrappers", - ":proto_gen_transformer", - ":resource_utils", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto/r4:fhirproto_extensions_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/stu3:datatypes_java_proto", - "//proto/google/fhir/proto/stu3:resources_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_code_gson_gson", - "@maven//:com_google_guava_guava", - ], -) - -java_library( - name = "resource_validator", - srcs = ["src/main/java/com/google/fhir/common/ResourceValidator.java"], - deps = [ - ":common", - ":primitive_wrappers", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/stu3:datatypes_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - ], -) - -java_test( - name = "ResourceValidatorTest", - size = "small", - srcs = ["src/test/java/com/google/fhir/common/ResourceValidatorR4Test.java"], - data = [ - "//testdata/r4:validation", - ], - test_class = "com.google.fhir.common.ResourceValidatorR4Test", - deps = [ - ":common", - ":resource_validator", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/r4/core/resources:encounter_java_proto", - "//proto/google/fhir/proto/r4/core/resources:observation_java_proto", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_library( - name = "file_utils", - srcs = ["src/main/java/com/google/fhir/common/FileUtils.java"], - deps = [ - ":json_format", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - ], -) - -java_library( - name = "big_query_schema", - srcs = ["src/main/java/com/google/fhir/common/BigQuerySchema.java"], - deps = [ - ":common", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_apis_google_api_services_bigquery", - "@maven//:com_google_guava_guava", - ], -) - -java_library( - name = "big_query_schema_generator_lib", - srcs = ["src/main/java/com/google/fhir/examples/BigQuerySchemaGeneratorMain.java"], - deps = [ - ":big_query_schema", - "//examples/profiles:demo_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_apis_google_api_services_bigquery", - "@maven//:com_google_guava_guava", - "@maven//:com_google_http_client_google_http_client_gson", - ], -) - -java_binary( - name = "BigQuerySchemaGenerator", - main_class = "com.google.fhir.examples.BigQuerySchemaGeneratorMain", - runtime_deps = [ - ":big_query_schema_generator_lib", - ], -) - -java_test( - name = "AnnotationUtilsTest", - size = "small", - srcs = ["src/test/java/com/google/fhir/common/AnnotationUtilsTest.java"], - test_class = "com.google.fhir.common.AnnotationUtilsTest", - deps = [ - ":common", - "//proto/google/fhir/proto/stu3:datatypes_java_proto", - "//proto/google/fhir/proto/stu3:resources_java_proto", - "//proto/google/fhir/proto/stu3:uscore_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:junit_junit", - ], -) - -java_test( - name = "BigQuerySchemaTest", - size = "small", - srcs = ["src/test/java/com/google/fhir/common/BigQuerySchemaTest.java"], - data = [ - "//spec:stu3", - "//testdata/stu3:bigquery", - "//testdata/stu3:examples", - ], - test_class = "com.google.fhir.common.BigQuerySchemaTest", - deps = [ - ":big_query_schema", - "//proto/google/fhir/proto/stu3:resources_java_proto", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_apis_google_api_services_bigquery", - "@maven//:com_google_guava_guava", - "@maven//:com_google_http_client_google_http_client_gson", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "DateTimeWrapperTest", - size = "small", - srcs = ["src/test/java/com/google/fhir/wrappers/DateTimeWrapperTest.java"], - test_class = "com.google.fhir.wrappers.DateTimeWrapperTest", - deps = [ - ":primitive_wrappers", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "DateWrapperTest", - size = "small", - srcs = ["src/test/java/com/google/fhir/wrappers/DateWrapperTest.java"], - test_class = "com.google.fhir.wrappers.DateWrapperTest", - deps = [ - ":primitive_wrappers", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "DecimalWrapperTest", - size = "small", - srcs = ["src/test/java/com/google/fhir/wrappers/DecimalWrapperTest.java"], - test_class = "com.google.fhir.wrappers.DecimalWrapperTest", - deps = [ - ":primitive_wrappers", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "ExtensionWrapperTest", - size = "medium", - srcs = ["src/test/java/com/google/fhir/wrappers/ExtensionWrapperTest.java"], - data = [ - "//testdata/stu3:extensions", - ], - test_class = "com.google.fhir.wrappers.ExtensionWrapperTest", - deps = [ - ":primitive_wrappers", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/stu3:fhirproto_extensions_java_proto", - "//proto/google/fhir/proto/stu3:ml_extensions_java_proto", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "InstantWrapperTest", - size = "small", - srcs = ["src/test/java/com/google/fhir/wrappers/InstantWrapperTest.java"], - test_class = "com.google.fhir.wrappers.InstantWrapperTest", - deps = [ - ":primitive_wrappers", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_library( - name = "json_format_test_base", - testonly = 1, - srcs = ["src/main/java/com/google/fhir/testing/JsonFormatTestBase.java"], - deps = [ - ":json_format", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_code_gson_gson", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_library( - name = "validation_test_base", - testonly = 1, - srcs = ["src/main/java/com/google/fhir/testing/ValidationTestBase.java"], - deps = [ - ":json_format", - ":primitive_wrappers", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_library( - name = "proto_generator_test_utils", - testonly = 1, - srcs = ["src/main/java/com/google/fhir/protogen/ProtoGeneratorTestUtils.java"], - deps = [ - ":common", - ":fhir_version", - ":protogen", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto:profile_config_java_proto", - "//proto/google/fhir/proto:protogenerator_annotations_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - ], -) - -java_test( - name = "JsonFormatStu3Test", - size = "large", - srcs = ["src/test/java/com/google/fhir/stu3/JsonFormatTest.java"], - data = [ - "//spec:stu3", - "//testdata/stu3:bigquery", - "//testdata/stu3:examples", - "//testdata/stu3:profiles", - ], - shard_count = 10, - test_class = "com.google.fhir.stu3.JsonFormatTest", - deps = [ - ":json_format_test_base", - "//proto/google/fhir/proto/stu3:resources_java_proto", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "JsonFormatR4Test", - size = "large", - srcs = ["src/test/java/com/google/fhir/r4/JsonFormatTest.java"], - data = [ - "//spec:r4_examples", - "//testdata/r4:bigquery", - "//testdata/r4:examples", - ], - shard_count = 10, - test_class = "com.google.fhir.r4.JsonFormatTest", - deps = [ - ":json_format_test_base", - "//proto/google/fhir/proto/r4/core/resources:account_java_proto", - "//proto/google/fhir/proto/r4/core/resources:activity_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:adverse_event_java_proto", - "//proto/google/fhir/proto/r4/core/resources:allergy_intolerance_java_proto", - "//proto/google/fhir/proto/r4/core/resources:appointment_java_proto", - "//proto/google/fhir/proto/r4/core/resources:appointment_response_java_proto", - "//proto/google/fhir/proto/r4/core/resources:audit_event_java_proto", - "//proto/google/fhir/proto/r4/core/resources:basic_java_proto", - "//proto/google/fhir/proto/r4/core/resources:binary_java_proto", - "//proto/google/fhir/proto/r4/core/resources:biologically_derived_product_java_proto", - "//proto/google/fhir/proto/r4/core/resources:body_structure_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/r4/core/resources:capability_statement_java_proto", - "//proto/google/fhir/proto/r4/core/resources:care_plan_java_proto", - "//proto/google/fhir/proto/r4/core/resources:care_team_java_proto", - "//proto/google/fhir/proto/r4/core/resources:catalog_entry_java_proto", - "//proto/google/fhir/proto/r4/core/resources:charge_item_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:charge_item_java_proto", - "//proto/google/fhir/proto/r4/core/resources:claim_java_proto", - "//proto/google/fhir/proto/r4/core/resources:claim_response_java_proto", - "//proto/google/fhir/proto/r4/core/resources:clinical_impression_java_proto", - "//proto/google/fhir/proto/r4/core/resources:communication_java_proto", - "//proto/google/fhir/proto/r4/core/resources:communication_request_java_proto", - "//proto/google/fhir/proto/r4/core/resources:compartment_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:composition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:condition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:consent_java_proto", - "//proto/google/fhir/proto/r4/core/resources:contract_java_proto", - "//proto/google/fhir/proto/r4/core/resources:coverage_eligibility_request_java_proto", - "//proto/google/fhir/proto/r4/core/resources:coverage_eligibility_response_java_proto", - "//proto/google/fhir/proto/r4/core/resources:coverage_java_proto", - "//proto/google/fhir/proto/r4/core/resources:detected_issue_java_proto", - "//proto/google/fhir/proto/r4/core/resources:device_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:device_java_proto", - "//proto/google/fhir/proto/r4/core/resources:device_metric_java_proto", - "//proto/google/fhir/proto/r4/core/resources:device_request_java_proto", - "//proto/google/fhir/proto/r4/core/resources:device_use_statement_java_proto", - "//proto/google/fhir/proto/r4/core/resources:diagnostic_report_java_proto", - "//proto/google/fhir/proto/r4/core/resources:document_manifest_java_proto", - "//proto/google/fhir/proto/r4/core/resources:document_reference_java_proto", - "//proto/google/fhir/proto/r4/core/resources:effect_evidence_synthesis_java_proto", - "//proto/google/fhir/proto/r4/core/resources:encounter_java_proto", - "//proto/google/fhir/proto/r4/core/resources:endpoint_java_proto", - "//proto/google/fhir/proto/r4/core/resources:enrollment_request_java_proto", - "//proto/google/fhir/proto/r4/core/resources:enrollment_response_java_proto", - "//proto/google/fhir/proto/r4/core/resources:episode_of_care_java_proto", - "//proto/google/fhir/proto/r4/core/resources:event_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:evidence_java_proto", - "//proto/google/fhir/proto/r4/core/resources:evidence_variable_java_proto", - "//proto/google/fhir/proto/r4/core/resources:example_scenario_java_proto", - "//proto/google/fhir/proto/r4/core/resources:explanation_of_benefit_java_proto", - "//proto/google/fhir/proto/r4/core/resources:family_member_history_java_proto", - "//proto/google/fhir/proto/r4/core/resources:flag_java_proto", - "//proto/google/fhir/proto/r4/core/resources:goal_java_proto", - "//proto/google/fhir/proto/r4/core/resources:graph_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:group_java_proto", - "//proto/google/fhir/proto/r4/core/resources:guidance_response_java_proto", - "//proto/google/fhir/proto/r4/core/resources:healthcare_service_java_proto", - "//proto/google/fhir/proto/r4/core/resources:imaging_study_java_proto", - "//proto/google/fhir/proto/r4/core/resources:immunization_evaluation_java_proto", - "//proto/google/fhir/proto/r4/core/resources:immunization_java_proto", - "//proto/google/fhir/proto/r4/core/resources:immunization_recommendation_java_proto", - "//proto/google/fhir/proto/r4/core/resources:implementation_guide_java_proto", - "//proto/google/fhir/proto/r4/core/resources:insurance_plan_java_proto", - "//proto/google/fhir/proto/r4/core/resources:invoice_java_proto", - "//proto/google/fhir/proto/r4/core/resources:library_java_proto", - "//proto/google/fhir/proto/r4/core/resources:linkage_java_proto", - "//proto/google/fhir/proto/r4/core/resources:list_java_proto", - "//proto/google/fhir/proto/r4/core/resources:location_java_proto", - "//proto/google/fhir/proto/r4/core/resources:measure_java_proto", - "//proto/google/fhir/proto/r4/core/resources:measure_report_java_proto", - "//proto/google/fhir/proto/r4/core/resources:media_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medication_administration_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medication_dispense_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medication_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medication_knowledge_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medication_request_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medication_statement_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_authorization_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_contraindication_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_indication_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_ingredient_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_interaction_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_manufactured_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_packaged_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_pharmaceutical_java_proto", - "//proto/google/fhir/proto/r4/core/resources:medicinal_product_undesirable_effect_java_proto", - "//proto/google/fhir/proto/r4/core/resources:message_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:message_header_java_proto", - "//proto/google/fhir/proto/r4/core/resources:molecular_sequence_java_proto", - "//proto/google/fhir/proto/r4/core/resources:naming_system_java_proto", - "//proto/google/fhir/proto/r4/core/resources:nutrition_order_java_proto", - "//proto/google/fhir/proto/r4/core/resources:observation_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:observation_java_proto", - "//proto/google/fhir/proto/r4/core/resources:operation_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:operation_outcome_java_proto", - "//proto/google/fhir/proto/r4/core/resources:organization_affiliation_java_proto", - "//proto/google/fhir/proto/r4/core/resources:organization_java_proto", - "//proto/google/fhir/proto/r4/core/resources:patient_java_proto", - "//proto/google/fhir/proto/r4/core/resources:payment_notice_java_proto", - "//proto/google/fhir/proto/r4/core/resources:payment_reconciliation_java_proto", - "//proto/google/fhir/proto/r4/core/resources:person_java_proto", - "//proto/google/fhir/proto/r4/core/resources:plan_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:practitioner_java_proto", - "//proto/google/fhir/proto/r4/core/resources:practitioner_role_java_proto", - "//proto/google/fhir/proto/r4/core/resources:procedure_java_proto", - "//proto/google/fhir/proto/r4/core/resources:provenance_java_proto", - "//proto/google/fhir/proto/r4/core/resources:questionnaire_java_proto", - "//proto/google/fhir/proto/r4/core/resources:questionnaire_response_java_proto", - "//proto/google/fhir/proto/r4/core/resources:related_person_java_proto", - "//proto/google/fhir/proto/r4/core/resources:request_group_java_proto", - "//proto/google/fhir/proto/r4/core/resources:research_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:research_element_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:research_study_java_proto", - "//proto/google/fhir/proto/r4/core/resources:research_subject_java_proto", - "//proto/google/fhir/proto/r4/core/resources:risk_assessment_java_proto", - "//proto/google/fhir/proto/r4/core/resources:risk_evidence_synthesis_java_proto", - "//proto/google/fhir/proto/r4/core/resources:schedule_java_proto", - "//proto/google/fhir/proto/r4/core/resources:service_request_java_proto", - "//proto/google/fhir/proto/r4/core/resources:slot_java_proto", - "//proto/google/fhir/proto/r4/core/resources:specimen_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:specimen_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_map_java_proto", - "//proto/google/fhir/proto/r4/core/resources:subscription_java_proto", - "//proto/google/fhir/proto/r4/core/resources:substance_java_proto", - "//proto/google/fhir/proto/r4/core/resources:substance_specification_java_proto", - "//proto/google/fhir/proto/r4/core/resources:supply_delivery_java_proto", - "//proto/google/fhir/proto/r4/core/resources:supply_request_java_proto", - "//proto/google/fhir/proto/r4/core/resources:task_java_proto", - "//proto/google/fhir/proto/r4/core/resources:terminology_capabilities_java_proto", - "//proto/google/fhir/proto/r4/core/resources:test_report_java_proto", - "//proto/google/fhir/proto/r4/core/resources:test_script_java_proto", - "//proto/google/fhir/proto/r4/core/resources:verification_result_java_proto", - "//proto/google/fhir/proto/r4/core/resources:vision_prescription_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - "@maven//:junit_junit", - ], -) - -java_test( - name = "ProtoFilePrinterTest", - size = "medium", - srcs = ["src/test/java/com/google/fhir/protogen/ProtoFilePrinterTest.java"], - data = [ - "//proto/google/fhir/proto/r4/core:testdata", - "//proto/google/fhir/proto/r4/core/resources:testdata", - "//spec:fhir_r4_package.zip", - "//spec:fhir_r4_package_filegroup", - "//testdata/r4:descriptors", - ], - test_class = "com.google.fhir.protogen.ProtoFilePrinterTest", - deps = [ - ":json_format", - ":protogen", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto:profile_config_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "ProtoGeneratorTest", - size = "medium", - srcs = ["src/test/java/com/google/fhir/protogen/ProtoGeneratorTest.java"], - data = [ - "//spec:fhir_r4_package.zip", - "//spec:fhir_r4_package_filegroup", - "//spec:fhir_stu3_package_filegroup", - "//spec:uscore_stu3_package_filegroup", - "//testdata/r4:descriptors", - "//testdata/stu3:descriptors", - ], - test_class = "com.google.fhir.protogen.ProtoGeneratorTest", - deps = [ - ":json_format", - ":proto_generator_test_utils", - ":protogen", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "FhirPackageTest", - size = "medium", - srcs = ["src/test/java/com/google/fhir/protogen/FhirPackageTest.java"], - data = [ - "//spec:fhir_r4_package.zip", - ], - test_class = "com.google.fhir.protogen.FhirPackageTest", - deps = [ - ":protogen", - "//proto/google/fhir/proto:profile_config_java_proto", - "@maven//:com_google_guava_guava_testlib", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "TimeWrapperTest", - size = "small", - srcs = ["src/test/java/com/google/fhir/wrappers/TimeWrapperTest.java"], - test_class = "com.google.fhir.wrappers.TimeWrapperTest", - deps = [ - ":primitive_wrappers", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_test( - name = "ValidationStu3Test", - size = "medium", - srcs = ["src/test/java/com/google/fhir/stu3/wrappers/ValidationTest.java"], - data = [ - "//testdata/stu3:validation", - ], - test_class = "com.google.fhir.stu3.wrappers.ValidationTest", - deps = [ - ":json_format", - ":validation_test_base", - "//proto/google/fhir/proto/stu3:codes_java_proto", - "//proto/google/fhir/proto/stu3:datatypes_java_proto", - "//proto/google/fhir/proto/stu3:fhirproto_extensions_java_proto", - "//proto/google/fhir/proto/stu3:uscore_java_proto", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:junit_junit", - ], -) - -java_test( - name = "ValidationR4Test", - size = "medium", - srcs = ["src/test/java/com/google/fhir/r4/wrappers/ValidationTest.java"], - data = [ - "//testdata/r4:validation", - ], - test_class = "com.google.fhir.r4.wrappers.ValidationTest", - deps = [ - ":json_format", - ":validation_test_base", - "//proto/google/fhir/proto/r4:fhirproto_extensions_java_proto", - "//proto/google/fhir/proto/r4:uscore_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "@bazel_tools//tools/java/runfiles", - "@com_google_protobuf//:protobuf_java", - "@maven//:junit_junit", - ], -) - -java_binary( - name = "ProtoGenerator", - srcs = ["src/main/java/com/google/fhir/protogen/ProtoGeneratorMain.java"], - main_class = "com.google.fhir.protogen.ProtoGeneratorMain", - deps = [ - ":common", - ":protogen", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto:profile_config_java_proto", - "//proto/google/fhir/proto/r4/core:codes_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_beust_jcommander", - "@maven//:com_google_guava_guava", - ], -) - -java_test( - name = "ProfileGeneratorTest", - size = "medium", - testonly = 1, - srcs = ["src/test/java/com/google/fhir/protogen/ProfileGeneratorTest.java"], - data = [ - "//spec:fhir_r4_package_filegroup", - "//spec:fhir_stu3_package_filegroup", - "//testdata/r4:profiles", - "//testdata/stu3:profiles", - ], - test_class = "com.google.fhir.protogen.ProfileGeneratorTest", - deps = [ - ":json_format", - ":protogen", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto:profile_config_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -java_binary( - name = "ProfileGenerator", - srcs = ["src/main/java/com/google/fhir/protogen/ProfileGeneratorMain.java"], - main_class = "com.google.fhir.protogen.ProfileGeneratorMain", - deps = [ - ":file_utils", - ":json_format", - ":protogen", - "//proto/google/fhir/proto:profile_config_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@maven//:com_beust_jcommander", - "@maven//:com_google_guava_guava", - ], -) - -java_binary( - name = "ValueSetGenerator", - srcs = ["src/main/java/com/google/fhir/protogen/ValueSetGeneratorMain.java"], - main_class = "com.google.fhir.protogen.ValueSetGeneratorMain", - deps = [ - ":json_format", - ":protogen", - "//proto/google/fhir/proto:annotations_java_proto", - "//proto/google/fhir/proto:profile_config_java_proto", - "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_beust_jcommander", - "@maven//:com_google_guava_guava", - ], -) - -java_library( - name = "proto_gen_transformer", - srcs = ["src/main/java/com/google/fhir/common/ProtoGenTransformer.java"], - deps = [ - "//proto/google/fhir/proto/r4/core:codes_java_proto", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/r4/core/resources:capability_statement_java_proto", - "//proto/google/fhir/proto/r4/core/resources:code_system_java_proto", - "//proto/google/fhir/proto/r4/core/resources:compartment_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:concept_map_java_proto", - "//proto/google/fhir/proto/r4/core/resources:operation_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "//proto/google/fhir/proto/r4/core/resources:value_set_java_proto", - "@com_google_protobuf//:protobuf_java", - "@maven//:com_google_code_gson_gson", - "@maven//:com_google_guava_guava", - ], -) - -java_test( - name = "ProtoGenTransformerTest", - srcs = ["src/test/java/com/google/fhir/common/ProtoGenTransformerTest.java"], - data = [ - "//spec:fhir_stu3_package.zip", - "//testdata/protogentransformer:json", - ], - test_class = "com.google.fhir.common.ProtoGenTransformerTest", - deps = [ - ":json_format", - ":proto_gen_transformer", - ":protogen", - ":resource_validator", - "//proto/google/fhir/proto/r4/core:datatypes_java_proto", - "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", - "@bazel_tools//tools/java/runfiles", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) - -exports_files(["src/test/java/com/google/fhir/protogen/GeneratedProtoTest.java"]) - -alias( - name = "GeneratedProtoTest.java", - actual = "src/test/java/com/google/fhir/protogen/GeneratedProtoTest.java", -) diff --git a/java/src/main/java/com/google/fhir/common/AnnotationUtils.java b/java/com/google/fhir/common/AnnotationUtils.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/AnnotationUtils.java rename to java/com/google/fhir/common/AnnotationUtils.java diff --git a/java/com/google/fhir/common/BUILD b/java/com/google/fhir/common/BUILD new file mode 100644 index 000000000..0f94c54b2 --- /dev/null +++ b/java/com/google/fhir/common/BUILD @@ -0,0 +1,133 @@ +package( + default_visibility = ["//visibility:public"], +) + +licenses(["notice"]) + +java_library( + name = "common", + srcs = [ + "AnnotationUtils.java", + "InvalidFhirException.java", + "ProtoUtils.java", + ], + deps = [ + "//proto/google/fhir/proto:annotations_java_proto", + "@com_google_protobuf//:protobuf_java", + ], +) + +java_library( + name = "fhir_version", + srcs = [ + "FhirVersion.java", + ], + deps = [ + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto/r4/core:codes_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/r4/core:extensions_java_proto", + "//proto/google/fhir/proto/r4/core:valuesets_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/stu3:codes_java_proto", + "//proto/google/fhir/proto/stu3:datatypes_java_proto", + "//proto/google/fhir/proto/stu3:extensions_java_proto", + "//proto/google/fhir/proto/stu3:metadatatypes_java_proto", + "//proto/google/fhir/proto/stu3:resources_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + ], +) + +java_library( + name = "big_query_schema", + srcs = ["BigQuerySchema.java"], + deps = [ + ":common", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_apis_google_api_services_bigquery", + "@maven//:com_google_guava_guava", + ], +) + +java_library( + name = "json_format", + srcs = ["JsonFormat.java"], + deps = [ + ":common", + ":proto_gen_transformer", + ":resource_utils", + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto/r4:fhirproto_extensions_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/stu3:datatypes_java_proto", + "//proto/google/fhir/proto/stu3:resources_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_code_gson_gson", + "@maven//:com_google_guava_guava", + ], +) + +java_library( + name = "file_utils", + srcs = ["FileUtils.java"], + deps = [ + ":json_format", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + ], +) + +java_library( + name = "resource_utils", + srcs = [ + "ResourceUtils.java", + ], + deps = [ + ":common", + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/stu3:resources_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + ], +) + +java_library( + name = "resource_validator", + srcs = ["ResourceValidator.java"], + deps = [ + ":common", + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/stu3:datatypes_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + ], +) + +java_library( + name = "proto_gen_transformer", + srcs = ["ProtoGenTransformer.java"], + deps = [ + "//proto/google/fhir/proto/r4/core:codes_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/r4/core/resources:capability_statement_java_proto", + "//proto/google/fhir/proto/r4/core/resources:code_system_java_proto", + "//proto/google/fhir/proto/r4/core/resources:compartment_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:concept_map_java_proto", + "//proto/google/fhir/proto/r4/core/resources:operation_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:value_set_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_code_gson_gson", + "@maven//:com_google_guava_guava", + ], +) diff --git a/java/src/main/java/com/google/fhir/common/BigQuerySchema.java b/java/com/google/fhir/common/BigQuerySchema.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/BigQuerySchema.java rename to java/com/google/fhir/common/BigQuerySchema.java diff --git a/java/src/main/java/com/google/fhir/common/FhirVersion.java b/java/com/google/fhir/common/FhirVersion.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/FhirVersion.java rename to java/com/google/fhir/common/FhirVersion.java diff --git a/java/src/main/java/com/google/fhir/common/FileUtils.java b/java/com/google/fhir/common/FileUtils.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/FileUtils.java rename to java/com/google/fhir/common/FileUtils.java diff --git a/java/src/main/java/com/google/fhir/common/InvalidFhirException.java b/java/com/google/fhir/common/InvalidFhirException.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/InvalidFhirException.java rename to java/com/google/fhir/common/InvalidFhirException.java diff --git a/java/src/main/java/com/google/fhir/common/JsonFormat.java b/java/com/google/fhir/common/JsonFormat.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/JsonFormat.java rename to java/com/google/fhir/common/JsonFormat.java diff --git a/java/src/main/java/com/google/fhir/common/ProtoGenTransformer.java b/java/com/google/fhir/common/ProtoGenTransformer.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/ProtoGenTransformer.java rename to java/com/google/fhir/common/ProtoGenTransformer.java diff --git a/java/src/main/java/com/google/fhir/common/ProtoUtils.java b/java/com/google/fhir/common/ProtoUtils.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/ProtoUtils.java rename to java/com/google/fhir/common/ProtoUtils.java diff --git a/java/src/main/java/com/google/fhir/common/ResourceUtils.java b/java/com/google/fhir/common/ResourceUtils.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/ResourceUtils.java rename to java/com/google/fhir/common/ResourceUtils.java diff --git a/java/src/main/java/com/google/fhir/common/ResourceValidator.java b/java/com/google/fhir/common/ResourceValidator.java similarity index 100% rename from java/src/main/java/com/google/fhir/common/ResourceValidator.java rename to java/com/google/fhir/common/ResourceValidator.java diff --git a/java/com/google/fhir/examples/BUILD b/java/com/google/fhir/examples/BUILD new file mode 100644 index 000000000..181d06bbc --- /dev/null +++ b/java/com/google/fhir/examples/BUILD @@ -0,0 +1,66 @@ +package( + default_visibility = ["//visibility:public"], +) + +licenses(["notice"]) + +java_library( + name = "examples", + srcs = [ + "ConvertNdJsonForBigQueryMain.java", + "JsonParserArgs.java", + "JsonToProtoMain.java", + "SplitBundleMain.java", + ], + deps = [ + "//java/com/google/fhir/common:big_query_schema", + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/common:resource_utils", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "@com_google_protobuf//:protobuf_java", + "@com_google_protobuf//:protobuf_java_util", + "@maven//:com_beust_jcommander", + "@maven//:com_google_apis_google_api_services_bigquery", + "@maven//:com_google_guava_guava", + "@maven//:com_google_http_client_google_http_client_gson", + ], +) + +java_binary( + name = "ConvertNdJsonForBigQuery", + main_class = "com.google.fhir.examples.ConvertNdJsonForBigQueryMain", + runtime_deps = [":examples"], +) + +java_binary( + name = "JsonToProto", + main_class = "com.google.fhir.examples.JsonToProtoMain", + runtime_deps = [":examples"], +) + +java_binary( + name = "SplitBundle", + main_class = "com.google.fhir.examples.SplitBundleMain", + runtime_deps = [":examples"], +) + +java_library( + name = "big_query_schema_generator_lib", + srcs = ["BigQuerySchemaGeneratorMain.java"], + deps = [ + "//java/com/google/fhir/common:big_query_schema", + "//examples/profiles:demo_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_apis_google_api_services_bigquery", + "@maven//:com_google_guava_guava", + "@maven//:com_google_http_client_google_http_client_gson", + ], +) + +java_binary( + name = "BigQuerySchemaGenerator", + main_class = "com.google.fhir.examples.BigQuerySchemaGeneratorMain", + runtime_deps = [ + ":big_query_schema_generator_lib", + ], +) diff --git a/java/src/main/java/com/google/fhir/examples/BigQuerySchemaGeneratorMain.java b/java/com/google/fhir/examples/BigQuerySchemaGeneratorMain.java similarity index 100% rename from java/src/main/java/com/google/fhir/examples/BigQuerySchemaGeneratorMain.java rename to java/com/google/fhir/examples/BigQuerySchemaGeneratorMain.java diff --git a/java/src/main/java/com/google/fhir/examples/ConvertNdJsonForBigQueryMain.java b/java/com/google/fhir/examples/ConvertNdJsonForBigQueryMain.java similarity index 100% rename from java/src/main/java/com/google/fhir/examples/ConvertNdJsonForBigQueryMain.java rename to java/com/google/fhir/examples/ConvertNdJsonForBigQueryMain.java diff --git a/java/src/main/java/com/google/fhir/examples/JsonParserArgs.java b/java/com/google/fhir/examples/JsonParserArgs.java similarity index 100% rename from java/src/main/java/com/google/fhir/examples/JsonParserArgs.java rename to java/com/google/fhir/examples/JsonParserArgs.java diff --git a/java/src/main/java/com/google/fhir/examples/JsonToProtoMain.java b/java/com/google/fhir/examples/JsonToProtoMain.java similarity index 100% rename from java/src/main/java/com/google/fhir/examples/JsonToProtoMain.java rename to java/com/google/fhir/examples/JsonToProtoMain.java diff --git a/java/src/main/java/com/google/fhir/examples/SplitBundleMain.java b/java/com/google/fhir/examples/SplitBundleMain.java similarity index 100% rename from java/src/main/java/com/google/fhir/examples/SplitBundleMain.java rename to java/com/google/fhir/examples/SplitBundleMain.java diff --git a/java/com/google/fhir/protogen/BUILD b/java/com/google/fhir/protogen/BUILD new file mode 100644 index 000000000..f80a60b1e --- /dev/null +++ b/java/com/google/fhir/protogen/BUILD @@ -0,0 +1,105 @@ +package( + default_visibility = ["//visibility:public"], +) + +licenses(["notice"]) + +java_library( + name = "proto_generator_test_utils", + testonly = 1, + srcs = ["ProtoGeneratorTestUtils.java"], + deps = [ + ":protogen", + "//java/com/google/fhir/common", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto:profile_config_java_proto", + "//proto/google/fhir/proto:protogenerator_annotations_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + ], +) + +java_binary( + name = "ValueSetGenerator", + srcs = ["ValueSetGeneratorMain.java"], + main_class = "com.google.fhir.protogen.ValueSetGeneratorMain", + deps = [ + ":protogen", + "//java/com/google/fhir/common:json_format", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto:profile_config_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_beust_jcommander", + "@maven//:com_google_guava_guava", + ], +) + +java_library( + name = "protogen", + srcs = glob( + ["*.java"], + exclude = [ + "*Main.java", + "ProtoGeneratorTestUtils.java", + ], + ), + deps = [ + "//java/com/google/fhir/common", + "//java/com/google/fhir/common:fhir_version", + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/common:resource_utils", + "//java/com/google/fhir/common:resource_validator", + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto:profile_config_java_proto", + "//proto/google/fhir/proto:protogenerator_annotations_java_proto", + "//proto/google/fhir/proto/r4/core:codes_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/r4/core:extensions_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/r4/core/resources:code_system_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:value_set_java_proto", + "//proto/google/fhir/proto/stu3:datatypes_java_proto", + "//proto/google/fhir/proto/stu3:extensions_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + ], +) + +java_binary( + name = "ProtoGenerator", + srcs = ["ProtoGeneratorMain.java"], + main_class = "com.google.fhir.protogen.ProtoGeneratorMain", + deps = [ + ":protogen", + "//java/com/google/fhir/common", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto:profile_config_java_proto", + "//proto/google/fhir/proto/r4/core:codes_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_beust_jcommander", + "@maven//:com_google_guava_guava", + ], +) + +java_binary( + name = "ProfileGenerator", + srcs = ["ProfileGeneratorMain.java"], + main_class = "com.google.fhir.protogen.ProfileGeneratorMain", + deps = [ + ":protogen", + "//java/com/google/fhir/common:file_utils", + "//java/com/google/fhir/common:json_format", + "//proto/google/fhir/proto:profile_config_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@maven//:com_beust_jcommander", + "@maven//:com_google_guava_guava", + ], +) diff --git a/java/src/main/java/com/google/fhir/protogen/FhirPackage.java b/java/com/google/fhir/protogen/FhirPackage.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/FhirPackage.java rename to java/com/google/fhir/protogen/FhirPackage.java diff --git a/java/src/main/java/com/google/fhir/protogen/GeneratorUtils.java b/java/com/google/fhir/protogen/GeneratorUtils.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/GeneratorUtils.java rename to java/com/google/fhir/protogen/GeneratorUtils.java diff --git a/java/src/main/java/com/google/fhir/protogen/ProfileGenerator.java b/java/com/google/fhir/protogen/ProfileGenerator.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/ProfileGenerator.java rename to java/com/google/fhir/protogen/ProfileGenerator.java diff --git a/java/src/main/java/com/google/fhir/protogen/ProfileGeneratorMain.java b/java/com/google/fhir/protogen/ProfileGeneratorMain.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/ProfileGeneratorMain.java rename to java/com/google/fhir/protogen/ProfileGeneratorMain.java diff --git a/java/src/main/java/com/google/fhir/protogen/ProtoFilePrinter.java b/java/com/google/fhir/protogen/ProtoFilePrinter.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/ProtoFilePrinter.java rename to java/com/google/fhir/protogen/ProtoFilePrinter.java diff --git a/java/src/main/java/com/google/fhir/protogen/ProtoGenerator.java b/java/com/google/fhir/protogen/ProtoGenerator.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/ProtoGenerator.java rename to java/com/google/fhir/protogen/ProtoGenerator.java diff --git a/java/src/main/java/com/google/fhir/protogen/ProtoGeneratorMain.java b/java/com/google/fhir/protogen/ProtoGeneratorMain.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/ProtoGeneratorMain.java rename to java/com/google/fhir/protogen/ProtoGeneratorMain.java diff --git a/java/src/main/java/com/google/fhir/protogen/ProtoGeneratorTestUtils.java b/java/com/google/fhir/protogen/ProtoGeneratorTestUtils.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/ProtoGeneratorTestUtils.java rename to java/com/google/fhir/protogen/ProtoGeneratorTestUtils.java diff --git a/java/src/main/java/com/google/fhir/protogen/TerminologyGenerator.java b/java/com/google/fhir/protogen/TerminologyGenerator.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/TerminologyGenerator.java rename to java/com/google/fhir/protogen/TerminologyGenerator.java diff --git a/java/src/main/java/com/google/fhir/protogen/ValueSetGenerator.java b/java/com/google/fhir/protogen/ValueSetGenerator.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/ValueSetGenerator.java rename to java/com/google/fhir/protogen/ValueSetGenerator.java diff --git a/java/src/main/java/com/google/fhir/protogen/ValueSetGeneratorMain.java b/java/com/google/fhir/protogen/ValueSetGeneratorMain.java similarity index 100% rename from java/src/main/java/com/google/fhir/protogen/ValueSetGeneratorMain.java rename to java/com/google/fhir/protogen/ValueSetGeneratorMain.java diff --git a/java/src/main/java/com/google/fhir/release/BUILD b/java/com/google/fhir/release/BUILD similarity index 68% rename from java/src/main/java/com/google/fhir/release/BUILD rename to java/com/google/fhir/release/BUILD index 7167390c8..54a861062 100644 --- a/java/src/main/java/com/google/fhir/release/BUILD +++ b/java/com/google/fhir/release/BUILD @@ -29,15 +29,15 @@ java_binary( ], main_class = "com.google.fhir.release.Release", runtime_deps = [ - "//java:big_query_schema", - "//java:big_query_schema_generator_lib", - "//java:common", - "//java:fhir_version", - "//java:file_utils", - "//java:json_format", - "//java:primitive_wrappers", - "//java:resource_utils", - "//java:resource_validator", + "//java/com/google/fhir/common:common", + "//java/com/google/fhir/common:fhir_version", + "//java/com/google/fhir/common:file_utils", + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/common:resource_utils", + "//java/com/google/fhir/common:resource_validator", + "//java/com/google/fhir/common:big_query_schema", + "//java/com/google/fhir/examples:big_query_schema_generator_lib", + "//java/com/google/fhir/wrappers:primitive_wrappers", "//proto/google/fhir/proto/r4/core/resources:all_java_proto", ], ) @@ -45,7 +45,7 @@ java_binary( jarjar_library( name = "r4_lib", jars = [ - "//java/src/main/java/com/google/fhir/release:r4_bin_deploy.jar", + "//java/com/google/fhir/release:r4_bin_deploy.jar", ], rules = SHADE_RULES, ) diff --git a/java/src/main/java/com/google/fhir/release/README.md b/java/com/google/fhir/release/README.md similarity index 68% rename from java/src/main/java/com/google/fhir/release/README.md rename to java/com/google/fhir/release/README.md index a7617c8a0..4fc45b826 100644 --- a/java/src/main/java/com/google/fhir/release/README.md +++ b/java/com/google/fhir/release/README.md @@ -6,5 +6,5 @@ contain generated Java code for FHIR resources. ## R4 ``` -$ bazel build //java/src/main/java/com/google/fhir/release:r4_lib.jar +$ bazel build //java/com/google/fhir/release:r4_lib.jar ``` diff --git a/java/src/main/java/com/google/fhir/release/Release.java b/java/com/google/fhir/release/Release.java similarity index 100% rename from java/src/main/java/com/google/fhir/release/Release.java rename to java/com/google/fhir/release/Release.java diff --git a/java/com/google/fhir/testing/BUILD b/java/com/google/fhir/testing/BUILD new file mode 100644 index 000000000..1443b864a --- /dev/null +++ b/java/com/google/fhir/testing/BUILD @@ -0,0 +1,35 @@ +package( + default_visibility = ["//visibility:public"], +) + +licenses(["notice"]) + +java_library( + name = "json_format_test_base", + testonly = 1, + srcs = ["JsonFormatTestBase.java"], + deps = [ + "//java/com/google/fhir/common:json_format", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_code_gson_gson", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_library( + name = "validation_test_base", + testonly = 1, + srcs = ["ValidationTestBase.java"], + deps = [ + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/wrappers:primitive_wrappers", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) diff --git a/java/src/main/java/com/google/fhir/testing/JsonFormatTestBase.java b/java/com/google/fhir/testing/JsonFormatTestBase.java similarity index 100% rename from java/src/main/java/com/google/fhir/testing/JsonFormatTestBase.java rename to java/com/google/fhir/testing/JsonFormatTestBase.java diff --git a/java/src/main/java/com/google/fhir/testing/ValidationTestBase.java b/java/com/google/fhir/testing/ValidationTestBase.java similarity index 100% rename from java/src/main/java/com/google/fhir/testing/ValidationTestBase.java rename to java/com/google/fhir/testing/ValidationTestBase.java diff --git a/java/com/google/fhir/wrappers/BUILD b/java/com/google/fhir/wrappers/BUILD new file mode 100644 index 000000000..a4da42a64 --- /dev/null +++ b/java/com/google/fhir/wrappers/BUILD @@ -0,0 +1,20 @@ +package( + default_visibility = ["//visibility:public"], +) + +licenses(["notice"]) + +java_library( + name = "primitive_wrappers", + srcs = glob(["*.java"]), + deps = [ + "//java/com/google/fhir/common", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto/r4:fhirproto_extensions_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/stu3:datatypes_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_code_gson_gson", + "@maven//:com_google_guava_guava", + ], +) diff --git a/java/src/main/java/com/google/fhir/wrappers/Base64BinaryWrapper.java b/java/com/google/fhir/wrappers/Base64BinaryWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/Base64BinaryWrapper.java rename to java/com/google/fhir/wrappers/Base64BinaryWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/BooleanWrapper.java b/java/com/google/fhir/wrappers/BooleanWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/BooleanWrapper.java rename to java/com/google/fhir/wrappers/BooleanWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/CanonicalWrapper.java b/java/com/google/fhir/wrappers/CanonicalWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/CanonicalWrapper.java rename to java/com/google/fhir/wrappers/CanonicalWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/CodeWrapper.java b/java/com/google/fhir/wrappers/CodeWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/CodeWrapper.java rename to java/com/google/fhir/wrappers/CodeWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/DateTimeWrapper.java b/java/com/google/fhir/wrappers/DateTimeWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/DateTimeWrapper.java rename to java/com/google/fhir/wrappers/DateTimeWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/DateWrapper.java b/java/com/google/fhir/wrappers/DateWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/DateWrapper.java rename to java/com/google/fhir/wrappers/DateWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/DecimalWrapper.java b/java/com/google/fhir/wrappers/DecimalWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/DecimalWrapper.java rename to java/com/google/fhir/wrappers/DecimalWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/ExtensionWrapper.java b/java/com/google/fhir/wrappers/ExtensionWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/ExtensionWrapper.java rename to java/com/google/fhir/wrappers/ExtensionWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/IdWrapper.java b/java/com/google/fhir/wrappers/IdWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/IdWrapper.java rename to java/com/google/fhir/wrappers/IdWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/InstantWrapper.java b/java/com/google/fhir/wrappers/InstantWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/InstantWrapper.java rename to java/com/google/fhir/wrappers/InstantWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/IntegerWrapper.java b/java/com/google/fhir/wrappers/IntegerWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/IntegerWrapper.java rename to java/com/google/fhir/wrappers/IntegerWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/MarkdownWrapper.java b/java/com/google/fhir/wrappers/MarkdownWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/MarkdownWrapper.java rename to java/com/google/fhir/wrappers/MarkdownWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/NumericTypeWrapper.java b/java/com/google/fhir/wrappers/NumericTypeWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/NumericTypeWrapper.java rename to java/com/google/fhir/wrappers/NumericTypeWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/OidWrapper.java b/java/com/google/fhir/wrappers/OidWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/OidWrapper.java rename to java/com/google/fhir/wrappers/OidWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/PositiveIntWrapper.java b/java/com/google/fhir/wrappers/PositiveIntWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/PositiveIntWrapper.java rename to java/com/google/fhir/wrappers/PositiveIntWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/PrimitiveWrapper.java b/java/com/google/fhir/wrappers/PrimitiveWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/PrimitiveWrapper.java rename to java/com/google/fhir/wrappers/PrimitiveWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/PrimitiveWrappers.java b/java/com/google/fhir/wrappers/PrimitiveWrappers.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/PrimitiveWrappers.java rename to java/com/google/fhir/wrappers/PrimitiveWrappers.java diff --git a/java/src/main/java/com/google/fhir/wrappers/StringWrapper.java b/java/com/google/fhir/wrappers/StringWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/StringWrapper.java rename to java/com/google/fhir/wrappers/StringWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/TimeWrapper.java b/java/com/google/fhir/wrappers/TimeWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/TimeWrapper.java rename to java/com/google/fhir/wrappers/TimeWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/UnsignedIntWrapper.java b/java/com/google/fhir/wrappers/UnsignedIntWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/UnsignedIntWrapper.java rename to java/com/google/fhir/wrappers/UnsignedIntWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/UriWrapper.java b/java/com/google/fhir/wrappers/UriWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/UriWrapper.java rename to java/com/google/fhir/wrappers/UriWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/UrlWrapper.java b/java/com/google/fhir/wrappers/UrlWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/UrlWrapper.java rename to java/com/google/fhir/wrappers/UrlWrapper.java diff --git a/java/src/main/java/com/google/fhir/wrappers/XhtmlWrapper.java b/java/com/google/fhir/wrappers/XhtmlWrapper.java similarity index 100% rename from java/src/main/java/com/google/fhir/wrappers/XhtmlWrapper.java rename to java/com/google/fhir/wrappers/XhtmlWrapper.java diff --git a/java/src/test/java/com/google/fhir/common/AnnotationUtilsTest.java b/javatests/com/google/fhir/common/AnnotationUtilsTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/common/AnnotationUtilsTest.java rename to javatests/com/google/fhir/common/AnnotationUtilsTest.java diff --git a/javatests/com/google/fhir/common/BUILD b/javatests/com/google/fhir/common/BUILD new file mode 100644 index 000000000..9680a49e8 --- /dev/null +++ b/javatests/com/google/fhir/common/BUILD @@ -0,0 +1,83 @@ +licenses(["notice"]) + +java_test( + name = "ProtoGenTransformerTest", + srcs = ["ProtoGenTransformerTest.java"], + data = [ + "//spec:fhir_stu3_package.zip", + "//testdata/protogentransformer:json", + ], + test_class = "com.google.fhir.common.ProtoGenTransformerTest", + deps = [ + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/common:proto_gen_transformer", + "//java/com/google/fhir/common:resource_validator", + "//java/com/google/fhir/protogen", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@bazel_tools//tools/java/runfiles", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "ResourceValidatorTest", + size = "small", + srcs = ["ResourceValidatorR4Test.java"], + data = [ + "//testdata/r4:validation", + ], + test_class = "com.google.fhir.common.ResourceValidatorR4Test", + deps = [ + "//java/com/google/fhir/common", + "//java/com/google/fhir/common:resource_validator", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/r4/core/resources:encounter_java_proto", + "//proto/google/fhir/proto/r4/core/resources:observation_java_proto", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "AnnotationUtilsTest", + size = "small", + srcs = ["AnnotationUtilsTest.java"], + test_class = "com.google.fhir.common.AnnotationUtilsTest", + deps = [ + "//java/com/google/fhir/common", + "//proto/google/fhir/proto/stu3:datatypes_java_proto", + "//proto/google/fhir/proto/stu3:resources_java_proto", + "//proto/google/fhir/proto/stu3:uscore_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:junit_junit", + ], +) + +java_test( + name = "BigQuerySchemaTest", + size = "small", + srcs = ["BigQuerySchemaTest.java"], + data = [ + "//spec:stu3", + "//testdata/stu3:bigquery", + "//testdata/stu3:examples", + ], + test_class = "com.google.fhir.common.BigQuerySchemaTest", + deps = [ + "//java/com/google/fhir/common:big_query_schema", + "//proto/google/fhir/proto/stu3:resources_java_proto", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_apis_google_api_services_bigquery", + "@maven//:com_google_guava_guava", + "@maven//:com_google_http_client_google_http_client_gson", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) diff --git a/java/src/test/java/com/google/fhir/common/BigQuerySchemaTest.java b/javatests/com/google/fhir/common/BigQuerySchemaTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/common/BigQuerySchemaTest.java rename to javatests/com/google/fhir/common/BigQuerySchemaTest.java diff --git a/java/src/test/java/com/google/fhir/common/ProtoGenTransformerTest.java b/javatests/com/google/fhir/common/ProtoGenTransformerTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/common/ProtoGenTransformerTest.java rename to javatests/com/google/fhir/common/ProtoGenTransformerTest.java diff --git a/java/src/test/java/com/google/fhir/common/ResourceValidatorR4Test.java b/javatests/com/google/fhir/common/ResourceValidatorR4Test.java similarity index 100% rename from java/src/test/java/com/google/fhir/common/ResourceValidatorR4Test.java rename to javatests/com/google/fhir/common/ResourceValidatorR4Test.java diff --git a/javatests/com/google/fhir/protogen/BUILD b/javatests/com/google/fhir/protogen/BUILD new file mode 100644 index 000000000..7c12e11aa --- /dev/null +++ b/javatests/com/google/fhir/protogen/BUILD @@ -0,0 +1,101 @@ +licenses(["notice"]) + +java_test( + name = "ProtoFilePrinterTest", + size = "medium", + srcs = ["ProtoFilePrinterTest.java"], + data = [ + "//proto/google/fhir/proto/r4/core:testdata", + "//proto/google/fhir/proto/r4/core/resources:testdata", + "//spec:fhir_r4_package.zip", + "//spec:fhir_r4_package_filegroup", + "//testdata/r4:descriptors", + ], + test_class = "com.google.fhir.protogen.ProtoFilePrinterTest", + deps = [ + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/protogen", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto:profile_config_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "ProtoGeneratorTest", + size = "medium", + srcs = ["ProtoGeneratorTest.java"], + data = [ + "//spec:fhir_r4_package.zip", + "//spec:fhir_r4_package_filegroup", + "//spec:fhir_stu3_package_filegroup", + "//spec:uscore_stu3_package_filegroup", + "//testdata/r4:descriptors", + "//testdata/stu3:descriptors", + ], + test_class = "com.google.fhir.protogen.ProtoGeneratorTest", + deps = [ + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/protogen", + "//java/com/google/fhir/protogen:proto_generator_test_utils", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "ProfileGeneratorTest", + size = "medium", + testonly = 1, + srcs = ["ProfileGeneratorTest.java"], + data = [ + "//spec:fhir_r4_package_filegroup", + "//spec:fhir_stu3_package_filegroup", + "//testdata/r4:profiles", + "//testdata/stu3:profiles", + ], + test_class = "com.google.fhir.protogen.ProfileGeneratorTest", + deps = [ + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/protogen", + "//proto/google/fhir/proto:annotations_java_proto", + "//proto/google/fhir/proto:profile_config_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_definition_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "FhirPackageTest", + size = "medium", + srcs = ["FhirPackageTest.java"], + data = [ + "//spec:fhir_r4_package.zip", + ], + test_class = "com.google.fhir.protogen.FhirPackageTest", + deps = [ + "//java/com/google/fhir/protogen", + "//proto/google/fhir/proto:profile_config_java_proto", + "@maven//:com_google_guava_guava_testlib", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +exports_files(["GeneratedProtoTest.java"]) diff --git a/java/src/test/java/com/google/fhir/protogen/FhirPackageTest.java b/javatests/com/google/fhir/protogen/FhirPackageTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/protogen/FhirPackageTest.java rename to javatests/com/google/fhir/protogen/FhirPackageTest.java diff --git a/java/src/test/java/com/google/fhir/protogen/GeneratedProtoTest.java b/javatests/com/google/fhir/protogen/GeneratedProtoTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/protogen/GeneratedProtoTest.java rename to javatests/com/google/fhir/protogen/GeneratedProtoTest.java diff --git a/java/src/test/java/com/google/fhir/protogen/ProfileGeneratorTest.java b/javatests/com/google/fhir/protogen/ProfileGeneratorTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/protogen/ProfileGeneratorTest.java rename to javatests/com/google/fhir/protogen/ProfileGeneratorTest.java diff --git a/java/src/test/java/com/google/fhir/protogen/ProtoFilePrinterTest.java b/javatests/com/google/fhir/protogen/ProtoFilePrinterTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/protogen/ProtoFilePrinterTest.java rename to javatests/com/google/fhir/protogen/ProtoFilePrinterTest.java diff --git a/java/src/test/java/com/google/fhir/protogen/ProtoGeneratorTest.java b/javatests/com/google/fhir/protogen/ProtoGeneratorTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/protogen/ProtoGeneratorTest.java rename to javatests/com/google/fhir/protogen/ProtoGeneratorTest.java diff --git a/javatests/com/google/fhir/r4/BUILD b/javatests/com/google/fhir/r4/BUILD new file mode 100644 index 000000000..2adb4e481 --- /dev/null +++ b/javatests/com/google/fhir/r4/BUILD @@ -0,0 +1,177 @@ +# TODO: describe this package. + +licenses(["notice"]) + +java_test( + name = "JsonFormatR4Test", + size = "large", + srcs = ["JsonFormatTest.java"], + data = [ + "//spec:r4_examples", + "//testdata/r4:bigquery", + "//testdata/r4:examples", + ], + shard_count = 10, + test_class = "com.google.fhir.r4.JsonFormatTest", + deps = [ + "//java/com/google/fhir/testing:json_format_test_base", + "//proto/google/fhir/proto/r4/core/resources:account_java_proto", + "//proto/google/fhir/proto/r4/core/resources:activity_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:adverse_event_java_proto", + "//proto/google/fhir/proto/r4/core/resources:allergy_intolerance_java_proto", + "//proto/google/fhir/proto/r4/core/resources:appointment_java_proto", + "//proto/google/fhir/proto/r4/core/resources:appointment_response_java_proto", + "//proto/google/fhir/proto/r4/core/resources:audit_event_java_proto", + "//proto/google/fhir/proto/r4/core/resources:basic_java_proto", + "//proto/google/fhir/proto/r4/core/resources:binary_java_proto", + "//proto/google/fhir/proto/r4/core/resources:biologically_derived_product_java_proto", + "//proto/google/fhir/proto/r4/core/resources:body_structure_java_proto", + "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_java_proto", + "//proto/google/fhir/proto/r4/core/resources:capability_statement_java_proto", + "//proto/google/fhir/proto/r4/core/resources:care_plan_java_proto", + "//proto/google/fhir/proto/r4/core/resources:care_team_java_proto", + "//proto/google/fhir/proto/r4/core/resources:catalog_entry_java_proto", + "//proto/google/fhir/proto/r4/core/resources:charge_item_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:charge_item_java_proto", + "//proto/google/fhir/proto/r4/core/resources:claim_java_proto", + "//proto/google/fhir/proto/r4/core/resources:claim_response_java_proto", + "//proto/google/fhir/proto/r4/core/resources:clinical_impression_java_proto", + "//proto/google/fhir/proto/r4/core/resources:communication_java_proto", + "//proto/google/fhir/proto/r4/core/resources:communication_request_java_proto", + "//proto/google/fhir/proto/r4/core/resources:compartment_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:composition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:condition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:consent_java_proto", + "//proto/google/fhir/proto/r4/core/resources:contract_java_proto", + "//proto/google/fhir/proto/r4/core/resources:coverage_eligibility_request_java_proto", + "//proto/google/fhir/proto/r4/core/resources:coverage_eligibility_response_java_proto", + "//proto/google/fhir/proto/r4/core/resources:coverage_java_proto", + "//proto/google/fhir/proto/r4/core/resources:detected_issue_java_proto", + "//proto/google/fhir/proto/r4/core/resources:device_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:device_java_proto", + "//proto/google/fhir/proto/r4/core/resources:device_metric_java_proto", + "//proto/google/fhir/proto/r4/core/resources:device_request_java_proto", + "//proto/google/fhir/proto/r4/core/resources:device_use_statement_java_proto", + "//proto/google/fhir/proto/r4/core/resources:diagnostic_report_java_proto", + "//proto/google/fhir/proto/r4/core/resources:document_manifest_java_proto", + "//proto/google/fhir/proto/r4/core/resources:document_reference_java_proto", + "//proto/google/fhir/proto/r4/core/resources:effect_evidence_synthesis_java_proto", + "//proto/google/fhir/proto/r4/core/resources:encounter_java_proto", + "//proto/google/fhir/proto/r4/core/resources:endpoint_java_proto", + "//proto/google/fhir/proto/r4/core/resources:enrollment_request_java_proto", + "//proto/google/fhir/proto/r4/core/resources:enrollment_response_java_proto", + "//proto/google/fhir/proto/r4/core/resources:episode_of_care_java_proto", + "//proto/google/fhir/proto/r4/core/resources:event_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:evidence_java_proto", + "//proto/google/fhir/proto/r4/core/resources:evidence_variable_java_proto", + "//proto/google/fhir/proto/r4/core/resources:example_scenario_java_proto", + "//proto/google/fhir/proto/r4/core/resources:explanation_of_benefit_java_proto", + "//proto/google/fhir/proto/r4/core/resources:family_member_history_java_proto", + "//proto/google/fhir/proto/r4/core/resources:flag_java_proto", + "//proto/google/fhir/proto/r4/core/resources:goal_java_proto", + "//proto/google/fhir/proto/r4/core/resources:graph_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:group_java_proto", + "//proto/google/fhir/proto/r4/core/resources:guidance_response_java_proto", + "//proto/google/fhir/proto/r4/core/resources:healthcare_service_java_proto", + "//proto/google/fhir/proto/r4/core/resources:imaging_study_java_proto", + "//proto/google/fhir/proto/r4/core/resources:immunization_evaluation_java_proto", + "//proto/google/fhir/proto/r4/core/resources:immunization_java_proto", + "//proto/google/fhir/proto/r4/core/resources:immunization_recommendation_java_proto", + "//proto/google/fhir/proto/r4/core/resources:implementation_guide_java_proto", + "//proto/google/fhir/proto/r4/core/resources:insurance_plan_java_proto", + "//proto/google/fhir/proto/r4/core/resources:invoice_java_proto", + "//proto/google/fhir/proto/r4/core/resources:library_java_proto", + "//proto/google/fhir/proto/r4/core/resources:linkage_java_proto", + "//proto/google/fhir/proto/r4/core/resources:list_java_proto", + "//proto/google/fhir/proto/r4/core/resources:location_java_proto", + "//proto/google/fhir/proto/r4/core/resources:measure_java_proto", + "//proto/google/fhir/proto/r4/core/resources:measure_report_java_proto", + "//proto/google/fhir/proto/r4/core/resources:media_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medication_administration_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medication_dispense_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medication_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medication_knowledge_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medication_request_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medication_statement_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_authorization_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_contraindication_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_indication_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_ingredient_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_interaction_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_manufactured_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_packaged_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_pharmaceutical_java_proto", + "//proto/google/fhir/proto/r4/core/resources:medicinal_product_undesirable_effect_java_proto", + "//proto/google/fhir/proto/r4/core/resources:message_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:message_header_java_proto", + "//proto/google/fhir/proto/r4/core/resources:molecular_sequence_java_proto", + "//proto/google/fhir/proto/r4/core/resources:naming_system_java_proto", + "//proto/google/fhir/proto/r4/core/resources:nutrition_order_java_proto", + "//proto/google/fhir/proto/r4/core/resources:observation_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:observation_java_proto", + "//proto/google/fhir/proto/r4/core/resources:operation_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:operation_outcome_java_proto", + "//proto/google/fhir/proto/r4/core/resources:organization_affiliation_java_proto", + "//proto/google/fhir/proto/r4/core/resources:organization_java_proto", + "//proto/google/fhir/proto/r4/core/resources:patient_java_proto", + "//proto/google/fhir/proto/r4/core/resources:payment_notice_java_proto", + "//proto/google/fhir/proto/r4/core/resources:payment_reconciliation_java_proto", + "//proto/google/fhir/proto/r4/core/resources:person_java_proto", + "//proto/google/fhir/proto/r4/core/resources:plan_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:practitioner_java_proto", + "//proto/google/fhir/proto/r4/core/resources:practitioner_role_java_proto", + "//proto/google/fhir/proto/r4/core/resources:procedure_java_proto", + "//proto/google/fhir/proto/r4/core/resources:provenance_java_proto", + "//proto/google/fhir/proto/r4/core/resources:questionnaire_java_proto", + "//proto/google/fhir/proto/r4/core/resources:questionnaire_response_java_proto", + "//proto/google/fhir/proto/r4/core/resources:related_person_java_proto", + "//proto/google/fhir/proto/r4/core/resources:request_group_java_proto", + "//proto/google/fhir/proto/r4/core/resources:research_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:research_element_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:research_study_java_proto", + "//proto/google/fhir/proto/r4/core/resources:research_subject_java_proto", + "//proto/google/fhir/proto/r4/core/resources:risk_assessment_java_proto", + "//proto/google/fhir/proto/r4/core/resources:risk_evidence_synthesis_java_proto", + "//proto/google/fhir/proto/r4/core/resources:schedule_java_proto", + "//proto/google/fhir/proto/r4/core/resources:service_request_java_proto", + "//proto/google/fhir/proto/r4/core/resources:slot_java_proto", + "//proto/google/fhir/proto/r4/core/resources:specimen_definition_java_proto", + "//proto/google/fhir/proto/r4/core/resources:specimen_java_proto", + "//proto/google/fhir/proto/r4/core/resources:structure_map_java_proto", + "//proto/google/fhir/proto/r4/core/resources:subscription_java_proto", + "//proto/google/fhir/proto/r4/core/resources:substance_java_proto", + "//proto/google/fhir/proto/r4/core/resources:substance_specification_java_proto", + "//proto/google/fhir/proto/r4/core/resources:supply_delivery_java_proto", + "//proto/google/fhir/proto/r4/core/resources:supply_request_java_proto", + "//proto/google/fhir/proto/r4/core/resources:task_java_proto", + "//proto/google/fhir/proto/r4/core/resources:terminology_capabilities_java_proto", + "//proto/google/fhir/proto/r4/core/resources:test_report_java_proto", + "//proto/google/fhir/proto/r4/core/resources:test_script_java_proto", + "//proto/google/fhir/proto/r4/core/resources:verification_result_java_proto", + "//proto/google/fhir/proto/r4/core/resources:vision_prescription_java_proto", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + "@maven//:junit_junit", + ], +) + +java_test( + name = "ValidationR4Test", + size = "medium", + srcs = ["ValidationTest.java"], + data = [ + "//testdata/r4:validation", + ], + test_class = "com.google.fhir.r4.ValidationTest", + deps = [ + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/testing:validation_test_base", + "//proto/google/fhir/proto/r4:fhirproto_extensions_java_proto", + "//proto/google/fhir/proto/r4:uscore_java_proto", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:junit_junit", + ], +) diff --git a/java/src/test/java/com/google/fhir/r4/JsonFormatTest.java b/javatests/com/google/fhir/r4/JsonFormatTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/r4/JsonFormatTest.java rename to javatests/com/google/fhir/r4/JsonFormatTest.java diff --git a/java/src/test/java/com/google/fhir/r4/wrappers/ValidationTest.java b/javatests/com/google/fhir/r4/ValidationTest.java similarity index 99% rename from java/src/test/java/com/google/fhir/r4/wrappers/ValidationTest.java rename to javatests/com/google/fhir/r4/ValidationTest.java index 9ab291b93..f47e38de9 100644 --- a/java/src/test/java/com/google/fhir/r4/wrappers/ValidationTest.java +++ b/javatests/com/google/fhir/r4/ValidationTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.fhir.r4.wrappers; +package com.google.fhir.r4; import com.google.devtools.build.runfiles.Runfiles; import com.google.fhir.common.JsonFormat; diff --git a/javatests/com/google/fhir/stu3/BUILD b/javatests/com/google/fhir/stu3/BUILD new file mode 100644 index 000000000..f9de19983 --- /dev/null +++ b/javatests/com/google/fhir/stu3/BUILD @@ -0,0 +1,42 @@ +licenses(["notice"]) + +java_test( + name = "JsonFormatStu3Test", + size = "large", + srcs = ["JsonFormatTest.java"], + data = [ + "//spec:stu3", + "//testdata/stu3:bigquery", + "//testdata/stu3:examples", + "//testdata/stu3:profiles", + ], + shard_count = 10, + test_class = "com.google.fhir.stu3.JsonFormatTest", + deps = [ + "//java/com/google/fhir/testing:json_format_test_base", + "//proto/google/fhir/proto/stu3:resources_java_proto", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "ValidationStu3Test", + size = "medium", + srcs = ["ValidationTest.java"], + data = [ + "//testdata/stu3:validation", + ], + test_class = "com.google.fhir.stu3.ValidationTest", + deps = [ + "//java/com/google/fhir/common:json_format", + "//java/com/google/fhir/testing:validation_test_base", + "//proto/google/fhir/proto/stu3:codes_java_proto", + "//proto/google/fhir/proto/stu3:datatypes_java_proto", + "//proto/google/fhir/proto/stu3:fhirproto_extensions_java_proto", + "//proto/google/fhir/proto/stu3:uscore_java_proto", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:junit_junit", + ], +) diff --git a/java/src/test/java/com/google/fhir/stu3/JsonFormatTest.java b/javatests/com/google/fhir/stu3/JsonFormatTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/stu3/JsonFormatTest.java rename to javatests/com/google/fhir/stu3/JsonFormatTest.java diff --git a/java/src/test/java/com/google/fhir/stu3/wrappers/ValidationTest.java b/javatests/com/google/fhir/stu3/ValidationTest.java similarity index 99% rename from java/src/test/java/com/google/fhir/stu3/wrappers/ValidationTest.java rename to javatests/com/google/fhir/stu3/ValidationTest.java index 2947b2eaf..173bb2abb 100644 --- a/java/src/test/java/com/google/fhir/stu3/wrappers/ValidationTest.java +++ b/javatests/com/google/fhir/stu3/ValidationTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.fhir.stu3.wrappers; +package com.google.fhir.stu3; import com.google.devtools.build.runfiles.Runfiles; import com.google.fhir.common.JsonFormat; diff --git a/javatests/com/google/fhir/wrappers/BUILD b/javatests/com/google/fhir/wrappers/BUILD new file mode 100644 index 000000000..7840040c9 --- /dev/null +++ b/javatests/com/google/fhir/wrappers/BUILD @@ -0,0 +1,91 @@ +package( + default_visibility = ["//visibility:public"], +) + +licenses(["notice"]) + +java_test( + name = "DateTimeWrapperTest", + size = "small", + srcs = ["DateTimeWrapperTest.java"], + test_class = "com.google.fhir.wrappers.DateTimeWrapperTest", + deps = [ + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "DateWrapperTest", + size = "small", + srcs = ["DateWrapperTest.java"], + test_class = "com.google.fhir.wrappers.DateWrapperTest", + deps = [ + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "DecimalWrapperTest", + size = "small", + srcs = ["DecimalWrapperTest.java"], + test_class = "com.google.fhir.wrappers.DecimalWrapperTest", + deps = [ + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "ExtensionWrapperTest", + size = "medium", + srcs = ["ExtensionWrapperTest.java"], + data = [ + "//testdata/stu3:extensions", + ], + test_class = "com.google.fhir.wrappers.ExtensionWrapperTest", + deps = [ + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "//proto/google/fhir/proto/stu3:fhirproto_extensions_java_proto", + "//proto/google/fhir/proto/stu3:ml_extensions_java_proto", + "@bazel_tools//tools/java/runfiles", + "@com_google_protobuf//:protobuf_java", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "InstantWrapperTest", + size = "small", + srcs = ["InstantWrapperTest.java"], + test_class = "com.google.fhir.wrappers.InstantWrapperTest", + deps = [ + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) + +java_test( + name = "TimeWrapperTest", + size = "small", + srcs = ["TimeWrapperTest.java"], + test_class = "com.google.fhir.wrappers.TimeWrapperTest", + deps = [ + "//java/com/google/fhir/wrappers:primitive_wrappers", + "//proto/google/fhir/proto/r4/core:datatypes_java_proto", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) diff --git a/java/src/test/java/com/google/fhir/wrappers/DateTimeWrapperTest.java b/javatests/com/google/fhir/wrappers/DateTimeWrapperTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/wrappers/DateTimeWrapperTest.java rename to javatests/com/google/fhir/wrappers/DateTimeWrapperTest.java diff --git a/java/src/test/java/com/google/fhir/wrappers/DateWrapperTest.java b/javatests/com/google/fhir/wrappers/DateWrapperTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/wrappers/DateWrapperTest.java rename to javatests/com/google/fhir/wrappers/DateWrapperTest.java diff --git a/java/src/test/java/com/google/fhir/wrappers/DecimalWrapperTest.java b/javatests/com/google/fhir/wrappers/DecimalWrapperTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/wrappers/DecimalWrapperTest.java rename to javatests/com/google/fhir/wrappers/DecimalWrapperTest.java diff --git a/java/src/test/java/com/google/fhir/wrappers/ExtensionWrapperTest.java b/javatests/com/google/fhir/wrappers/ExtensionWrapperTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/wrappers/ExtensionWrapperTest.java rename to javatests/com/google/fhir/wrappers/ExtensionWrapperTest.java diff --git a/java/src/test/java/com/google/fhir/wrappers/InstantWrapperTest.java b/javatests/com/google/fhir/wrappers/InstantWrapperTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/wrappers/InstantWrapperTest.java rename to javatests/com/google/fhir/wrappers/InstantWrapperTest.java diff --git a/java/src/test/java/com/google/fhir/wrappers/TimeWrapperTest.java b/javatests/com/google/fhir/wrappers/TimeWrapperTest.java similarity index 100% rename from java/src/test/java/com/google/fhir/wrappers/TimeWrapperTest.java rename to javatests/com/google/fhir/wrappers/TimeWrapperTest.java diff --git a/proto/google/fhir/proto/r4/core/resources/BUILD b/proto/google/fhir/proto/r4/core/resources/BUILD index 6e06a578e..3143cd61c 100644 --- a/proto/google/fhir/proto/r4/core/resources/BUILD +++ b/proto/google/fhir/proto/r4/core/resources/BUILD @@ -1954,6 +1954,6 @@ filegroup( # as a maven jar. No bazel targets should ever depend on this. java_proto_library( name = "all_java_proto", - visibility = ["//java/src/main/java/com/google/fhir/release:__pkg__"], + visibility = ["//java/com/google/fhir/release:__pkg__"], deps = PROTO_DEPS + [":bundle_and_contained_resource_proto"], )