style: code cleanup

ymind · Aug 10, 2023 · a316d3f · a316d3f
1 parent e3ae7ad
commit a316d3f
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 22 deletions.
diff --git a/README.adoc b/README.adoc
@@ -2,9 +2,9 @@
 :toc:
 
 [NOTE]
-----
+====
 This project fork from https://github.com/shagaba/jacksync.
-----
+====
 
 == Creating and applying sync patches (merge, patch, diff, sync)
 
@@ -110,7 +110,6 @@ For example:
 [source,kotlin]
 ----
 val patchProcessor = ObjectPatchProcessor(objectMapperWrapper)
-
 val postV2 = patchProcessor.patch(originalPostV1, operations)
 ----
 
@@ -143,7 +142,6 @@ For example:
 [source,kotlin]
 ----
 val mergeProcessor = ObjectMergeProcessor(objectMapperWrapper)
-
 val postV2 = mergeProcessor.merge(originalPostV1, value)
 ----
 

diff --git a/src/main/kotlin/team/yi/jacksync/diff/strategy/SimpleDiffStrategy.kt b/src/main/kotlin/team/yi/jacksync/diff/strategy/SimpleDiffStrategy.kt
@@ -54,11 +54,11 @@ class SimpleDiffStrategy : DiffStrategy {
         invertible: Boolean,
     ): List<PatchOperation> {
         if (sourceJsonNode.isArray && targetJsonNode.isArray) {
-            val commonNodes: MutableList<JsonNode> = ArrayList()
+            val commonNodes = mutableListOf<JsonNode>()
 
             sourceJsonNode.iterator().forEachRemaining { e -> commonNodes.add(e) }
 
-            val targetNodes: MutableList<JsonNode> = ArrayList()
+            val targetNodes = mutableListOf<JsonNode>()
 
             targetJsonNode.iterator().forEachRemaining { e -> targetNodes.add(e) }
 

diff --git a/src/main/kotlin/team/yi/jacksync/difflog/DiffLogUtils.kt b/src/main/kotlin/team/yi/jacksync/difflog/DiffLogUtils.kt
@@ -37,8 +37,11 @@ object DiffLogUtils {
 
         return patchPathOperations.filter { it !is TestOperation }.let { operations ->
             testOperations.map { testOperation ->
-                val operation = operations.firstOrNull { it.path == testOperation.path }
-                    ?: throw DiffLogException("No `PatchOperation` were found matching the `TestOperation(path=${testOperation.path})`.")
+                val operation = requireNotNull(operations.firstOrNull { it.path == testOperation.path }) {
+                    val message = "No `PatchOperation` were found matching the `TestOperation(path=${testOperation.path})`."
+
+                    throw DiffLogException(message)
+                }
 
                 val op = requireNotNull(PatchOperation.getOpName(operation))
                 val value = if (operation is PatchPathValueOperation) operation.value else null

diff --git a/src/main/kotlin/team/yi/jacksync/utils/ChecksumUtils.kt b/src/main/kotlin/team/yi/jacksync/utils/ChecksumUtils.kt
@@ -18,7 +18,7 @@ object ChecksumUtils {
     }
 
     fun computeChecksum(byteArray: ByteArray): String {
-        val checksum: Checksum = CRC32()
+        val checksum = CRC32()
         checksum.update(byteArray, 0, byteArray.size)
 
         return java.lang.Long.toHexString(checksum.value)

diff --git a/src/main/kotlin/team/yi/jacksync/utils/JacksonUtils.kt b/src/main/kotlin/team/yi/jacksync/utils/JacksonUtils.kt
@@ -19,8 +19,7 @@ object JacksonUtils {
         }.getOrDefault(false)
     }
 
-    fun toJsonPointer(path: String?): JsonPointer {
-        requireNotNull(path) { "Path cannot be null" }
+    fun toJsonPointer(path: String): JsonPointer {
         require(path == path.trim()) { "Path has not been trimmed: '$path'" }
 
         return if (SEPARATOR == path.trim()) {

diff --git a/src/test/kotlin/team/yi/jacksync/JacksyncTest.kt b/src/test/kotlin/team/yi/jacksync/JacksyncTest.kt
@@ -38,9 +38,15 @@ class JacksyncTest : BaseTest() {
         )
 
         // SyncData regular diff
-        val syncData = jacksync.diffMapper.diff(SyncObject(1L, postV1), SyncObject(2L, postV2))
+        val syncData = jacksync.diffMapper.diff(
+            SyncObject(1L, postV1),
+            SyncObject(2L, postV2),
+        )
         // SyncObject clientSync
-        val syncPostV2 = jacksync.syncProcessor.clientSync(SyncObject(1L, postV1), syncData)
+        val syncPostV2 = jacksync.syncProcessor.clientSync(
+            SyncObject(1L, postV1),
+            syncData,
+        )
 
         Assertions.assertEquals(syncPostV2.data, postV2)
 

diff --git a/src/test/kotlin/team/yi/jacksync/operation/AddOperationTest.kt b/src/test/kotlin/team/yi/jacksync/operation/AddOperationTest.kt
@@ -64,7 +64,7 @@ class AddOperationTest : BaseTest() {
         val postV1 = Post()
         val postV1Node = objectMapperWrapper.valueToTree<JsonNode>(postV1)
         val section = Section("section-1", null)
-        val sections: MutableList<Section> = ArrayList()
+        val sections = mutableListOf<Section>()
         sections.add(section)
 
         val addOperation =

diff --git a/src/test/kotlin/team/yi/jacksync/patch/ObjectPatchProcessorTest.kt b/src/test/kotlin/team/yi/jacksync/patch/ObjectPatchProcessorTest.kt
@@ -19,7 +19,7 @@ class ObjectPatchProcessorTest : BaseTest() {
         postV1.version = 1L
 
         // operations
-        val addOperation: PatchOperation = AddOperation(
+        val addOperation = AddOperation(
             JacksonUtils.toJsonPointer("/title"),
             objectMapperWrapper.valueToTree("my test title"),
         )
@@ -45,11 +45,11 @@ class ObjectPatchProcessorTest : BaseTest() {
         serverPostV1.title = "my 2nd test title"
 
         // operations
-        val addOperation: PatchOperation = AddOperation(
+        val addOperation = AddOperation(
             JacksonUtils.toJsonPointer("/title"),
             objectMapperWrapper.valueToTree("my 2nd test title"),
         )
-        val replaceOperation: PatchOperation = ReplaceOperation(
+        val replaceOperation = ReplaceOperation(
             JacksonUtils.toJsonPointer("/version"),
             objectMapperWrapper.valueToTree(2),
         )

diff --git a/src/test/kotlin/team/yi/jacksync/sync/LocalSyncProcessorTest.kt b/src/test/kotlin/team/yi/jacksync/sync/LocalSyncProcessorTest.kt
@@ -32,7 +32,10 @@ class LocalSyncProcessorTest : BaseTest() {
             0L,
             ChecksumUtils.computeChecksum(objectMapperWrapper.writeValueAsString(targetPost)),
             listOf(
-                AddOperation(JacksonUtils.toJsonPointer("/title"), objectMapperWrapper.valueToTree(targetPost.title)),
+                AddOperation(
+                    JacksonUtils.toJsonPointer("/title"),
+                    objectMapperWrapper.valueToTree(targetPost.title),
+                ),
             ),
         )
 
@@ -61,10 +64,14 @@ class LocalSyncProcessorTest : BaseTest() {
         targetPost.version = 2L
 
         // sync syncData & operations
-        val addOperation =
-            AddOperation(JacksonUtils.toJsonPointer("/title"), objectMapperWrapper.valueToTree(targetPost.title))
-        val replaceOperation =
-            ReplaceOperation(JacksonUtils.toJsonPointer("/version"), objectMapperWrapper.valueToTree(2))
+        val addOperation = AddOperation(
+            JacksonUtils.toJsonPointer("/title"),
+            objectMapperWrapper.valueToTree(targetPost.title),
+        )
+        val replaceOperation = ReplaceOperation(
+            JacksonUtils.toJsonPointer("/version"),
+            objectMapperWrapper.valueToTree(2),
+        )
         val operations = listOf<PatchOperation>(addOperation, replaceOperation)
 
         val syncData = SyncData(