Release 0.33.7

Minor changes to Json

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

Author: overfullstack

.idea/misc.xml

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

README.adoc

@@ -33,6 +33,7 @@ dependencies {
   compileOnly(libs.immutables.value.annotations)
   compileOnly(libs.jetbrains.annotations)
   testImplementation(libs.truth)
+  testImplementation(libs.json.assert)
 }
 
 testing {

build.gradle.kts

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

buildSrc/src/main/kotlin/Config.kt

@@ -27,7 +27,6 @@
 import com.squareup.moshi.JsonReader;
 import com.squareup.moshi.JsonWriter;
 import com.squareup.moshi.Moshi;
-import io.vavr.control.Try;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
@@ -119,7 +118,12 @@ public void toJson(@NotNull JsonWriter writer, T connectInputRepWithGraph) {
         connectInputRepWithGraph,
         writer,
         cirwg -> {
-          writeProps(writer, pojoType, cirwg, Set.of(ObjectGraphInputRepresentation.class), moshi);
+          writeProps(
+              writer,
+              pojoType,
+              cirwg,
+              Set.of(ObjectGraphInputRepresentation.class),
+              dynamicJsonAdapter);
           objW(
               "graph",
               cirwg.getGraph(),
@@ -136,12 +140,8 @@ public void toJson(@NotNull JsonWriter writer, T connectInputRepWithGraph) {
                             writer,
                             rec -> {
                               string("referenceId", rec.getReferenceId(), writer);
-                              Try.run(
-                                  () -> {
-                                    writer.name("record");
-                                    dynamicJsonAdapter.toJson(
-                                        writer, rec.getRecord().getRecordBody());
-                                  });
+                              writer.name("record");
+                              dynamicJsonAdapter.toJson(writer, rec.getRecord().getRecordBody());
                             }));
               });
         });

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

@@ -0,0 +1,16 @@
+/**
+ * ************************************************************************************************
+ * 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.input.json
+
+fun interface NestedNodeWriter<T> {
+  @Throws(Throwable::class) fun write(t: T)
+}
+
+fun interface NestedNodeReader<T> {
+  @Throws(Throwable::class) fun read(t: T, s: String)
+}

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

@@ -12,7 +12,6 @@ package com.salesforce.revoman.input.json
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.Moshi
-import java.util.function.BiConsumer
 import org.springframework.beans.BeanUtils
 
 fun nextString(reader: JsonReader): String = reader.nextString()
@@ -27,22 +26,22 @@ fun skipValue(reader: JsonReader) = reader.skipValue()
 
 fun nextName(reader: JsonReader): String = reader.nextName()
 
-fun <T> objR(mk: () -> T, reader: JsonReader, block: BiConsumer<T, String>): T =
+fun <T> objR(mk: () -> T, reader: JsonReader, block: NestedNodeReader<T>): T =
   with(reader) {
     beginObject()
     val item = mk()
     while (hasNext()) {
-      block.accept(item, nextName())
+      block.read(item, nextName())
     }
     endObject()
     item
   }
 
-fun <T> listR(mk: () -> T, reader: JsonReader, block: BiConsumer<T, String>): List<T?>? =
+fun <T> listR(mk: () -> T, reader: JsonReader, fn: NestedNodeReader<T>): List<T?>? =
   reader.skipNullOr {
     val items = mutableListOf<T?>()
     beginArray()
-    while (hasNext()) items += objR(mk, this, block)
+    while (hasNext()) items += objR(mk, this, fn)
     endArray()
     items
   }
@@ -61,6 +60,8 @@ private fun <T> JsonReader.skipNullOr(fn: JsonReader.() -> T): T? =
 fun <T> JsonReader.readProps(pojoType: Class<T>, bean: T, fieldName: String, moshi: Moshi) =
   skipNullOr {
     val propType: Class<*> = BeanUtils.findPropertyType(fieldName, pojoType)
+    // * NOTE 15 Feb 2024 gopala.akshintala: Since data type info is lost with JSON, we cannot use
+    // dynamicAdapter
     val delegate: JsonAdapter<out Any?> = moshi.adapter(propType)
     BeanUtils.getPropertyDescriptor(pojoType, fieldName)
       ?.writeMethod

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

@@ -11,32 +11,26 @@ package com.salesforce.revoman.input.json
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonWriter
-import com.squareup.moshi.Moshi
-import java.util.function.Consumer
 import org.springframework.beans.BeanUtils
 
-fun <T> objW(name: String, obj: T, writer: JsonWriter, block: Consumer<T>): Unit =
+fun <T> objW(name: String, obj: T, writer: JsonWriter, fn: NestedNodeWriter<T>): Unit =
   with(writer) {
     name(name)
-    objW(obj, writer, block)
+    objW(obj, writer, fn)
   }
 
-fun <T> objW(obj: T, writer: JsonWriter, block: Consumer<T>): Unit =
+fun <T> objW(obj: T, writer: JsonWriter, fn: NestedNodeWriter<T>): Unit =
   with(writer) {
     if (obj == null) {
       nullValue()
     } else {
       beginObject()
-      block.accept(obj)
+      fn.write(obj)
       endObject()
     }
   }
 
-fun string(name: String, value: String?, writer: JsonWriter): Unit =
-  with(writer) {
-    name(name)
-    value?.also(::value) ?: nullValue()
-  }
+fun string(name: String, value: String?, writer: JsonWriter): Unit = writer.string(name, value)
 
 fun JsonWriter.string(name: String, value: String?) {
   name(name)
@@ -54,64 +48,62 @@ fun JsonWriter.bool(name: String, value: Boolean?) {
   value?.also(::value) ?: nullValue()
 }
 
-fun integer(name: String, value: Int?, writer: JsonWriter): Unit =
-  with(writer) {
-    name(name)
-    value?.also(::value) ?: nullValue()
-  }
+fun integer(name: String, value: Int?, writer: JsonWriter): Unit = writer.integer(name, value)
 
 fun JsonWriter.integer(name: String, value: Int?) {
   name(name)
   value?.also(::value) ?: nullValue()
 }
 
-fun doubl(name: String, value: Double?, writer: JsonWriter): Unit =
-  with(writer) {
-    name(name)
-    value?.also(::value) ?: nullValue()
-  }
+fun doubl(name: String, value: Double?, writer: JsonWriter): Unit = writer.doubl(name, value)
 
 fun JsonWriter.doubl(name: String, value: Double?) {
   name(name)
   value?.also(::value) ?: nullValue()
 }
 
-fun lng(name: String, value: Long?, writer: JsonWriter): Unit =
-  with(writer) {
-    name(name)
-    value?.also(::value) ?: nullValue()
-  }
+fun lng(name: String, value: Long?, writer: JsonWriter): Unit = writer.lng(name, value)
 
 fun JsonWriter.lng(name: String, value: Long?) {
   name(name)
   value?.also(::value) ?: nullValue()
 }
 
-fun <T> listW(name: String, list: List<T>?, writer: JsonWriter, block: Consumer<T>): JsonWriter =
+fun <T> listW(
+  name: String,
+  list: List<T>?,
+  writer: JsonWriter,
+  block: NestedNodeWriter<T>
+): JsonWriter =
   with(writer) {
     name(name)
     listW(list, this, block)
   }
 
-fun <T> listW(list: List<T>?, writer: JsonWriter, block: Consumer<T>): JsonWriter =
+fun <T> listW(list: List<T>?, writer: JsonWriter, fn: NestedNodeWriter<T>): JsonWriter =
   with(writer) {
     when (list) {
       null -> nullValue()
       else -> {
         beginArray()
-        list.forEach(block)
+        list.forEach(fn::write)
         endArray()
       }
     }
   }
 
-// ! TODO 18/10/23 gopala.akshintala: Abstract it into a common artifact to be used in ReVoman
+fun JsonWriter.mapW(map: Map<String, Any?>, dynamicJsonAdapter: JsonAdapter<Any>) {
+  map.forEach { (key: String, value: Any?) ->
+    name(key)
+    dynamicJsonAdapter.toJson(this, value)
+  }
+}
 
 fun <T> JsonWriter.writeProps(
   pojoType: Class<T>,
   bean: T,
   excludePropTypes: Set<Class<*>>,
-  moshi: Moshi
+  dynamicJsonAdapter: JsonAdapter<Any>,
 ) =
   BeanUtils.getPropertyDescriptors(pojoType)
     .asSequence()
@@ -123,6 +115,5 @@ fun <T> JsonWriter.writeProps(
         throw IllegalStateException("Please add a getter for the Property: `${it.name}`")
       }
       name(it.name)
-      val delegate = moshi.adapter(it.propertyType) as JsonAdapter<Any>
-      delegate.toJson(this, it.readMethod(bean))
+      dynamicJsonAdapter.toJson(this, it.readMethod(bean))
     }

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

@@ -5,11 +5,10 @@
  *  http://www.apache.org/licenses/LICENSE-2.0
  **************************************************************************************************/
 
