Skip to content

Commit 706e808

Browse files
authored
fix: remove leaky trace logging from XML serde (#537)
1 parent 6a37404 commit 706e808

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

runtime/serde/serde-xml/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ kotlin {
1616
commonMain {
1717
dependencies {
1818
api(project(":runtime:serde"))
19-
implementation(project(":runtime:logging"))
2019
}
2120
}
2221
jvmMain {
@@ -26,12 +25,6 @@ kotlin {
2625
implementation("org.ogce:xpp3:$xpp3Version")
2726
}
2827
}
29-
jvmTest {
30-
dependencies {
31-
implementation("org.slf4j:slf4j-simple:$slf4jVersion")
32-
implementation("org.slf4j:slf4j-api:$slf4jVersion")
33-
}
34-
}
3528

3629
all {
3730
languageSettings.optIn("aws.smithy.kotlin.runtime.util.InternalApi")

runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlDeserializer.kt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package aws.smithy.kotlin.runtime.serde.xml
77

8-
import aws.smithy.kotlin.runtime.logging.Logger
98
import aws.smithy.kotlin.runtime.serde.*
109

1110
// Represents aspects of SdkFieldDescriptor that are particular to the Xml format
@@ -33,12 +32,9 @@ class XmlDeserializer(
3332

3433
constructor(input: ByteArray, validateRootElement: Boolean = false) : this(xmlStreamReader(input), validateRootElement)
3534

36-
private val logger = Logger.getLogger<XmlDeserializer>()
3735
private var firstStructCall = true
3836

3937
override fun deserializeStruct(descriptor: SdkObjectDescriptor): Deserializer.FieldIterator {
40-
logger.trace { "Deserializing struct $descriptor under ${reader.lastToken}" }
41-
4238
if (firstStructCall) {
4339
if (!descriptor.hasTrait<XmlSerialName>()) throw DeserializationException("Top-level struct $descriptor requires a XmlSerialName trait but has none.")
4440

@@ -72,8 +68,6 @@ class XmlDeserializer(
7268
}
7369

7470
override fun deserializeList(descriptor: SdkFieldDescriptor): Deserializer.ElementIterator {
75-
logger.trace { "Deserializing list $descriptor under ${reader.lastToken}" }
76-
7771
val depth = when (descriptor.hasTrait<Flattened>()) {
7872
true -> XmlStreamReader.SubtreeStartDepth.CURRENT
7973
else -> XmlStreamReader.SubtreeStartDepth.CHILD
@@ -82,11 +76,8 @@ class XmlDeserializer(
8276
return XmlListDeserializer(reader.subTreeReader(depth), descriptor)
8377
}
8478

85-
override fun deserializeMap(descriptor: SdkFieldDescriptor): Deserializer.EntryIterator {
86-
logger.trace { "Deserializing map $descriptor under ${reader.lastToken}" }
87-
88-
return XmlMapDeserializer(reader.subTreeReader(XmlStreamReader.SubtreeStartDepth.CURRENT), descriptor)
89-
}
79+
override fun deserializeMap(descriptor: SdkFieldDescriptor): Deserializer.EntryIterator =
80+
XmlMapDeserializer(reader.subTreeReader(XmlStreamReader.SubtreeStartDepth.CURRENT), descriptor)
9081
}
9182

9283
/**

runtime/serde/serde-xml/jvm/src/aws/smithy/kotlin/runtime/serde/xml/XmlStreamReaderXmlPull.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package aws.smithy.kotlin.runtime.serde.xml
77

8-
import aws.smithy.kotlin.runtime.logging.Logger
98
import aws.smithy.kotlin.runtime.serde.DeserializationException
109
import aws.smithy.kotlin.runtime.util.push
1110
import org.xmlpull.mxp1.MXParser
@@ -33,7 +32,6 @@ internal class XmlStreamReaderXmlPull(
3332
}
3433
}
3534

36-
private val logger = Logger.getLogger<XmlStreamReaderXmlPull>()
3735
private val peekStack = mutableListOf(parser.takeNextValidToken())
3836
private var _lastToken = parser.lastToken()
3937

@@ -63,8 +61,6 @@ internal class XmlStreamReaderXmlPull(
6361
XmlStreamReader.SubtreeStartDepth.CURRENT -> _lastToken?.depth
6462
} ?: throw DeserializationException("Unable to determine last node depth in $this")
6563

66-
logger.trace { "Creating subtree at $subTreeDepth next token: ${internalPeek(1)}" }
67-
6864
return SubTreeReader(this, subtreeStartDepth, subTreeDepth)
6965
}
7066

@@ -76,7 +72,6 @@ internal class XmlStreamReaderXmlPull(
7672
false -> peekStack.removeAt(0)
7773
}.also { token ->
7874
this._lastToken = token
79-
logger.trace { "${token.depth.indent()}$token" }
8075
}
8176
}
8277

0 commit comments

Comments
 (0)