From 72c7422a922a2450ad43d1dad06fa3ca2da87816 Mon Sep 17 00:00:00 2001
From: Alex Baker <alexander_j_baker@apple.com>
Date: Wed, 6 May 2026 19:36:47 -0700
Subject: [PATCH] Adjusting deserialization logic to set operation and version

---
 .../AbstractAdvancedCommerceInAppRequest.java |  6 +--
 ...cedCommerceOneTimeChargeCreateRequest.java |  4 +-
 ...ncedCommerceSubscriptionCreateRequest.java |  4 +-
 ...ommerceSubscriptionModifyInAppRequest.java |  4 +-
 ...rceSubscriptionReactivateInAppRequest.java |  4 +-
 .../model/AdvancedCommerceModelsTest.java     | 49 +++++++++++++++++++
 ...cedCommerceOneTimeChargeCreateRequest.json |  4 +-
 7 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/apple/itunes/storekit/model/AbstractAdvancedCommerceInAppRequest.java b/src/main/java/com/apple/itunes/storekit/model/AbstractAdvancedCommerceInAppRequest.java
index 4eca35b0..01e25c75 100644
--- a/src/main/java/com/apple/itunes/storekit/model/AbstractAdvancedCommerceInAppRequest.java
+++ b/src/main/java/com/apple/itunes/storekit/model/AbstractAdvancedCommerceInAppRequest.java
@@ -16,9 +16,9 @@ public abstract class AbstractAdvancedCommerceInAppRequest<T extends AbstractAdv
     @JsonProperty(value = SERIALIZED_NAME_VERSION, required = true)
     private final String version;
 
