Release 0.34.1

- IgnoreUnknownFactory bug fix on write
- Change StepReport, TxnInfo toString

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

README.adoc

@@ -16,7 +16,7 @@ endif::[]
 :pmtemplates: src/integrationTest/resources/pm-templates
 :imagesdir: docs/images
 :prewrap!:
-:revoman-version: 0.33.7
+:revoman-version: 0.34.1
 
 '''
 

buildSrc/src/main/kotlin/Config.kt

@@ -6,6 +6,6 @@
  * ************************************************************************************************
  */
 const val GROUP_ID = "com.salesforce.revoman"
-const val VERSION = "0.34.0"
+const val VERSION = "0.34.1"
 const val ARTIFACT_ID = "revoman"
 const val STAGING_PROFILE_ID = "1ea0a23e61ba7d"

src/integrationTest/java/com/salesforce/revoman/input/json/JsonPojoUtils2Test.java

@@ -10,10 +10,13 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.salesforce.revoman.input.FileUtils.readFileInResourcesToString;
 import static com.salesforce.revoman.integration.core.pq.adapters.ConnectInputRepWithGraphAdapter.adapter;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import com.salesforce.revoman.integration.core.pq.adapters.IDAdapter;
 import com.salesforce.revoman.integration.core.pq.connect.request.PlaceQuoteInputRepresentation;
 import com.salesforce.revoman.integration.core.pq.connect.request.PricingPreferenceEnum;
+import com.salesforce.revoman.integration.core.pq.connect.response.PlaceQuoteOutputRepresentation;
 import com.squareup.moshi.JsonDataException;
 import java.util.List;
 import org.json.JSONException;
@@ -55,6 +58,20 @@ void pqPayloadJsonToPQInputRep() {
     assertThat(graph.getRecords().getRecordsList()).hasSize(6);
   }
 
+  @Test
+  @DisplayName("JSON --> PQ Response --> JSON")
+  void unmarshallMarshallPqResponse() throws JSONException {
+    final var pqResponseFromJson = readFileInResourcesToString("json/pq-response.json");
+    final var pqResp =
+        JsonPojoUtils.<PlaceQuoteOutputRepresentation>jsonToPojo(
+            PlaceQuoteOutputRepresentation.class, pqResponseFromJson, List.of(new IDAdapter()));
+    assertNotNull(pqResp);
+    final var pqOutputRepJson =
+        JsonPojoUtils.pojoToJson(
+            PlaceQuoteOutputRepresentation.class, pqResp, List.of(new IDAdapter()));
+    JSONAssert.assertEquals(pqResponseFromJson, pqOutputRepJson, JSONCompareMode.STRICT);
+  }
+
   @Test
   @DisplayName("Read Enum Case Insensitive")
   void readEnumCaseInsensitive() {

src/integrationTest/java/com/salesforce/revoman/integration/core/pq/PQE2EWithSMTest.java

@@ -22,13 +22,11 @@
 import com.salesforce.revoman.ReVoman;
 import com.salesforce.revoman.input.config.Kick;
 import com.salesforce.revoman.input.json.adapters.CompositeGraphResponse;
+import com.salesforce.revoman.integration.core.pq.adapters.IDAdapter;
 import com.salesforce.revoman.integration.core.pq.connect.request.PlaceQuoteInputRepresentation;
-import com.salesforce.revoman.integration.core.pq.connect.response.ID;
 import com.salesforce.revoman.integration.core.pq.connect.response.PlaceQuoteOutputRepresentation;
 import com.salesforce.revoman.output.postman.PostmanEnvironment;
 import com.salesforce.revoman.output.report.StepReport;
-import com.squareup.moshi.FromJson;
-import com.squareup.moshi.ToJson;
 import java.util.List;
 import java.util.Map;
 import kotlin.random.Random;
@@ -168,17 +166,4 @@ private enum PricingPref {
       this.completeStatus = completeStatus;
     }
   }
-
-  // * NOTE 10 Mar 2024 gopala.akshintala: Custom Type Adapter
-  static class IDAdapter {
-    @FromJson
-    ID fromJson(String id) {
-      return new ID(id);
-    }
-
-    @ToJson
-    String toJson(ID id) {
-      return id.getId();
-    }
-  }
 }

src/integrationTest/java/com/salesforce/revoman/integration/core/pq/adapters/IDAdapter.java

@@ -0,0 +1,25 @@
+/***************************************************************************************************
+ *  Copyright (c) 2023, Salesforce, Inc. All rights reserved. SPDX-License-Identifier:
+ *           Apache License Version 2.0
+ *  For full license text, see the LICENSE file in the repo root or
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ **************************************************************************************************/
+
+package com.salesforce.revoman.integration.core.pq.adapters;
+
+import com.salesforce.revoman.integration.core.pq.connect.response.ID;
+import com.squareup.moshi.FromJson;
+import com.squareup.moshi.ToJson;
+
+// * NOTE 10 Mar 2024 gopala.akshintala: Custom Type Adapter
+public class IDAdapter {
+  @FromJson
+  ID fromJson(String id) {
+    return new ID(id);
+  }
+
+  @ToJson
+  String toJson(ID id) {
+    return id.getId();
+  }
+}

src/integrationTest/resources/json/pq-response.json

@@ -0,0 +1,7 @@
+{
+  "quoteId": "0Q0xx0000004E2mCAE",
+  "requestIdentifier": "95Txx0000004E60",
+  "responseError": [],
+  "statusURL": "/services/data/v58.0/sobjects/RevenueAsyncOperation/95Txx0000004E60EAE",
+  "success": true
+}

src/main/kotlin/com/salesforce/revoman/input/json/JsonWriterUtils.kt

@@ -99,6 +99,7 @@ fun JsonWriter.mapW(map: Map<String, Any?>, dynamicJsonAdapter: JsonAdapter<Any>
   }
 }
 
+/** BeanUtils is used to read even the private fields with a getter */
 fun <T> JsonWriter.writeProps(
   pojoType: Class<T>,
   bean: T,

src/main/kotlin/com/salesforce/revoman/internal/json/factories/IgnoreUnknownFactory.kt

@@ -20,10 +20,13 @@ internal class IgnoreUnknownFactory(private val typesToIgnore: Set<Class<out Any
     val rawType: Class<*> = Types.getRawType(type)
     return if (typesToIgnore.contains(rawType)) {
       object : JsonAdapter<Type>() {
-        override fun fromJson(reader: JsonReader): Type? = null
+        override fun fromJson(reader: JsonReader): Type? {
+          reader.skipValue()
+          return null
+        }
 
         override fun toJson(writer: JsonWriter, value: Type?) {
-          // do nothing
+          writer.nullValue()
         }
       }
     } else null

src/main/kotlin/com/salesforce/revoman/output/report/StepReport.kt

@@ -117,7 +117,7 @@ private constructor(
       when {
         exeFailure != null -> " ❌$exeFailure\n${exeFailure.failure.stackTraceToString()}"
         !isHttpStatusSuccessful ->
-          " ⚠️️Unsuccessful HTTP Status: ${responseInfo?.get()?.httpMsg?.status} \n${requestInfo?.get()}, ${responseInfo?.get()}"
+          " ⚠️️Unsuccessful HTTP Status: ${responseInfo?.get()?.httpMsg?.status} \n${requestInfo?.get()} \n${responseInfo?.get()}"
         else -> "✅${requestInfo?.get()}, ${responseInfo?.get()}"
       }
 }

src/main/kotlin/com/salesforce/revoman/output/report/TxnInfo.kt

@@ -51,7 +51,7 @@ data class TxnInfo<HttpMsgT : HttpMessage>(
         is Response -> "ResponseInfo⬇️"
         else -> "TxnInfo"
       }
-    return "$prefix(Type=$txnObjType, Obj=$txnObj, $httpMsg)"
+    return "$prefix ~~>\nType=$txnObjType\nObj=$txnObj\n$httpMsg"
   }
 
   companion object {