Add additional AMM fields to AttributionData

Summary:
This diff adds four new AMM (Advanced Measurement and Matching) fields to the Java Business SDK AttributionData class:

1. **attributionMethod** (AttributionMethodEnum): The attribution method used to attribute the event (values: ard, deeplink, gpir, invalid_response, mir, srn)
2. **declineReason** (DeclineReasonEnum): The decline reason for the attribution (values: lookback, inactive, fraud_detected, etc.)
3. **auditingToken** (String): The auditing token for the attribution
4. **linkageKey** (String): The linkage key for the attribution

These fields are part of the ongoing work to enhance attribution tracking capabilities in the Conversions API. This builds upon the initial AMM fields added in v24.0.0.

**Changes:**
- Created new enum classes: `AttributionMethodEnum.java` and `DeclineReasonEnum.java`
- Updated `AttributionData.java` with new fields, getters/setters, constructor parameters, equals/hashCode methods
- Updated `AttributionDataTest.java` to test the new fields
- Updated CHANGELOG.md to version v24.0.1

Reviewed By: danbunnell, satwikareddy3

Differential Revision:
D85200208

Privacy Context Container: L1380952

fbshipit-source-id: 73ce2b8211e173f861458bd1dd162ed79e2f95b9

Author: Ji Li

CHANGELOG.md

@@ -5,9 +5,12 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
-## v24.0.0
-
+## v24.0.1
+### Added
+- Add additional AMM fields: attribution_method, decline_reason, auditing_token, linkage_key
+- Add attribution_setting field with inactivity_window_hours and reattribution_window_hours to AttributionData
 
+## v24.0.0
 ### Added
 - Add AMM fields to attribution data
 

src/main/java/com/facebook/ads/sdk/serverside/AttributionData.java