-    protected AbstractAdvancedCommerceInAppRequest() {
-        this.operation = null;
-        this.version = null;
+    protected AbstractAdvancedCommerceInAppRequest(String operation, String version) {
+        this.operation = Objects.requireNonNull(operation);
+        this.version = Objects.requireNonNull(version);
     }
 
     protected AbstractAdvancedCommerceInAppRequest(String operation, String version, AdvancedCommerceRequestInfo requestInfo) {
diff --git a/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceOneTimeChargeCreateRequest.java b/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceOneTimeChargeCreateRequest.java
index 182da6ac..0fbda324 100644
--- a/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceOneTimeChargeCreateRequest.java
+++ b/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceOneTimeChargeCreateRequest.java
@@ -36,7 +36,9 @@ public class AdvancedCommerceOneTimeChargeCreateRequest extends AbstractAdvanced
     @JsonProperty(value = SERIALIZED_NAME_TAX_CODE, required = true)
     private String taxCode;
 
-    private AdvancedCommerceOneTimeChargeCreateRequest() {}
+    private AdvancedCommerceOneTimeChargeCreateRequest() {
+        super(OPERATION, VERSION);
+    }
 
     public AdvancedCommerceOneTimeChargeCreateRequest(
             String currency,
diff --git a/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionCreateRequest.java b/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionCreateRequest.java
index 7b40d71c..1e10cfd3 100644
--- a/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionCreateRequest.java
+++ b/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionCreateRequest.java
@@ -39,7 +39,9 @@ public class AdvancedCommerceSubscriptionCreateRequest extends AbstractAdvancedC
     @JsonProperty(value = SERIALIZED_NAME_TAX_CODE, required = true)
     private String taxCode;
 
-    private AdvancedCommerceSubscriptionCreateRequest() {}
+    private AdvancedCommerceSubscriptionCreateRequest() {
+        super(OPERATION, VERSION);
+    }
 
     public AdvancedCommerceSubscriptionCreateRequest(
             String currency,
diff --git a/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionModifyInAppRequest.java b/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionModifyInAppRequest.java
index e10836a3..d10344cd 100644
--- a/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionModifyInAppRequest.java
+++ b/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionModifyInAppRequest.java
@@ -49,7 +49,9 @@ public class AdvancedCommerceSubscriptionModifyInAppRequest extends AbstractAdva
     @JsonProperty(value = SERIALIZED_NAME_TRANSACTION_ID, required = true)
     private String transactionId;
 
-    private AdvancedCommerceSubscriptionModifyInAppRequest() {}
+    private AdvancedCommerceSubscriptionModifyInAppRequest() {
+        super(OPERATION, VERSION);
+    }
 
     public AdvancedCommerceSubscriptionModifyInAppRequest(
             AdvancedCommerceRequestInfo requestInfo,
diff --git a/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionReactivateInAppRequest.java b/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionReactivateInAppRequest.java
index 878d45d0..1feda716 100644
--- a/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionReactivateInAppRequest.java
+++ b/src/main/java/com/apple/itunes/storekit/model/AdvancedCommerceSubscriptionReactivateInAppRequest.java
@@ -28,7 +28,9 @@ public class AdvancedCommerceSubscriptionReactivateInAppRequest extends Abstract
     @JsonProperty(value = SERIALIZED_NAME_TRANSACTION_ID, required = true)
     private String transactionId;
 
-    private AdvancedCommerceSubscriptionReactivateInAppRequest() {}
+    private AdvancedCommerceSubscriptionReactivateInAppRequest() {
+        super(OPERATION, VERSION);
+    }
 
     public AdvancedCommerceSubscriptionReactivateInAppRequest(
             AdvancedCommerceRequestInfo requestInfo,
diff --git a/src/test/java/com/apple/itunes/storekit/model/AdvancedCommerceModelsTest.java b/src/test/java/com/apple/itunes/storekit/model/AdvancedCommerceModelsTest.java
index 8f6bb653..6161df85 100644
--- a/src/test/java/com/apple/itunes/storekit/model/AdvancedCommerceModelsTest.java
+++ b/src/test/java/com/apple/itunes/storekit/model/AdvancedCommerceModelsTest.java
@@ -3,6 +3,7 @@
 package com.apple.itunes.storekit.model;
 
 import com.apple.itunes.storekit.util.TestingUtility;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -721,4 +722,52 @@ public void testAdvancedCommerceSubscriptionMigrateResponse() throws Exception {
         Assertions.assertEquals("signed_renewal_info_value", response.getSignedRenewalInfo());
         Assertions.assertEquals("signed_transaction_info_value", response.getSignedTransactionInfo());
     }
+
+    @Test
+    public void testOneTimeChargeCreateRequestDeserializationSetsOperationAndVersion() throws Exception {
+        String json = TestingUtility.readFile("models/advancedCommerceOneTimeChargeCreateRequest.json");
+
+        AdvancedCommerceOneTimeChargeCreateRequest request =
+            objectMapper.readValue(json, AdvancedCommerceOneTimeChargeCreateRequest.class);
+
+        JsonNode node = objectMapper.valueToTree(request);
+        Assertions.assertEquals("CREATE_ONE_TIME_CHARGE", node.get("operation").asText());
+        Assertions.assertEquals("1", node.get("version").asText());
+    }
+
+    @Test
+    public void testSubscriptionCreateRequestDeserializationSetsOperationAndVersion() throws Exception {
+        String json = TestingUtility.readFile("models/advancedCommerceSubscriptionCreateRequest.json");
+
+        AdvancedCommerceSubscriptionCreateRequest request =
+            objectMapper.readValue(json, AdvancedCommerceSubscriptionCreateRequest.class);
+
+        JsonNode node = objectMapper.valueToTree(request);
+        Assertions.assertEquals("CREATE_SUBSCRIPTION", node.get("operation").asText());
+        Assertions.assertEquals("1", node.get("version").asText());
+    }
+
+    @Test
+    public void testSubscriptionModifyInAppRequestDeserializationSetsOperationAndVersion() throws Exception {
+        String json = TestingUtility.readFile("models/advancedCommerceSubscriptionModifyInAppRequest.json");
+
+        AdvancedCommerceSubscriptionModifyInAppRequest request =
+            objectMapper.readValue(json, AdvancedCommerceSubscriptionModifyInAppRequest.class);
+
+        JsonNode node = objectMapper.valueToTree(request);
+        Assertions.assertEquals("MODIFY_SUBSCRIPTION", node.get("operation").asText());
+        Assertions.assertEquals("1", node.get("version").asText());
+    }
+
+    @Test
+    public void testSubscriptionReactivateInAppRequestDeserializationSetsOperationAndVersion() throws Exception {
+        String json = TestingUtility.readFile("models/advancedCommerceSubscriptionReactivateInAppRequest.json");
+
+        AdvancedCommerceSubscriptionReactivateInAppRequest request =
+            objectMapper.readValue(json, AdvancedCommerceSubscriptionReactivateInAppRequest.class);
+
+        JsonNode node = objectMapper.valueToTree(request);
+        Assertions.assertEquals("REACTIVATE_SUBSCRIPTION", node.get("operation").asText());
+        Assertions.assertEquals("1", node.get("version").asText());
+    }
 }
diff --git a/src/test/resources/models/advancedCommerceOneTimeChargeCreateRequest.json b/src/test/resources/models/advancedCommerceOneTimeChargeCreateRequest.json
index d9874797..b81f2783 100644
--- a/src/test/resources/models/advancedCommerceOneTimeChargeCreateRequest.json
+++ b/src/test/resources/models/advancedCommerceOneTimeChargeCreateRequest.json
@@ -10,7 +10,5 @@
     "requestReferenceId": "550e8400-e29b-41d4-a716-446655440000"
   },
   "taxCode": "taxCode",
-  "storefront": "USA",
-  "operation": "CREATE",
-  "version": "1.0"
+  "storefront": "USA"
 }