Subtract non-support for Orders v3

Change-Id: I0209bdfaf8c2867d29874a34ef613286c16072a7
actions-on-google · Aug 7, 2019 · 6d61b40 · 6d61b40
1 parent 66641aa
commit 6d61b40
Show file tree

Hide file tree

Showing 8 changed files with 1,113 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ repositories {
 }
 
 dependencies {
-   compile group: 'com.google.actions', name: 'actions-on-google', version: '1.4.0'
+   compile group: 'com.google.actions', name: 'actions-on-google', version: '1.5.0'
 }
 ```
 
@@ -40,7 +40,7 @@ If using maven, add the following to your pom.xml file.
 <dependency>
 	<groupId>com.google.actions</groupId>
 	<artifactId>actions-on-google</artifactId>
-	<version>1.4.0</version>
+	<version>1.5.0</version>
 </dependency>
 ```
 

diff --git a/lib/libactions_java_lib.jar b/lib/libactions_java_lib.jar
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.actions</groupId>
   <artifactId>actions-on-google</artifactId>
-  <version>1.3.0</version>
+  <version>1.5.0</version>
   <packaging>jar</packaging>
   <name>actions-on-google-java</name>
   <url>http://actions.google.com</url>
@@ -222,8 +222,8 @@
               <artifactId>actions-bindings</artifactId>
               <packaging>jar</packaging>
               <version>2.0.0</version>
-              <file>${basedir}/lib/libactions_java_lib.jar</file>
-              <localRepositoryPath>${basedir}/local-repo</localRepositoryPath>
+              <file>${project.basedir}/lib/libactions_java_lib.jar</file>
+              <localRepositoryPath>${project.basedir}/local-repo</localRepositoryPath>
             </configuration>
           </execution>
           <execution>
@@ -233,12 +233,12 @@
             </goals>
             <phase>validate</phase>
             <configuration>
-              <file>${basedir}/lib/libdialogflow_java_lib.jar</file>
+              <file>${project.basedir}/lib/libdialogflow_java_lib.jar</file>
               <groupId>com.google.actions</groupId>
               <artifactId>dialogflow-bindings</artifactId>
               <packaging>jar</packaging>
               <version>2.0.0</version>
-              <localRepositoryPath>${basedir}/local-repo</localRepositoryPath>
+              <localRepositoryPath>${project.basedir}/local-repo</localRepositoryPath>
             </configuration>
           </execution>
         </executions>

diff --git a/src/main/kotlin/com/google/actions/api/impl/AogRequest.kt b/src/main/kotlin/com/google/actions/api/impl/AogRequest.kt
@@ -276,6 +276,72 @@ internal class AogRequest internal constructor(
                             PaymentInfoGoogleProvidedPaymentInstrumentDeserializer())
                     .registerTypeAdapter(TransactionRequirementsCheckResult::class.java,
                             TransactionRequirementsCheckResultDeserializer())
+                    .registerTypeAdapter(OrderV3::class.java,
+                            OrderV3Deserializer())
+                    .registerTypeAdapter(UserInfo::class.java,
+                            UserInfoDeserializer())
+                    .registerTypeAdapter(OrderContents::class.java,
+                            OrderContentsDeserializer())
+                    .registerTypeAdapter(PaymentData::class.java,
+                            PaymentDataDeserializer())
+                    .registerTypeAdapter(PurchaseOrderExtension::class.java,
+                            PurchaseOrderExtensionDeserializer())
+                    .registerTypeAdapter(TicketOrderExtension::class.java,
+                            TicketOrderExtensionDeserializer())
+                    .registerTypeAdapter(MerchantV3::class.java,
+                            MerchantV3Deserializer())
+                    .registerTypeAdapter(Action::class.java,
+                            ActionDeserializer())
+                    .registerTypeAdapter(PriceAttribute::class.java,
+                            PriceAttributeDeserializer())
+                    .registerTypeAdapter(PromotionV3::class.java,
+                            PromotionV3Deserializer())
+                    .registerTypeAdapter(PhoneNumber::class.java,
+                            PhoneNumberDeserializer())
+                    .registerTypeAdapter(LineItemV3::class.java,
+                            LineItemV3Deserializer())
+                    .registerTypeAdapter(PaymentInfoV3::class.java,
+                            PaymentInfoV3Deserializer())
+                    .registerTypeAdapter(PaymentResult::class.java,
+                            PaymentResultDeserializer())
+                    .registerTypeAdapter(PurchaseFulfillmentInfo::class.java,
+                            PurchaseFulfillmentInfoDeserializer())
+                    .registerTypeAdapter(PurchaseReturnsInfo::class.java,
+                            PurchaseReturnsInfoDeserializer())
+                    .registerTypeAdapter(PurchaseError::class.java,
+                            PurchaseErrorDeserializer())
+                    .registerTypeAdapter(TicketEvent::class.java,
+                            TicketEventDeserializer())
+                    .registerTypeAdapter(ActionActionMetadata::class.java,
+                            ActionActionMetadataDeserializer())
+                    .registerTypeAdapter(OpenUrlAction::class.java,
+                            OpenUrlActionDeserializer())
+                    .registerTypeAdapter(MoneyV3::class.java,
+                            MoneyV3Deserializer())
+                    .registerTypeAdapter(PurchaseItemExtension::class.java,
+                            PurchaseItemExtensionDeserializer())
+                    .registerTypeAdapter(PaymentMethodDisplayInfo::class.java,
+                            PaymentMethodDisplayInfoDeserializer())
+                    .registerTypeAdapter(TimeV3::class.java,
+                            TimeV3Deserializer())
+                    .registerTypeAdapter(PickupInfo::class.java,
+                            PickupInfoDeserializer())
+                    .registerTypeAdapter(EventCharacter::class.java,
+                            EventCharacterDeserializer())
+                    .registerTypeAdapter(AndroidApp::class.java,
+                            AndroidAppDeserializer())
+                    .registerTypeAdapter(ProductDetails::class.java,
+                            ProductDetailsDeserializer())
+                    .registerTypeAdapter(MerchantUnitMeasure::class.java,
+                            MerchantUnitMeasureDeserializer())
+                    .registerTypeAdapter(PurchaseItemExtensionItemOption::class.java,
+                            PurchaseItemExtensionItemOptionDeserializer())
+                    .registerTypeAdapter(PickupInfoCurbsideInfo::class.java,
+                            PickupInfoCurbsideInfoDeserializer())
+                    .registerTypeAdapter(AndroidAppVersionFilter::class.java,
+                            AndroidAppVersionFilterDeserializer())
+                    .registerTypeAdapter(Vehicle::class.java,
+                            VehicleDeserializer())
                     .registerTypeAdapter(genericType<Map<String, Any>>(),
                             ExtensionDeserializer())