Shipapiv2

.gitignore

@@ -0,0 +1 @@
+generated

README.md

@@ -1,3 +1,19 @@
+## Jazva Notes
+
+We modified the code base, but still should periodically merge upstream/main into our branch and push
+To build:
+
+1. change version in [generate/pom.xml]
+2. global replace the new version in generate/compile.sh
+3. run generate/compile.sh (which has mvn install:install-file commented out)
+4. fix the absolute path in mvn install:install-file 
+5. manually run mvn install:install-file line to make sure it pushes to the lib folder in main jazva project
+6. add the new version to git in jazva project ./lib/com/amazon/sellingpartnerapi/...
+7. update jazvas main pom.xml to use the new version
+
+Note: sometimes we need to update the authorization-authentication module as well, which is a dependency in the above pom. The lines to build it are in the same compile.sh file
+
+
 ## Selling Partner API Models
 This repository contains Swagger models for developers to use to create software to call Selling Partner APIs. Developers can use [swagger codegen](https://github.com/swagger-api/swagger-codegen) to generate client libraries from these models. Please refer to [selling-partner-api-docs](https://github.com/amzn/selling-partner-api-docs) for additional documentation and read the [Selling Partner API Developer Guide](https://github.com/amzn/selling-partner-api-docs/blob/main/guides/en-US/developer-guide/SellingPartnerApiDeveloperGuide.md) for instructions to get started.
 

clients/sellingpartner-api-aa-java/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.amazon.sellingpartnerapi</groupId>
     <artifactId>sellingpartnerapi-aa-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.0</version>
+    <version>1.0.3</version>
     <build>
         <plugins>
             <plugin>
@@ -47,13 +47,13 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-signer</artifactId>
-            <version>1.11.610</version>
+            <version>1.12.408</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.8</version>
+            <version>1.18.26</version>
             <scope>provided</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-migrationsupport</artifactId>
-            <version>5.5.1</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
@@ -104,10 +104,16 @@
             <version>3.9</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.httpcomponents</groupId>-->
+<!--            <artifactId>httpclient</artifactId>-->
+<!--            <version>4.5.13</version>-->
+<!--        </dependency>-->
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5 -->
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
         </dependency>
 		<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-sts -->
 		<dependency>

clients/sellingpartner-api-aa-java/resources/swagger-codegen/templates/ApiClient.mustache

@@ -78,6 +78,8 @@ public class ApiClient {
 
     private HttpLoggingInterceptor loggingInterceptor;
 
+    private String rdt = null;
+
     private LWAAuthorizationSigner lwaAuthorizationSigner;
     private AWSSigV4Signer awsSigV4Signer;
     private RateLimiter rateLimiter;
@@ -128,6 +130,11 @@ public class ApiClient {
         return this;
     }
 
+    public ApiClient setRdt(String rdt) {
+        this.rdt = rdt;
+        return this;
+    }
+
     /**
      * Get HTTP client
      *
@@ -1048,7 +1055,13 @@ public class ApiClient {
             request = reqBuilder.method(method, reqBody).build();
         }
 
-        request = lwaAuthorizationSigner.sign(request);
+        if (rdt == null) {
+            request = lwaAuthorizationSigner.sign(request);
+        } else {
+            request = request.newBuilder()
+                              .addHeader("x-amz-access-token", rdt)
+                              .build();
+        }
         request = awsSigV4Signer.sign(request);
 
         return request;