Fix sync flag using inconsistent characters #3406

MaibornWolff · Dec 7, 2023 · 49d5f54 · 49d5f54
1 parent 2119df6
commit 49d5f54
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/...ysis/model/src/main/kotlin/de/maibornwolff/codecharta/serialization/ProjectInputReader.kt b/...ysis/model/src/main/kotlin/de/maibornwolff/codecharta/serialization/ProjectInputReader.kt
@@ -5,7 +5,6 @@ import java.io.BufferedInputStream
 import java.io.BufferedReader
 import java.io.InputStream
 import java.io.InputStreamReader
-import java.nio.charset.StandardCharsets
 import java.util.Scanner
 
 object ProjectInputReader {
@@ -21,16 +20,14 @@ object ProjectInputReader {
     fun extractProjectString(input: InputStream): String {
         Thread.sleep(100)
         val availableBytes = input.available()
-
         if (availableBytes <= 0) {
             return ""
         }
         if (!input.markSupported()) {
             return extractProjectString(BufferedInputStream(input))
         }
 
-        val isSyncSignalContained = isSyncSignalContained(input, availableBytes)
-
+        val isSyncSignalContained = containsSyncSignal(input)
         if (isSyncSignalContained) {
             val scanner = Scanner(input)
             val stringBuilder = StringBuilder()
@@ -43,7 +40,7 @@ object ProjectInputReader {
         }
 
         val charBuffer = CharArray(1024)
-        val reader = BufferedReader(InputStreamReader(input, StandardCharsets.UTF_8))
+        val reader = BufferedReader(InputStreamReader(input))
         val stringBuilder = StringBuilder()
         while (reader.ready()) {
             val bytesRead = reader.read(charBuffer)
@@ -53,9 +50,8 @@ object ProjectInputReader {
         return content.replace(Regex("[\\n\\r]"), "")
     }
 
-    private fun isSyncSignalContained(input: InputStream, availableBytes: Int): Boolean {
-
-        val bufferSize = minOf(availableBytes, 1024)
+    private fun containsSyncSignal(input: InputStream): Boolean {
+        val bufferSize = 1024
         val buffer = ByteArray(bufferSize)
         input.mark(bufferSize)
         input.read(buffer, 0, bufferSize)

diff --git a/.../model/src/test/kotlin/de/maibornwolff/codecharta/serialization/ProjectInputReaderTest.kt b/.../model/src/test/kotlin/de/maibornwolff/codecharta/serialization/ProjectInputReaderTest.kt
@@ -59,14 +59,12 @@ class ProjectInputReaderTest {
     @Test
     fun `Should discard newline characters when input contains newline characters`() {
         // given
-        val syncFlag = PipeableParserSyncFlag.SYNC_FLAG.value
         val line1 = "line1"
         val line2 = "line2"
         val newLine = "\n"
 
         val inputStream = PipedInputStream()
         val outputStream = PipedOutputStream(inputStream)
-        outputStream.write(syncFlag.toByteArray(StandardCharsets.UTF_8))
         outputStream.write(line1.toByteArray(StandardCharsets.UTF_8))
         outputStream.write(newLine.toByteArray(StandardCharsets.UTF_8))
         outputStream.write(line2.toByteArray(StandardCharsets.UTF_8))
@@ -104,12 +102,10 @@ class ProjectInputReaderTest {
     @Test
     fun `Should return stream content when no valid project at end of stream`() {
         // given
-        val syncFlag = PipeableParserSyncFlag.SYNC_FLAG.value
         val invalidProjectData = "data\":\"data\"}"
 
         val inputStream = PipedInputStream()
         val outputStream = PipedOutputStream(inputStream)
-        outputStream.write(syncFlag.toByteArray(StandardCharsets.UTF_8))
         outputStream.write(invalidProjectData.toByteArray(StandardCharsets.UTF_8))
         outputStream.close()
 

diff --git a/...src/main/kotlin/de/maibornwolff/codecharta/tools/pipeableparser/PipeableParserSyncFlag.kt b/...src/main/kotlin/de/maibornwolff/codecharta/tools/pipeableparser/PipeableParserSyncFlag.kt
@@ -1,5 +1,5 @@
 package de.maibornwolff.codecharta.tools.pipeableparser
 
 enum class PipeableParserSyncFlag(val value: String) {
-    SYNC_FLAG("\r\r\r\r\r")
+    SYNC_FLAG("\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E")
 }