@@ -56,6 +56,21 @@ public class AttributionData {
 
     @SerializedName("touchpoint_ts")
     private Integer touchpointTs = null;
+
+    @SerializedName("attribution_method")
+    private AttributionMethodEnum attributionMethod = null;
+
+    @SerializedName("decline_reason")
+    private DeclineReasonEnum declineReason = null;
+
+    @SerializedName("auditing_token")
+    private String auditingToken = null;
+
+    @SerializedName("linkage_key")
+    private String linkageKey = null;
+
+    @SerializedName("attribution_setting")
+    private AttributionSetting attributionSetting = null;
 
     /**
      * Default constructor
@@ -78,10 +93,16 @@ public AttributionData() {
      * @param attributionSource The attribution source to differentiate the source of the data, e.g. whether this is from AMM or Custom Attribution or any other sources.
      * @param touchpointType The engagement type that caused the original credited conversion.
      * @param touchpointTs The time when the touchpoint event occurred with the ad that the install was credited to.
+     * @param attributionMethod The attribution method used to attribute the event.
+     * @param declineReason The decline reason for the attribution.
+     * @param auditingToken The auditing token for the attribution.
+     * @param linkageKey The linkage key for the attribution.
+     * @param attributionSetting The attribution setting with inactivity and reattribution window configuration.
      */
     public AttributionData(String scope, Long visitTime, String adId, String adsetId, String campaignId, 
         Float attributionShare, AttributionModelEnum attributionModel, Integer attributionWindow, Float attributionValue,
-        String attributionSource, String touchpointType, Integer touchpointTs) {
+        String attributionSource, String touchpointType, Integer touchpointTs, AttributionMethodEnum attributionMethod,
+        DeclineReasonEnum declineReason, String auditingToken, String linkageKey, AttributionSetting attributionSetting) {
       this.scope = scope;
       this.visitTime = visitTime;
       this.adId = adId;
@@ -94,6 +115,11 @@ public AttributionData(String scope, Long visitTime, String adId, String adsetId
       this.attributionSource = attributionSource;
       this.touchpointType = touchpointType;
       this.touchpointTs = touchpointTs;
+      this.attributionMethod = attributionMethod;
+      this.declineReason = declineReason;
+      this.auditingToken = auditingToken;
+      this.linkageKey = linkageKey;
+      this.attributionSetting = attributionSetting;
     }
 
     /**
@@ -444,6 +470,151 @@ public void setTouchpointTs(Integer touchpointTs) {
       this.touchpointTs = touchpointTs;
     }
 
+    /**
+     * Set attributionMethod
+     * 
+     * @param attributionMethod The attribution method used to attribute the event.
+     * @return AttributionData
+     */
+    public AttributionData attributionMethod(AttributionMethodEnum attributionMethod) {
+      this.attributionMethod = attributionMethod;
+      return this;
+    }
+
+    /**
+     * Get attributionMethod
+     * 
+     * @return attributionMethod
+     */
+    public AttributionMethodEnum getAttributionMethod() {
+      return attributionMethod;
+    }
+
+    /**
+     * Set attributionMethod
+     * 
+     * @param attributionMethod The attribution method used to attribute the event.
+     */
+    public void setAttributionMethod(AttributionMethodEnum attributionMethod) {
+      this.attributionMethod = attributionMethod;
+    }
+
+    /**
+     * Set declineReason
+     * 
+     * @param declineReason The decline reason for the attribution.
+     * @return AttributionData
+     */
+    public AttributionData declineReason(DeclineReasonEnum declineReason) {
+      this.declineReason = declineReason;
+      return this;
+    }
+
+    /**
+     * Get declineReason
+     * 
+     * @return declineReason
+     */
+    public DeclineReasonEnum getDeclineReason() {
+      return declineReason;
+    }
+
+    /**
+     * Set declineReason
+     * 
+     * @param declineReason The decline reason for the attribution.
+     */
+    public void setDeclineReason(DeclineReasonEnum declineReason) {
+      this.declineReason = declineReason;
+    }
+
+    /**
+     * Set auditingToken
+     * 
+     * @param auditingToken The auditing token for the attribution.
+     * @return AttributionData
+     */
+    public AttributionData auditingToken(String auditingToken) {
+      this.auditingToken = auditingToken;
+      return this;
+    }
+
+    /**
+     * Get auditingToken
+     * 
+     * @return auditingToken
+     */
+    public String getAuditingToken() {
+      return auditingToken;
+    }
+
+    /**
+     * Set auditingToken
+     * 
+     * @param auditingToken The auditing token for the attribution.
+     */
+    public void setAuditingToken(String auditingToken) {
+      this.auditingToken = auditingToken;
+    }
+
+    /**
+     * Set linkageKey
+     * 
+     * @param linkageKey The linkage key for the attribution.
+     * @return AttributionData
+     */
+    public AttributionData linkageKey(String linkageKey) {
+      this.linkageKey = linkageKey;
+      return this;
+    }
+
+    /**
+     * Get linkageKey
+     * 
+     * @return linkageKey
+     */
+    public String getLinkageKey() {
+      return linkageKey;
+    }
+
+    /**
+     * Set linkageKey
+     * 
+     * @param linkageKey The linkage key for the attribution.
+     */
+    public void setLinkageKey(String linkageKey) {
+      this.linkageKey = linkageKey;
+    }
+
+    /**
+     * Set attributionSetting
+     * 
+     * @param attributionSetting The attribution setting with inactivity and reattribution window configuration.
+     * @return AttributionData
+     */
+    public AttributionData attributionSetting(AttributionSetting attributionSetting) {
+      this.attributionSetting = attributionSetting;
+      return this;
+    }
+
+    /**
+     * Get attributionSetting
+     * 
+     * @return attributionSetting
+     */
+    public AttributionSetting getAttributionSetting() {
+      return attributionSetting;
+    }
+
+    /**
+     * Set attributionSetting
+     * 
+     * @param attributionSetting The attribution setting with inactivity and reattribution window configuration.
+     */
+    public void setAttributionSetting(AttributionSetting attributionSetting) {
+      this.attributionSetting = attributionSetting;
+    }
+
     @Override
     public boolean equals(Object o) {
       if (this == o) return true;
@@ -462,12 +633,17 @@ public boolean equals(Object o) {
         && Objects.equals(this.attributionValue, attributionData.attributionValue)
         && Objects.equals(this.attributionSource, attributionData.attributionSource)
         && Objects.equals(this.touchpointType, attributionData.touchpointType)
-        && Objects.equals(this.touchpointTs, attributionData.touchpointTs);
+        && Objects.equals(this.touchpointTs, attributionData.touchpointTs)
+        && Objects.equals(this.attributionMethod, attributionData.attributionMethod)
+        && Objects.equals(this.declineReason, attributionData.declineReason)
+        && Objects.equals(this.auditingToken, attributionData.auditingToken)
+        && Objects.equals(this.linkageKey, attributionData.linkageKey)
+        && Objects.equals(this.attributionSetting, attributionData.attributionSetting);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(scope, visitTime, adId, adsetId, campaignId, attributionShare, attributionModel, attributionWindow, attributionValue, attributionSource, touchpointType, touchpointTs);
+      return Objects.hash(scope, visitTime, adId, adsetId, campaignId, attributionShare, attributionModel, attributionWindow, attributionValue, attributionSource, touchpointType, touchpointTs, attributionMethod, declineReason, auditingToken, linkageKey, attributionSetting);
     }
 
     @Override
@@ -486,6 +662,11 @@ public String toString() {
       sb.append("    attributionSource: ").append(toIndentedString(attributionSource)).append("\n");
       sb.append("    touchpointType: ").append(toIndentedString(touchpointType)).append("\n");
       sb.append("    touchpointTs: ").append(toIndentedString(touchpointTs)).append("\n");
+      sb.append("    attributionMethod: ").append(toIndentedString(attributionMethod)).append("\n");
+      sb.append("    declineReason: ").append(toIndentedString(declineReason)).append("\n");
+      sb.append("    auditingToken: ").append(toIndentedString(auditingToken)).append("\n");
+      sb.append("    linkageKey: ").append(toIndentedString(linkageKey)).append("\n");
+      sb.append("    attributionSetting: ").append(toIndentedString(attributionSetting)).append("\n");
       sb.append("}");
       return sb.toString();
     }

src/main/java/com/facebook/ads/sdk/serverside/AttributionMethodEnum.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * <p>
+ * You are hereby granted a non-exclusive, worldwide, royalty-free license to use, copy, modify, and
+ * distribute this software in source code or binary form for use in connection with the web
+ * services and APIs provided by Facebook.
+ * <p>
+ * As with any software that integrates with the Facebook platform, your use of this software is
+ * subject to the Facebook Developer Principles and Policies [http://developers.facebook.com/policy/].
+ * This copyright notice shall be included in all copies or substantial portions of the software.
+ * <p>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.facebook.ads.sdk.serverside;
+
+public enum AttributionMethodEnum {
+
+  ARD("ard"),
+  DEEPLINK("deeplink"),
+  GPIR("gpir"),
+  INVALID_RESPONSE("invalid_response"),
+  MIR("mir"),
+  SRN("srn");
+
+  private String value;
+
+  AttributionMethodEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+
+}

src/main/java/com/facebook/ads/sdk/serverside/AttributionSetting.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ *
+ * <p>You are hereby granted a non-exclusive, worldwide, royalty-free license to use, copy, modify,
+ * and distribute this software in source code or binary form for use in connection with the web
+ * services and APIs provided by Facebook.
+ *
+ * <p>As with any software that integrates with the Facebook platform, your use of this software is
+ * subject to the Facebook Developer Principles and Policies [http://developers.facebook.com/policy/].
+ * This copyright notice shall be included in all copies or substantial portions of the software.
+ *
+ * <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.facebook.ads.sdk.serverside;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.Objects;
+
+public class AttributionSetting {
+    @SerializedName("inactivity_window_hours")
+    private Integer inactivityWindowHours = null;
+
+    @SerializedName("reattribution_window_hours")
+    private Integer reattributionWindowHours = null;
+
+    public AttributionSetting() {
+    }
+
+    public AttributionSetting(Integer inactivityWindowHours, Integer reattributionWindowHours) {
+      this.inactivityWindowHours = inactivityWindowHours;
+      this.reattributionWindowHours = reattributionWindowHours;
+    }
+
+    public AttributionSetting inactivityWindowHours(Integer inactivityWindowHours) {
+      this.inactivityWindowHours = inactivityWindowHours;
+      return this;
+    }
+
+    public Integer getInactivityWindowHours() {
+      return inactivityWindowHours;
+    }
+
+    public void setInactivityWindowHours(Integer inactivityWindowHours) {
+      this.inactivityWindowHours = inactivityWindowHours;
+    }
+
+    public AttributionSetting reattributionWindowHours(Integer reattributionWindowHours) {
+      this.reattributionWindowHours = reattributionWindowHours;
+      return this;
+    }
+
+    public Integer getReattributionWindowHours() {
+      return reattributionWindowHours;
+    }
+
+    public void setReattributionWindowHours(Integer reattributionWindowHours) {
+      this.reattributionWindowHours = reattributionWindowHours;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      AttributionSetting attributionSetting = (AttributionSetting) o;
+
+      return Objects.equals(this.inactivityWindowHours, attributionSetting.inactivityWindowHours)
+        && Objects.equals(this.reattributionWindowHours, attributionSetting.reattributionWindowHours);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(inactivityWindowHours, reattributionWindowHours);
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder();
+      sb.append("class AttributionSetting {\n");
+      sb.append("    inactivityWindowHours: ").append(toIndentedString(inactivityWindowHours)).append("\n");
+      sb.append("    reattributionWindowHours: ").append(toIndentedString(reattributionWindowHours)).append("\n");
+      sb.append("}");
+      return sb.toString();
+    }
+
+    private String toIndentedString(Object o) {
+      if (o == null) {
+        return "null";
+      }
+      return o.toString().replace("\n", "\n    ");
+    }
+}