diff options
Diffstat (limited to 'adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation')
5 files changed, 82 insertions, 128 deletions
diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateEncryptionKeyManagerIntegrationTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateEncryptionKeyManagerIntegrationTest.java index 3599e1d054..e45de13395 100644 --- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateEncryptionKeyManagerIntegrationTest.java +++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateEncryptionKeyManagerIntegrationTest.java @@ -20,10 +20,11 @@ import static org.mockito.Mockito.when; import android.net.Uri; +import com.android.adservices.data.DbTestUtil; import com.android.adservices.data.measurement.AbstractDbIntegrationTest; import com.android.adservices.data.measurement.DatastoreManager; -import com.android.adservices.data.measurement.DatastoreManagerFactory; import com.android.adservices.data.measurement.DbState; +import com.android.adservices.data.measurement.SQLDatastoreManager; import org.json.JSONException; import org.junit.Assert; @@ -74,7 +75,8 @@ public class AggregateEncryptionKeyManagerIntegrationTest extends AbstractDbInte @Override public void runActionToTest() { - DatastoreManager datastoreManager = DatastoreManagerFactory.getDatastoreManager(sContext); + DatastoreManager datastoreManager = + new SQLDatastoreManager(DbTestUtil.getDbHelperForTest()); AggregateEncryptionKeyManager aggregateEncryptionKeyManager = new AggregateEncryptionKeyManager(datastoreManager, mFetcher, mClock, MEASUREMENT_AGGREGATE_ENCRYPTION_KEY_COORDINATOR_URL); diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateFilterDataTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateFilterDataTest.java deleted file mode 100644 index 644ef1a07a..0000000000 --- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateFilterDataTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.adservices.service.measurement.aggregation; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; - -import androidx.test.filters.SmallTest; - -import org.junit.Test; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** Unit tests for {@link AggregateFilterData} */ -@SmallTest -public final class AggregateFilterDataTest { - - @Test - public void testCreation() throws Exception { - AggregateFilterData attributionFilterData = createExample(); - - assertEquals(attributionFilterData.getAttributionFilterMap().size(), 2); - assertEquals(attributionFilterData.getAttributionFilterMap().get("type").size(), 4); - assertEquals(attributionFilterData.getAttributionFilterMap().get("ctid").size(), 1); - } - - @Test - public void testDefaults() throws Exception { - AggregateFilterData data = new AggregateFilterData.Builder().build(); - assertEquals(data.getAttributionFilterMap().size(), 0); - } - - @Test - public void testHashCode_equals() throws Exception { - final AggregateFilterData data1 = createExample(); - final AggregateFilterData data2 = createExample(); - final Set<AggregateFilterData> dataSet1 = Set.of(data1); - final Set<AggregateFilterData> dataSet2 = Set.of(data2); - assertEquals(data1.hashCode(), data2.hashCode()); - assertEquals(data1, data2); - assertEquals(dataSet1, dataSet2); - } - - @Test - public void testHashCode_notEquals() throws Exception { - final AggregateFilterData data1 = createExample(); - - Map<String, List<String>> attributionFilterMap = new HashMap<>(); - attributionFilterMap.put("type", Arrays.asList("2", "3", "4")); - attributionFilterMap.put("ctid", Collections.singletonList("id")); - - final AggregateFilterData data2 = - new AggregateFilterData.Builder() - .setAttributionFilterMap(attributionFilterMap) - .build(); - final Set<AggregateFilterData> dataSet1 = Set.of(data1); - final Set<AggregateFilterData> dataSet2 = Set.of(data2); - assertNotEquals(data1.hashCode(), data2.hashCode()); - assertNotEquals(data1, data2); - assertNotEquals(dataSet1, dataSet2); - } - - private AggregateFilterData createExample() { - Map<String, List<String>> attributionFilterMap = new HashMap<>(); - attributionFilterMap.put("type", Arrays.asList("1", "2", "3", "4")); - attributionFilterMap.put("ctid", Collections.singletonList("id")); - - return new AggregateFilterData.Builder() - .setAttributionFilterMap(attributionFilterMap) - .build(); - } -} diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java index baeab5ff74..f55d7d28eb 100644 --- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java +++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregatePayloadGeneratorTest.java @@ -16,6 +16,8 @@ package com.android.adservices.service.measurement.aggregation; +import com.android.adservices.service.measurement.FilterData; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -48,12 +50,12 @@ public final class AggregatePayloadGeneratorTest { Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); sourceFilterMap.put("ctid", Collections.singletonList("id")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); @@ -67,9 +69,9 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(1024L)) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()) - .setNotFilter(new AggregateFilterData.Builder() + .setNotFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataNotFilter1).build()).build()); // Apply this key_piece to "geoValue". triggerDataList.add( @@ -107,18 +109,18 @@ public final class AggregatePayloadGeneratorTest { Map<String, BigInteger> aggregatableSource = new HashMap<>(); aggregatableSource.put("campaignCounts", BigInteger.valueOf(345L)); aggregatableSource.put("geoValue", BigInteger.valueOf(5L)); - aggregatableSource.put("thirdSource", BigInteger.valueOf(100L)); + aggregatableSource.put("thirdSource", BigInteger.valueOf(101L)); Map<String, List<String>> sourceFilterMap = new HashMap<>(); sourceFilterMap.put("conversion_subdomain", Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); sourceFilterMap.put("ctid", Collections.singletonList("id")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); // Apply this key_piece to "campaignCounts". @@ -131,9 +133,9 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(1024L)) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()) - .setNotFilter(new AggregateFilterData.Builder() + .setNotFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataNotFilter1).build()) .build()); // Apply this key_piece to "geoValue". @@ -158,13 +160,16 @@ public final class AggregatePayloadGeneratorTest { assertTrue(aggregateHistogramContributions.isPresent()); List<AggregateHistogramContribution> contributions = aggregateHistogramContributions.get(); - assertEquals(contributions.size(), 2); + assertEquals(contributions.size(), 3); assertTrue(contributions.contains( new AggregateHistogramContribution.Builder() .setKey(BigInteger.valueOf(1369L)).setValue(32768).build())); assertTrue(contributions.contains( new AggregateHistogramContribution.Builder() .setKey(BigInteger.valueOf(2693L)).setValue(1664).build())); + assertTrue(contributions.contains( + new AggregateHistogramContribution.Builder() + .setKey(BigInteger.valueOf(101L)).setValue(100).build())); } @Test @@ -178,12 +183,12 @@ public final class AggregatePayloadGeneratorTest { Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); sourceFilterMap.put("ctid", Collections.singletonList("id")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); // Apply this key_piece to "campaignCounts". @@ -196,9 +201,9 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(1024L)) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()) - .setNotFilter(new AggregateFilterData.Builder() + .setNotFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataNotFilter1).build()) .build()); // Apply this key_piece to "geoValue". @@ -220,7 +225,7 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(200L)) .setSourceKeys(new HashSet<>(Arrays.asList("campaignCounts", "geoValue"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter2).build()) .build()); @@ -256,12 +261,12 @@ public final class AggregatePayloadGeneratorTest { sourceFilterMap.put("conversion_subdomain", Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); @@ -273,7 +278,7 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(2L).shiftLeft(63)) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()).build()); Map<String, Integer> values = new HashMap<>(); @@ -305,12 +310,12 @@ public final class AggregatePayloadGeneratorTest { sourceFilterMap.put("conversion_subdomain", Collections.singletonList("electronics.megastore")); sourceFilterMap.put("product", Arrays.asList("1234", "234")); - AggregateFilterData sourceFilter = new AggregateFilterData.Builder() + FilterData sourceFilter = new FilterData.Builder() .setAttributionFilterMap(sourceFilterMap).build(); AggregatableAttributionSource attributionSource = new AggregatableAttributionSource.Builder() .setAggregatableSource(aggregatableSource) - .setAggregateFilterData(sourceFilter).build(); + .setFilterData(sourceFilter).build(); // Build AggregatableAttributionTrigger. List<AggregateTriggerData> triggerDataList = new ArrayList<>(); @@ -322,7 +327,7 @@ public final class AggregatePayloadGeneratorTest { new AggregateTriggerData.Builder() .setKey(BigInteger.valueOf(2L).shiftLeft(63).add(BigInteger.valueOf(4L))) .setSourceKeys(new HashSet<>(Collections.singletonList("campaignCounts"))) - .setFilter(new AggregateFilterData.Builder() + .setFilter(new FilterData.Builder() .setAttributionFilterMap(triggerDataFilter1).build()).build()); Map<String, Integer> values = new HashMap<>(); diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateReportTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateReportTest.java index 5dc25302c2..4cf1de7fc8 100644 --- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateReportTest.java +++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateReportTest.java @@ -25,16 +25,21 @@ import android.net.Uri; import androidx.test.filters.SmallTest; +import com.android.adservices.service.measurement.util.UnsignedLong; + import org.junit.Test; import java.util.Set; +import java.util.UUID; /** Unit tests for {@link AggregateReport} */ @SmallTest public final class AggregateReportTest { - private static final Long SOURCE_DEBUG_KEY = 237865L; - private static final Long TRIGGER_DEBUG_KEY = 928762L; + private static final UnsignedLong SOURCE_DEBUG_KEY = new UnsignedLong(237865L); + private static final UnsignedLong TRIGGER_DEBUG_KEY = new UnsignedLong(928762L); + private static final String SOURCE_ID = UUID.randomUUID().toString(); + private static final String TRIGGER_ID = UUID.randomUUID().toString(); private AggregateReport createAttributionReport() { return new AggregateReport.Builder() @@ -47,9 +52,12 @@ public final class AggregateReportTest { .setDebugCleartextPayload(" key: 1369, value: 32768; key: 3461, value: 1664;") .setAggregateAttributionData(new AggregateAttributionData.Builder().build()) .setStatus(AggregateReport.Status.PENDING) + .setDebugReportStatus(AggregateReport.DebugReportStatus.PENDING) .setApiVersion("1452") .setSourceDebugKey(SOURCE_DEBUG_KEY) .setTriggerDebugKey(TRIGGER_DEBUG_KEY) + .setSourceId(SOURCE_ID) + .setTriggerId(TRIGGER_ID) .build(); } @@ -64,8 +72,11 @@ public final class AggregateReportTest { .setDebugCleartextPayload(" key: 1369, value: 32768; key: 3461, value: 1664;") .setAggregateAttributionData(new AggregateAttributionData.Builder().build()) .setStatus(AggregateReport.Status.PENDING) + .setDebugReportStatus(AggregateReport.DebugReportStatus.PENDING) .setApiVersion("1452") .setTriggerDebugKey(TRIGGER_DEBUG_KEY) + .setSourceId(SOURCE_ID) + .setTriggerId(TRIGGER_ID) .build(); } @@ -80,8 +91,11 @@ public final class AggregateReportTest { .setDebugCleartextPayload(" key: 1369, value: 32768; key: 3461, value: 1664;") .setAggregateAttributionData(new AggregateAttributionData.Builder().build()) .setStatus(AggregateReport.Status.PENDING) + .setDebugReportStatus(AggregateReport.DebugReportStatus.PENDING) .setApiVersion("1452") .setSourceDebugKey(SOURCE_DEBUG_KEY) + .setSourceId(SOURCE_ID) + .setTriggerId(TRIGGER_ID) .build(); } @@ -99,13 +113,18 @@ public final class AggregateReportTest { attributionReport.getDebugCleartextPayload()); assertNotNull(attributionReport.getAggregateAttributionData()); assertEquals(AggregateReport.Status.PENDING, attributionReport.getStatus()); + assertEquals( + AggregateReport.DebugReportStatus.PENDING, + attributionReport.getDebugReportStatus()); assertEquals("1452", attributionReport.getApiVersion()); assertEquals(SOURCE_DEBUG_KEY, attributionReport.getSourceDebugKey()); assertEquals(TRIGGER_DEBUG_KEY, attributionReport.getTriggerDebugKey()); + assertEquals(SOURCE_ID, attributionReport.getSourceId()); + assertEquals(TRIGGER_ID, attributionReport.getTriggerId()); } @Test - public void testCreationSingleSourceDebugKey() throws Exception { + public void testCreationSingleSourceDebugKey() { AggregateReport attributionReport = createAttributionReportSingleSourceDebugKey(); assertEquals("1", attributionReport.getId()); assertEquals(Uri.parse("android-app://com.example.abc"), attributionReport.getPublisher()); @@ -119,13 +138,18 @@ public final class AggregateReportTest { attributionReport.getDebugCleartextPayload()); assertNotNull(attributionReport.getAggregateAttributionData()); assertEquals(AggregateReport.Status.PENDING, attributionReport.getStatus()); + assertEquals( + AggregateReport.DebugReportStatus.PENDING, + attributionReport.getDebugReportStatus()); assertEquals("1452", attributionReport.getApiVersion()); assertEquals(SOURCE_DEBUG_KEY, attributionReport.getSourceDebugKey()); assertNull(attributionReport.getTriggerDebugKey()); + assertEquals(SOURCE_ID, attributionReport.getSourceId()); + assertEquals(TRIGGER_ID, attributionReport.getTriggerId()); } @Test - public void testCreationSingleTriggerDebugKey() throws Exception { + public void testCreationSingleTriggerDebugKey() { AggregateReport attributionReport = createAttributionReportSingleTriggerDebugKey(); assertEquals("1", attributionReport.getId()); assertEquals(Uri.parse("android-app://com.example.abc"), attributionReport.getPublisher()); @@ -139,9 +163,14 @@ public final class AggregateReportTest { attributionReport.getDebugCleartextPayload()); assertNotNull(attributionReport.getAggregateAttributionData()); assertEquals(AggregateReport.Status.PENDING, attributionReport.getStatus()); + assertEquals( + AggregateReport.DebugReportStatus.PENDING, + attributionReport.getDebugReportStatus()); assertEquals("1452", attributionReport.getApiVersion()); assertNull(attributionReport.getSourceDebugKey()); assertEquals(TRIGGER_DEBUG_KEY, attributionReport.getTriggerDebugKey()); + assertEquals(SOURCE_ID, attributionReport.getSourceId()); + assertEquals(TRIGGER_ID, attributionReport.getTriggerId()); } @Test @@ -157,9 +186,13 @@ public final class AggregateReportTest { assertNull(attributionReport.getDebugCleartextPayload()); assertNull(attributionReport.getAggregateAttributionData()); assertEquals(AggregateReport.Status.PENDING, attributionReport.getStatus()); + assertEquals( + AggregateReport.DebugReportStatus.NONE, attributionReport.getDebugReportStatus()); assertNull(attributionReport.getApiVersion()); assertNull(attributionReport.getSourceDebugKey()); assertNull(attributionReport.getTriggerDebugKey()); + assertNull(attributionReport.getSourceId()); + assertNull(attributionReport.getTriggerId()); } @Test @@ -188,7 +221,10 @@ public final class AggregateReportTest { " key: 1369, value: 32768; key: 3461, value: 1664;") .setAggregateAttributionData(new AggregateAttributionData.Builder().build()) .setStatus(AggregateReport.Status.PENDING) + .setDebugReportStatus(AggregateReport.DebugReportStatus.PENDING) .setApiVersion("1452") + .setSourceId(SOURCE_ID) + .setTriggerId(TRIGGER_ID) .build(); Set<AggregateReport> attributionReportSet1 = Set.of(attributionReport1); Set<AggregateReport> attributionReportSet2 = Set.of(attributionReport2); diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateTriggerDataTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateTriggerDataTest.java index 4d4c920c8a..731f1554f8 100644 --- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateTriggerDataTest.java +++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/aggregation/AggregateTriggerDataTest.java @@ -16,6 +16,8 @@ package com.android.adservices.service.measurement.aggregation; +import com.android.adservices.service.measurement.FilterData; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -45,8 +47,8 @@ public final class AggregateTriggerDataTest { assertEquals(attributionTriggerData.getKey().longValue(), 5L); assertEquals(attributionTriggerData.getSourceKeys().size(), 3); assertTrue(attributionTriggerData.getFilter().isPresent()); - AggregateFilterData filterData = attributionTriggerData.getFilter().get(); - AggregateFilterData nonFilteredData = attributionTriggerData.getNotFilter().get(); + FilterData filterData = attributionTriggerData.getFilter().get(); + FilterData nonFilteredData = attributionTriggerData.getNotFilter().get(); assertEquals(2, filterData.getAttributionFilterMap().get("ctid").size()); assertEquals(1, nonFilteredData.getAttributionFilterMap().get("nctid").size()); } @@ -78,15 +80,15 @@ public final class AggregateTriggerDataTest { Map<String, List<String>> attributionFilterMap = new HashMap<>(); attributionFilterMap.put("ctid", Arrays.asList("1")); - AggregateFilterData filterData = - new AggregateFilterData.Builder() + FilterData filterData = + new FilterData.Builder() .setAttributionFilterMap(attributionFilterMap) .build(); Map<String, List<String>> attributionNonFilterMap = new HashMap<>(); attributionNonFilterMap.put("other", Arrays.asList("1")); - AggregateFilterData nonFilterData = - new AggregateFilterData.Builder() + FilterData nonFilterData = + new FilterData.Builder() .setAttributionFilterMap(attributionNonFilterMap) .build(); @@ -110,15 +112,15 @@ public final class AggregateTriggerDataTest { private AggregateTriggerData createExample() { Map<String, List<String>> attributionFilterMap = new HashMap<>(); attributionFilterMap.put("ctid", Arrays.asList("1", "2")); - AggregateFilterData filterData = - new AggregateFilterData.Builder() + FilterData filterData = + new FilterData.Builder() .setAttributionFilterMap(attributionFilterMap) .build(); Map<String, List<String>> attributionNonFilterMap = new HashMap<>(); attributionNonFilterMap.put("nctid", Arrays.asList("3")); - AggregateFilterData nonFilterData = - new AggregateFilterData.Builder() + FilterData nonFilterData = + new FilterData.Builder() .setAttributionFilterMap(attributionNonFilterMap) .build(); |