Release 0.7.0.1

Adds isSuccessful to CompositeQueryResponse

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

Author: overfullstack

README.adoc

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

buildSrc/src/main/kotlin/Config.kt

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

src/main/kotlin/com/salesforce/revoman/input/json/adapters/salesforce/CompositeGraphResponse.kt

@@ -55,7 +55,7 @@ data class CompositeGraphResponse(val graphs: List<Graph>) {
       @get:JvmName("errorResponses")
       val errorResponses: List<CompositeErrorResponse> by lazy {
         graphResponse.compositeResponse.filter {
-          it.httpStatusCode !in SUCCESSFUL &&
+          it.httpStatusCode !in SUCCESSFUL_HTTP_STATUSES &&
             it.body.firstOrNull()?.let { error ->
               error.errorCode == PROCESSING_HALTED ||
                 error.message == OPERATION_IN_TRANSACTION_FAILED_ERROR

src/main/kotlin/com/salesforce/revoman/input/json/adapters/salesforce/CompositeQueryResponse.kt

@@ -38,14 +38,14 @@ data class CompositeQueryResponse(val compositeResponse: List<QueryResponse>) {
       @JsonClass(generateAdapter = true)
       data class Body(val done: Boolean, val records: List<Record>, val totalSize: Int) {
         @JsonClass(generateAdapter = true)
-        @AdaptedBy(RecordAdapterFactory::class)
+        @AdaptedBy(RecordFactory::class)
         data class Record(val attributes: Attributes, val recordBody: Map<String, Any?>) {
           @JsonClass(generateAdapter = true)
           data class Attributes(val type: String, val url: String)
         }
       }
 
-      class RecordAdapterFactory : JsonAdapter.Factory {
+      class RecordFactory : JsonAdapter.Factory {
         override fun create(
           type: Type,
           annotations: Set<Annotation>,
@@ -57,42 +57,42 @@ data class CompositeQueryResponse(val compositeResponse: List<QueryResponse>) {
             null
           }
         }
-      }
 
-      class RecordAdapter(val moshi: Moshi) : JsonAdapter<Record>() {
-        private val options = JsonReader.Options.of("attributes")
-        @OptIn(ExperimentalStdlibApi::class)
-        private val attributesJsonAdapter = moshi.adapter<Attributes>()
-        @OptIn(ExperimentalStdlibApi::class) private val dynamicJsonAdapter = moshi.adapter<Any>()
-
-        override fun fromJson(reader: JsonReader): Record? {
-          reader.beginObject()
-          var attributes: Attributes? = null
-          val recordBody = mutableMapOf<String, Any?>()
-          while (reader.hasNext()) {
-            when (reader.selectName(options)) {
-              0 -> {
-                if (attributes != null) {
-                  throw JsonDataException("Duplicate attributes Node")
+        class RecordAdapter(val moshi: Moshi) : JsonAdapter<Record>() {
+          private val options = JsonReader.Options.of("attributes")
+          @OptIn(ExperimentalStdlibApi::class)
+          private val attributesJsonAdapter = moshi.adapter<Attributes>()
+          @OptIn(ExperimentalStdlibApi::class) private val dynamicJsonAdapter = moshi.adapter<Any>()
+
+          override fun fromJson(reader: JsonReader): Record? {
+            reader.beginObject()
+            var attributes: Attributes? = null
+            val recordBody = mutableMapOf<String, Any?>()
+            while (reader.hasNext()) {
+              when (reader.selectName(options)) {
+                0 -> {
+                  if (attributes != null) {
+                    throw JsonDataException("Duplicate attributes Node")
+                  }
+                  attributes = attributesJsonAdapter.fromJson(reader)
                 }
-                attributes = attributesJsonAdapter.fromJson(reader)
+                -1 -> recordBody[reader.nextName()] = reader.readJsonValue()!!
+                else -> throw AssertionError()
               }
-              -1 -> recordBody[reader.nextName()] = reader.readJsonValue()!!
-              else -> throw AssertionError()
             }
+            reader.endObject()
+            return Record(attributes!!, recordBody)
           }
-          reader.endObject()
-          return Record(attributes!!, recordBody)
-        }
 
-        override fun toJson(writer: JsonWriter, record: Record?) =
-          with(writer) {
-            objW(record) {
-              name("attributes")
-              attributesJsonAdapter.toJson(this@with, attributes)
-              mapW(recordBody, dynamicJsonAdapter)
+          override fun toJson(writer: JsonWriter, record: Record?) =
+            with(writer) {
+              objW(record) {
+                name("attributes")
+                attributesJsonAdapter.toJson(this@with, attributes)
+                mapW(recordBody, dynamicJsonAdapter)
+              }
             }
-          }
+        }
       }
     }
 
@@ -116,21 +116,31 @@ data class CompositeQueryResponse(val compositeResponse: List<QueryResponse>) {
     compositeResponse
       .mapNotNull { it as? ErrorQueryResponse }
       .filter {
-        it.httpStatusCode !in SUCCESSFUL &&
+        it.httpStatusCode !in SUCCESSFUL_HTTP_STATUSES &&
           it.body.firstOrNull()?.let { error ->
             error.errorCode == PROCESSING_HALTED &&
               error.message == OPERATION_IN_TRANSACTION_FAILED_ERROR
           } != true
       }
   }
 
+  @Json(ignore = true)
+  @get:JvmName("isSuccessful")
+  val isSuccessful: Boolean by lazy {
+    compositeResponse.all { it.httpStatusCode in SUCCESSFUL_HTTP_STATUSES }
+  }
+
   @Json(ignore = true)
   @get:JvmName("errorResponseCount")
-  val errorResponseCount: Int by lazy { errorResponses.size }
+  val errorResponseCount: Int by lazy {
+    compositeResponse.count { it.httpStatusCode !in SUCCESSFUL_HTTP_STATUSES }
+  }
 
   @Json(ignore = true)
   @get:JvmName("successResponseCount")
-  val successResponseCount: Int by lazy { compositeResponse.size - errorResponseCount }
+  val successResponseCount: Int by lazy {
+    compositeResponse.count { it.httpStatusCode in SUCCESSFUL_HTTP_STATUSES }
+  }
 
   @Json(ignore = true)
   @get:JvmName("firstErrorResponse")
@@ -148,7 +158,7 @@ data class CompositeQueryResponse(val compositeResponse: List<QueryResponse>) {
       DiMorphicAdapter.of(
         QueryResponse::class.java,
         "httpStatusCode",
-        { it.nextInt() in SUCCESSFUL },
+        { it.nextInt() in SUCCESSFUL_HTTP_STATUSES },
         SuccessQueryResponse::class.java,
         ErrorQueryResponse::class.java,
       )

src/main/kotlin/com/salesforce/revoman/input/json/adapters/salesforce/Constants.kt

@@ -7,8 +7,7 @@
  */
 package com.salesforce.revoman.input.json.adapters.salesforce
 
-internal val SUCCESSFUL = 200..299
-internal val CLIENT_ERROR = 400..499
+internal val SUCCESSFUL_HTTP_STATUSES = 200..299
 internal const val PROCESSING_HALTED = "PROCESSING_HALTED"
 internal const val OPERATION_IN_TRANSACTION_FAILED_ERROR =
   "The transaction was rolled back since another operation in the same transaction failed."

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

@@ -91,6 +91,7 @@ void compositeQueryResponseDiMorphicMarshallUnmarshall() throws JSONException {
 						jsonFileConfig
 								.jsonFilePath("composite/query/resp/query-response-all-success.json")
 								.done());
+		assertThat(successCompositeQueryResponse.isSuccessful()).isTrue();
 		successCompositeQueryResponse
 				.getCompositeResponse()
 				.forEach(
@@ -102,6 +103,7 @@ void compositeQueryResponseDiMorphicMarshallUnmarshall() throws JSONException {
 						jsonFileConfig
 								.jsonFilePath("composite/query/resp/query-response-all-error.json")
 								.done());
+		assertThat(errorCompositeQueryResponse.isSuccessful()).isFalse();
 		errorCompositeQueryResponse
 				.getCompositeResponse()
 				.forEach(
@@ -115,6 +117,7 @@ void compositeQueryResponseDiMorphicMarshallUnmarshall() throws JSONException {
 						jsonFileConfig
 								.jsonFilePath("composite/query/resp/query-response-partial-success.json")
 								.done());
+		assertThat(partialSuccessCompositeQueryResponse.isSuccessful()).isFalse();
 		assertThat(partialSuccessCompositeQueryResponse.getCompositeResponse().getFirst())
 				.isInstanceOf(SuccessQueryResponse.class);
 		assertThat(partialSuccessCompositeQueryResponse.getCompositeResponse().get(1))

src/test/kotlin/com/salesforce/revoman/output/report/PostmanEnvironmentKtTest.kt

@@ -14,7 +14,6 @@ import io.kotest.matchers.equals.shouldBeEqual
 import io.kotest.matchers.maps.shouldContainExactly
 import io.kotest.matchers.maps.shouldNotBeEmpty
 import io.kotest.matchers.shouldBe
-import io.kotest.matchers.types.shouldBeInstanceOf
 import org.junit.jupiter.api.Test
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
@@ -73,9 +72,7 @@ class PostmanEnvironmentKtTest {
     pmEnv.getObj<List<Int>>("key3")!! shouldBeEqual env["key3"] as List<Int>
     pmEnv.getObj<Map<String, Int>>("key4")!! shouldContainExactly env["key4"] as Map<String, Int>
     pmEnv.getObj<List<String>>("key5")!! shouldContainExactly env["key5"] as List<String>
-    pmEnv
-      .getObj<Map<String, Any?>>("key6")!!
-      .shouldNotBeEmpty()
+    pmEnv.getObj<Map<String, Any?>>("key6")!!.shouldNotBeEmpty()
     pmEnv.getObj<Any>("key7") shouldBe null
   }
 }