Skip to content

Commit ebda992

Browse files
committed
Adjust log level for serialize/deserialize and encrypt/decrypt.
1 parent ce7ec90 commit ebda992

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

pubnub-kotlin/pubnub-kotlin-impl/src/main/kotlin/com/pubnub/internal/crypto/CryptoModuleImpl.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class CryptoModuleImpl(
4141
private val headerParser: HeaderParser = HeaderParser(logConfig)
4242

4343
override fun encrypt(data: ByteArray): ByteArray {
44-
logDebugMessage("Encrypting data of size: ${data.size} bytes")
44+
logTraceMessage("Encrypting data of size: ${data.size} bytes")
4545

4646
val cryptorId = primaryCryptor.id()
4747
validateData(data)
@@ -54,36 +54,36 @@ class CryptoModuleImpl(
5454
val cryptorHeader = headerParser.createCryptorHeader(cryptorId, metadata)
5555
cryptorHeader + encryptedData
5656
}
57-
logDebugMessage("Encrypting successful")
57+
logTraceMessage("Encrypting successful")
5858
return result
5959
}
6060

6161
override fun decrypt(encryptedData: ByteArray): ByteArray {
62-
logDebugMessage("Decrypting data of size: ${encryptedData.size} bytes")
62+
logTraceMessage("Decrypting data of size: ${encryptedData.size} bytes")
6363

6464
validateData(encryptedData)
6565
val parsedData: ParseResult<out ByteArray> = headerParser.parseDataWithHeader(encryptedData)
6666
val decryptedData: ByteArray =
6767
when (parsedData) {
6868
is ParseResult.NoHeader -> {
69-
logDebugMessage("Using legacy cryptor for decryption")
69+
logTraceMessage("Using legacy cryptor for decryption")
7070
getDecryptedDataForLegacyCryptor(encryptedData)
7171
}
7272

7373
is ParseResult.Success -> {
74-
logDebugMessage("Using cryptor with header for decryption")
74+
logTraceMessage("Using cryptor with header for decryption")
7575
getDecryptedDataForCryptorWithHeader(parsedData)
7676
}
7777
}
78-
logDebugMessage("Decryption successful")
78+
logTraceMessage("Decryption successful")
7979
return decryptedData
8080
}
8181

8282
override fun encryptStream(stream: InputStream): InputStream {
83-
logDebugMessage("Encrypting stream")
83+
logTraceMessage("Encrypting stream")
8484
val bufferedInputStream = validateStreamAndReturnBuffered(stream)
8585
val (metadata, encryptedData) = primaryCryptor.encryptStream(bufferedInputStream)
86-
logDebugMessage("Encrypting stream successful")
86+
logTraceMessage("Encrypting stream successful")
8787
return if (primaryCryptor.id().contentEquals(LEGACY_CRYPTOR_ID)) {
8888
encryptedData
8989
} else {
@@ -93,7 +93,7 @@ class CryptoModuleImpl(
9393
}
9494

9595
override fun decryptStream(encryptedData: InputStream): InputStream {
96-
logDebugMessage("Decrypting stream")
96+
logTraceMessage("Decrypting stream")
9797
val bufferedInputStream = validateStreamAndReturnBuffered(encryptedData)
9898
return when (val parsedHeader = headerParser.parseDataWithHeader(bufferedInputStream)) {
9999
ParseResult.NoHeader -> {
@@ -119,8 +119,8 @@ class CryptoModuleImpl(
119119
}
120120
}
121121

122-
private fun logDebugMessage(message: String) {
123-
log.debug(LogMessage(message = LogMessageContent.Text(message)))
122+
private fun logTraceMessage(message: String) {
123+
log.trace(LogMessage(message = LogMessageContent.Text(message)))
124124
}
125125

126126
private fun validateCryptorIdSize(cryptorId: ByteArray) {

pubnub-kotlin/pubnub-kotlin-impl/src/main/kotlin/com/pubnub/internal/managers/MapperManager.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,11 @@ class MapperManager(private val logConfig: LogConfig) {
234234
input: JsonElement?,
235235
clazz: Class<T>,
236236
): T {
237-
log.debug(LogMessage(message = LogMessageContent.Text("Deserializing message content")))
237+
log.trace(LogMessage(message = LogMessageContent.Text("Deserializing message content")))
238238

239239
val result = this.objectMapper.fromJson(input, clazz) as T
240240

241-
log.debug(LogMessage(message = LogMessageContent.Text("Message deserialized successfully")))
241+
log.trace(LogMessage(message = LogMessageContent.Text("Message deserialized successfully")))
242242

243243
return result
244244
}
@@ -251,7 +251,7 @@ class MapperManager(private val logConfig: LogConfig) {
251251
}
252252

253253
fun toJson(input: Any?): String {
254-
log.debug(LogMessage(message = LogMessageContent.Text("Serializing message content")))
254+
log.trace(LogMessage(message = LogMessageContent.Text("Serializing message content")))
255255
try {
256256
val result = if (input is List<*> && input.javaClass.isAnonymousClass) {
257257
objectMapper.toJson(input, List::class.java)
@@ -263,7 +263,7 @@ class MapperManager(private val logConfig: LogConfig) {
263263
objectMapper.toJson(input)
264264
}
265265

266-
log.debug(LogMessage(message = LogMessageContent.Text("Message serialized successfully")))
266+
log.trace(LogMessage(message = LogMessageContent.Text("Message serialized successfully")))
267267

268268
return result
269269
} catch (e: JsonParseException) {

0 commit comments

Comments
 (0)