updates from rebase

world-federation-of-advertisers · Jan 3, 2025 · ebc077a · ebc077a
1 parent 654eaf0
commit ebc077a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 82 deletions.
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/BUILD.bazel b/src/main/proto/wfa/measurement/reporting/v2alpha/BUILD.bazel
@@ -21,10 +21,7 @@ proto_library(
         ":media_type_proto",
         ":page_proto",
         ":reporting_impression_qualification_filter_proto",
-<<<<<<< HEAD
         ":reporting_interval_proto",
-=======
->>>>>>> 30c4f0785 (updated from review)
         "@com_google_googleapis//google/api:field_behavior_proto",
         "@com_google_googleapis//google/api:resource_proto",
         "@com_google_protobuf//:timestamp_proto",
@@ -73,13 +70,9 @@ proto_library(
     srcs = ["impression_qualification_filter_spec.proto"],
     strip_import_prefix = IMPORT_PREFIX,
     deps = [
-<<<<<<< HEAD
         ":media_type_proto",
-        "@com_google_googleapis//google/api:field_behavior_proto",
         "@com_google_protobuf//:duration_proto",
-=======
         "@com_google_googleapis//google/api:field_behavior_proto",
->>>>>>> 30c4f0785 (updated from review)
     ],
 )
 
@@ -89,7 +82,6 @@ kt_jvm_proto_library(
 )
 
 proto_library(
-<<<<<<< HEAD
     name = "media_type_proto",
     srcs = ["media_type.proto"],
     strip_import_prefix = IMPORT_PREFIX,
@@ -103,8 +95,6 @@ kt_jvm_proto_library(
 )
 
 proto_library(
-=======
->>>>>>> 30c4f0785 (updated from review)
     name = "metric_proto",
     srcs = ["metric.proto"],
     strip_import_prefix = IMPORT_PREFIX,
@@ -214,25 +204,6 @@ kt_jvm_proto_library(
 proto_library(
     name = "reporting_impression_qualification_filter_proto",
     srcs = ["reporting_impression_qualification_filter.proto"],
-<<<<<<< HEAD
-=======
-    strip_import_prefix = IMPORT_PREFIX,
-    deps = [
-        ":impression_qualification_filter_spec_proto",
-        "@com_google_googleapis//google/api:field_behavior_proto",
-        "@com_google_googleapis//google/api:resource_proto",
-    ],
-)
-
-kt_jvm_proto_library(
-    name = "reporting_impression_qualification_filter_kt_jvm_proto",
-    deps = [":reporting_impression_qualification_filter_proto"],
-)
-
-proto_library(
-    name = "reporting_unit_proto",
-    srcs = ["reporting_unit.proto"],
->>>>>>> 30c4f0785 (updated from review)
     strip_import_prefix = IMPORT_PREFIX,
     deps = [
         ":impression_qualification_filter_spec_proto",
@@ -242,7 +213,6 @@ proto_library(
 )
 
 kt_jvm_proto_library(
-<<<<<<< HEAD
     name = "reporting_impression_qualification_filter_kt_jvm_proto",
     deps = [":reporting_impression_qualification_filter_proto"],
 )
@@ -275,8 +245,6 @@ proto_library(
 )
 
 kt_jvm_proto_library(
-=======
->>>>>>> 30c4f0785 (updated from review)
     name = "reporting_unit_kt_jvm_proto",
     deps = [":reporting_unit_proto"],
 )
@@ -311,10 +279,7 @@ proto_library(
     srcs = ["page.proto"],
     strip_import_prefix = IMPORT_PREFIX,
     deps = [
-<<<<<<< HEAD
         ":metric_frequency_spec_proto",
-=======
->>>>>>> 30c4f0785 (updated from review)
         ":reporting_impression_qualification_filter_proto",
         ":reporting_unit_proto",
         "@com_google_googleapis//google/api:field_behavior_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
@@ -22,10 +22,7 @@ import "google/protobuf/timestamp.proto";
 import "wfa/measurement/reporting/v2alpha/media_type.proto";
 import "wfa/measurement/reporting/v2alpha/page.proto";
 import "wfa/measurement/reporting/v2alpha/reporting_impression_qualification_filter.proto";
-<<<<<<< HEAD
 import "wfa/measurement/reporting/v2alpha/reporting_interval.proto";
-=======
->>>>>>> 30c4f0785 (updated from review)
 
 option java_package = "org.wfanet.measurement.reporting.v2alpha";
 option java_multiple_files = true;

diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/impression_qualification_filter_spec.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/impression_qualification_filter_spec.proto
@@ -17,53 +17,23 @@ syntax = "proto3";
 package wfa.measurement.reporting.v2alpha;
 
 import "google/api/field_behavior.proto";
-<<<<<<< HEAD
 import "google/protobuf/duration.proto";
 import "wfa/measurement/reporting/v2alpha/media_type.proto";
 
 option java_package = "org.wfanet.measurement.reporting.v2alpha";
 option java_multiple_files = true;
 option java_outer_classname = "ImpressionQualificationFilterSpecProto";
-=======
-
-option java_package = "org.wfanet.measurement.reporting.v2alpha";
-option java_multiple_files = true;
-option java_outer_classname = "ImpressionQualificationFilterProto";
->>>>>>> 30c4f0785 (updated from review)
 
 // Specifies the impression filter for a ReportingMediaType.
 //
 // If particular filter values are not applicable to the media they
 // are applied to it is an error (e.g. DISPLAY cannot be filtered by
 // percent completion)
 message ImpressionQualificationFilterSpec {
-<<<<<<< HEAD
   // The Media Type the filter is applicable to.
   MediaType media_type = 1 [
-=======
-  // Defines how filters related to Reporting Media Types.
-  //
-  // Generally, a Filter with a given Filter Type is applied to a Reporting Unit
-  // when the type matches that of the Reporting Media Type. However, a filer
-  // with type CROSS_MEDIA is applied when multiple Reporting Media Types are
-  // specified.
-  enum FilterType {
-    // Default value. Unused.
-    REPORTING_MEDIA_TYPE_UNSPECIFIED = 0;
-    // Filter is for Cross Media
-    CROSS_MEDIA = 1;
-    // Filter is for Video
-    VIDEO = 2;
-    // Filter is for Display
-    DISPLAY = 3;
-    // Filter is for Other
-    OTHER = 4;
-  }
-  // The type of filter.
-  FilterType filter_type = 1 [
->>>>>>> 30c4f0785 (updated from review)
-    (google.api.field_behavior) = REQUIRED,
-    (google.api.field_behavior) = IMMUTABLE
+      (google.api.field_behavior) = REQUIRED,
+      (google.api.field_behavior) = IMMUTABLE
   ];
 
   // Specifies a quantile
@@ -84,10 +54,7 @@ message ImpressionQualificationFilterSpec {
 
   // Specify a percent as a fraction or as a quantile
   message Percent {
-<<<<<<< HEAD
-    // Required
-=======
->>>>>>> 30c4f0785 (updated from review)
+   // Required
     oneof value {
       // The fraction
       float fraction = 1 [(google.api.field_behavior) = IMMUTABLE];
@@ -101,7 +68,6 @@ message ImpressionQualificationFilterSpec {
     (google.api.field_behavior) = REQUIRED,
     (google.api.field_behavior) = IMMUTABLE
   ];
-<<<<<<< HEAD
 
   // Specifies the completion filter
   oneof completion {
@@ -111,8 +77,4 @@ message ImpressionQualificationFilterSpec {
     google.protobuf.Duration duration = 4
         [(google.api.field_behavior) = IMMUTABLE];
   }
-=======
-  // Specifies the completion filter
-  Percent completion = 3 [(google.api.field_behavior) = IMMUTABLE];
->>>>>>> 30c4f0785 (updated from review)
 }
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/page.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/page.proto
@@ -19,10 +19,7 @@ package wfa.measurement.reporting.v2alpha;
 import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 import "google/type/interval.proto";
-<<<<<<< HEAD
 import "wfa/measurement/reporting/v2alpha/metric_frequency_spec.proto";
-=======
->>>>>>> 30c4f0785 (updated from review)
 import "wfa/measurement/reporting/v2alpha/reporting_impression_qualification_filter.proto";
 import "wfa/measurement/reporting/v2alpha/reporting_unit.proto";