From 70c794b04230f5dafd612300d409dfd7df98ebca Mon Sep 17 00:00:00 2001 From: Google APIs Date: Mon, 7 Dec 2020 10:13:54 -0800 Subject: [PATCH] chore: migrate analytics to the Java microgenerator Committer: @miraleung PiperOrigin-RevId: 346120301 --- google/analytics/admin/v1alpha/BUILD.bazel | 11 ++- .../admin/v1alpha/analyticsadmin_gapic.yaml | 2 - .../analytics/admin/v1alpha/resources.proto | 72 ++++++++++++------- google/analytics/data/v1alpha/BUILD.bazel | 11 ++- .../data/v1alpha/analyticsdata_gapic.yaml | 2 - 5 files changed, 55 insertions(+), 43 deletions(-) diff --git a/google/analytics/admin/v1alpha/BUILD.bazel b/google/analytics/admin/v1alpha/BUILD.bazel index ae695a3e..a57635b9 100644 --- a/google/analytics/admin/v1alpha/BUILD.bazel +++ b/google/analytics/admin/v1alpha/BUILD.bazel @@ -46,12 +46,13 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", + java_gapic_library = "java_gapic_library2", + java_gapic_test = "java_gapic_test2", "java_grpc_library", "java_proto_library", ) @@ -69,11 +70,9 @@ java_grpc_library( java_gapic_library( name = "admin_java_gapic", - src = ":admin_proto_with_info", - gapic_yaml = "analyticsadmin_gapic.yaml", + srcs = [":admin_proto_with_info"], grpc_service_config = "admin_grpc_service_config.json", package = "google.analytics.admin.v1alpha", - service_yaml = "analyticsadmin_v1alpha.yaml", test_deps = [ ":admin_java_grpc", ], diff --git a/google/analytics/admin/v1alpha/analyticsadmin_gapic.yaml b/google/analytics/admin/v1alpha/analyticsadmin_gapic.yaml index f7b563d9..a6a8ef8e 100644 --- a/google/analytics/admin/v1alpha/analyticsadmin_gapic.yaml +++ b/google/analytics/admin/v1alpha/analyticsadmin_gapic.yaml @@ -1,8 +1,6 @@ type: com.google.api.codegen.ConfigProto config_schema_version: 2.0.0 language_settings: - java: - package_name: com.google.analytics.admin.v1alpha python: package_name: google.analytics.admin.v1alpha.gapic go: diff --git a/google/analytics/admin/v1alpha/resources.proto b/google/analytics/admin/v1alpha/resources.proto index ce96dd84..4830e0c3 100644 --- a/google/analytics/admin/v1alpha/resources.proto +++ b/google/analytics/admin/v1alpha/resources.proto @@ -144,10 +144,12 @@ message Account { string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when this account was originally created. - google.protobuf.Timestamp create_time = 2 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp create_time = 2 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when account payload fields were last updated. - google.protobuf.Timestamp update_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp update_time = 3 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Required. Human-readable display name for this account. string display_name = 4 [(google.api.field_behavior) = REQUIRED]; @@ -177,10 +179,12 @@ message Property { string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when the entity was originally created. - google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp create_time = 3 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when entity payload fields were last updated. - google.protobuf.Timestamp update_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp update_time = 4 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Immutable. Resource name of this property's logical parent. // @@ -216,8 +220,9 @@ message Property { // Examples: "USD", "EUR", "JPY" string currency_code = 8; - // Output only. Indicates whether this Property is soft-deleted or not. Deleted properties - // are excluded from List results unless specifically requested. + // Output only. Indicates whether this Property is soft-deleted or not. + // Deleted properties are excluded from List results unless specifically + // requested. bool deleted = 9 [(google.api.field_behavior) = OUTPUT_ONLY]; } @@ -238,10 +243,12 @@ message AndroidAppDataStream { string firebase_app_id = 2 [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when this stream was originally created. - google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp create_time = 3 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when stream payload fields were last updated. - google.protobuf.Timestamp update_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp update_time = 4 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Immutable. The package name for the app being measured. // Example: "com.example.myandroidapp" @@ -270,10 +277,12 @@ message IosAppDataStream { string firebase_app_id = 2 [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when this stream was originally created. - google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp create_time = 3 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when stream payload fields were last updated. - google.protobuf.Timestamp update_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp update_time = 4 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Required. Immutable. The Apple App Store Bundle ID for the app // Example: "com.example.myiosapp" @@ -309,10 +318,12 @@ message WebDataStream { string firebase_app_id = 3 [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when this stream was originally created. - google.protobuf.Timestamp create_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp create_time = 4 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when stream payload fields were last updated. - google.protobuf.Timestamp update_time = 5 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp update_time = 5 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Immutable. Domain name of the web app being measured, or empty. // Example: "http://www.google.com", "https://www.google.com" @@ -400,8 +411,8 @@ message EnhancedMeasurementSettings { // whether they are respected. bool stream_enabled = 2; - // Output only. If enabled, capture a page view event each time a page loads or the - // website changes the browser history state. + // Output only. If enabled, capture a page view event each time a page loads + // or the website changes the browser history state. bool page_views_enabled = 3 [(google.api.field_behavior) = OUTPUT_ONLY]; // If enabled, capture scroll events each time a visitor gets to the bottom of @@ -473,9 +484,9 @@ message FirebaseLink { // Output only. Example format: properties/1234/firebaseLinks/5678 string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; - // Immutable. Firebase project resource name. When creating a FirebaseLink, you may - // provide this resource name using either a project number or project ID. - // Once this resource has been created, returned FirebaseLinks will always + // Immutable. Firebase project resource name. When creating a FirebaseLink, + // you may provide this resource name using either a project number or project + // ID. Once this resource has been created, returned FirebaseLinks will always // have a project_name that contains a project number. // // Format: 'projects/{project number}' @@ -483,7 +494,8 @@ message FirebaseLink { string project = 2 [(google.api.field_behavior) = IMMUTABLE]; // Output only. Time when this FirebaseLink was originally created. - google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp create_time = 3 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Maximum user access to the GA4 property allowed to admins of // the linked Firebase project. @@ -498,9 +510,12 @@ message GlobalSiteTag { pattern: "properties/{property}/globalSiteTag" }; - // Immutable. JavaScript code snippet to be pasted as the first item into the head tag of - // every webpage to measure. + // Immutable. JavaScript code snippet to be pasted as the first item into the + // head tag of every webpage to measure. string snippet = 1 [(google.api.field_behavior) = IMMUTABLE]; + + // The resource name of this tag. + string name = 2; } // A link between an GA4 property and a Google Ads account. @@ -510,7 +525,8 @@ message GoogleAdsLink { pattern: "properties/{property}/googleAdsLinks/{google_ads_link}" }; - // Output only. Format: properties/{propertyId}/googleAdsLinks/{googleAdsLinkId} + // Output only. Format: + // properties/{propertyId}/googleAdsLinks/{googleAdsLinkId} // // Note: googleAdsLinkId is not the Google Ads customer ID. string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; @@ -535,10 +551,12 @@ message GoogleAdsLink { string email_address = 6 [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when this link was originally created. - google.protobuf.Timestamp create_time = 7 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp create_time = 7 + [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Time when this link was last updated. - google.protobuf.Timestamp update_time = 8 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp update_time = 8 + [(google.api.field_behavior) = OUTPUT_ONLY]; } // A resource message representing data sharing settings of a Google Analytics @@ -591,8 +609,8 @@ message AccountSummary { // Format: accounts/{account_id} // Example: "accounts/1000" string account = 2 [(google.api.resource_reference) = { - type: "analyticsadmin.googleapis.com/Account" - }]; + type: "analyticsadmin.googleapis.com/Account" + }]; // Display name for the account referred to in this account summary. string display_name = 3; @@ -607,8 +625,8 @@ message PropertySummary { // Format: properties/{property_id} // Example: "properties/1000" string property = 1 [(google.api.resource_reference) = { - type: "analyticsadmin.googleapis.com/Property" - }]; + type: "analyticsadmin.googleapis.com/Property" + }]; // Display name for the property referred to in this account summary. string display_name = 2; diff --git a/google/analytics/data/v1alpha/BUILD.bazel b/google/analytics/data/v1alpha/BUILD.bazel index 8904e224..3ae4cb03 100644 --- a/google/analytics/data/v1alpha/BUILD.bazel +++ b/google/analytics/data/v1alpha/BUILD.bazel @@ -42,12 +42,13 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", + java_gapic_library = "java_gapic_library2", + java_gapic_test = "java_gapic_test2", "java_grpc_library", "java_proto_library", ) @@ -65,11 +66,9 @@ java_grpc_library( java_gapic_library( name = "data_java_gapic", - src = ":data_proto_with_info", - gapic_yaml = "analyticsdata_gapic.yaml", + srcs = [":data_proto_with_info"], grpc_service_config = "analytics_data_grpc_service_config.json", package = "google.analytics.data.v1alpha", - service_yaml = "analyticsdata_v1alpha.yaml", test_deps = [ ":data_java_grpc", ], diff --git a/google/analytics/data/v1alpha/analyticsdata_gapic.yaml b/google/analytics/data/v1alpha/analyticsdata_gapic.yaml index 6ab3aef1..78f5d04d 100644 --- a/google/analytics/data/v1alpha/analyticsdata_gapic.yaml +++ b/google/analytics/data/v1alpha/analyticsdata_gapic.yaml @@ -1,8 +1,6 @@ type: com.google.api.codegen.ConfigProto config_schema_version: 2.0.0 language_settings: - java: - package_name: com.google.analytics.data.v1alpha python: package_name: google.analytics.data.v1alpha.gapic go: