rebased

world-federation-of-advertisers · Jan 18, 2025 · 79aa781 · 79aa781
1 parent 8be88d7
commit 79aa781
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 50 deletions.
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/BUILD.bazel b/src/main/proto/wfa/measurement/reporting/v2alpha/BUILD.bazel
@@ -131,38 +131,6 @@ kt_jvm_proto_library(
     deps = [":impression_qualification_filter_spec_proto"],
 )
 
-proto_library(
-    name = "media_type_proto",
-    srcs = ["media_type.proto"],
-    strip_import_prefix = IMPORT_PREFIX,
-    deps = [
-        ":reporting_common_proto",
-        "@com_google_googleapis//google/api:field_behavior_proto",
-        "@com_google_googleapis//google/api:resource_proto",
-    ],
-)
-
-kt_jvm_proto_library(
-    name = "impression_qualification_filter_kt_jvm_proto",
-    deps = [":impression_qualification_filter_proto"],
-)
-
-proto_library(
-    name = "impression_qualification_filter_spec_proto",
-    srcs = ["impression_qualification_filter_spec.proto"],
-    strip_import_prefix = IMPORT_PREFIX,
-    deps = [
-        "@com_google_googleapis//google/api:field_behavior_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_googleapis//google/api:field_behavior_proto",
-    ],
-)
-
-kt_jvm_proto_library(
-    name = "impression_qualification_filter_spec_kt_jvm_proto",
-    deps = [":impression_qualification_filter_spec_proto"],
-)
-
 proto_library(
     name = "media_type_proto",
     srcs = ["media_type.proto"],

diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/basic_report.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/basic_report.proto
@@ -70,7 +70,7 @@ message BasicReport {
   // The custom criteria and any specific impression_qualification_filter may
   // each be used at most once.
   repeated ReportingImpressionQualificationFilter
-      impression_qualification_filters = 5 [
+      impression_qualification_filters = 6 [
         (google.api.field_behavior) = REQUIRED,
         (google.api.field_behavior) = IMMUTABLE
       ];

diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/impression_qualification_filter.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/impression_qualification_filter.proto
@@ -56,12 +56,4 @@ message ImpressionQualificationFilter {
     (google.api.field_behavior) = REQUIRED,
     (google.api.field_behavior) = IMMUTABLE
   ];
-
-  // Specifies the filter criteria for each MediaType.
-  //
-  // They may be at most one spec per MediaType.
-  repeated ImpressionQualificationFilterSpec filter_specs = 4 [
-    (google.api.field_behavior) = REQUIRED,
-    (google.api.field_behavior) = IMMUTABLE
-  ];
 }
diff --git a/...in/proto/wfa/measurement/reporting/v2alpha/impression_qualification_filters_service.proto b/...in/proto/wfa/measurement/reporting/v2alpha/impression_qualification_filters_service.proto
@@ -21,8 +21,6 @@ import "google/api/client.proto";
 import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 import "wfa/measurement/reporting/v2alpha/impression_qualification_filter.proto";
-import "wfa/measurement/reporting/v2alpha/impression_qualification_filter_spec.proto";
-import "wfa/measurement/reporting/v2alpha/media_type.proto";
 
 option java_package = "org.wfanet.measurement.reporting.v2alpha";
 option java_multiple_files = true;

diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/page.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/page.proto
@@ -333,13 +333,6 @@ message Page {
           [(google.api.field_behavior) = IMMUTABLE];
     }
 
-    // A summary of each component of the reporting_unit reported on
-    message ReportingUnitSummary {
-      // Component summaries
-      repeated ReportingUnitComponentSummary reporting_unit_component_summary =
-          1 [(google.api.field_behavior) = IMMUTABLE];
-    }
-
     // A summary of each component of the reporting_unit reported on
     message ReportingUnitSummary {
       // Component summaries