-package com.salesforce.revoman.input;
+package com.salesforce.revoman.input.json;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.salesforce.revoman.input.json.JsonPojoUtils;
 import java.util.Date;
 import java.util.List;
 import org.junit.jupiter.api.DisplayName;

src/test/java/com/salesforce/revoman/input/JsonPojoUtilsTest.java renamed to src/test/java/com/salesforce/revoman/input/json/JsonPojoUtilsTest.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2023 salesforce.com, inc.
+ * All Rights Reserved
+ * Company Confidential
+ */
+
+package com.salesforce.revoman.input.json;
+
+import static com.salesforce.revoman.input.FileUtils.readFileInResourcesToString;
+
+import com.salesforce.revoman.input.json.adapters.SObjectGraphRequestMarshaller;
+import com.salesforce.revoman.input.json.pojo.Entity;
+import com.salesforce.revoman.input.json.pojo.SObjectGraphRequest;
+import com.salesforce.revoman.input.json.pojo.SObjectWithReferenceRequest;
+import java.util.List;
+import java.util.Map;
+import org.json.JSONException;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
+
+class SObjectGraphRequestMarshallerTest {
+
+  @DisplayName("toJson: SObjectGraphRequest POJO --> PQ Payload JSON")
+  @Test
+  void sObjectGraphMarshallToPQPayload() throws JSONException {
+    final var pqTestInputRepMarshaller =
+        SObjectGraphRequestMarshaller.adapter(
+            Map.of("pricingPref", "skip", "configurationInput", "skip"));
+    final var pqPayloadJsonStr =
+        JsonPojoUtils.pojoToJson(
+            SObjectGraphRequest.class,
+            prepareSObjectGraphReqPojo(),
+            List.of(pqTestInputRepMarshaller));
+    final var expectedPQPayload = readFileInResourcesToString("json/pq-graph-req.json");
+    JSONAssert.assertEquals(expectedPQPayload, pqPayloadJsonStr, JSONCompareMode.STRICT);
+  }
+
+  static SObjectGraphRequest prepareSObjectGraphReqPojo() {
+    return new SObjectGraphRequest(
+        "pq-update-quote",
+        List.of(
+            new SObjectWithReferenceRequest(
+                "refQuote",
+                new Entity(
+                    Map.of(
+                        "attributes",
+                        Map.of("type", "Quote", "method", "PATCH", "id", "quoteId"),
+                        "Name",
+                        "Overfullstack")))));
+  }
+}