Skip to content

Commit fe79d47

Browse files
Mohammad-DwairiMohammad-Dwairi
authored
fix: optimize modules dependencies (#1194)
1 parent 229f46e commit fe79d47

7 files changed

Lines changed: 69 additions & 33 deletions

File tree

‎expediagroup-sdk-core/build.gradle‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,31 @@ apply from: "$rootDir/gradle-tasks/publish.gradle"
1313
apply from: "$rootDir/gradle-tasks/signing.gradle"
1414

1515
dependencies {
16-
/* Kotlin */
17-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10'
18-
1916
/* EG SDK Core */
2017
api 'com.squareup.okio:okio:3.10.2'
21-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
22-
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2'
23-
implementation 'org.slf4j:slf4j-api:2.0.16'
18+
19+
/* Serialization/Deserialization */
20+
compileOnly(platform('com.fasterxml.jackson:jackson-bom:2.18.2'))
21+
compileOnly 'com.fasterxml.jackson.core:jackson-databind'
22+
compileOnly 'com.fasterxml.jackson.module:jackson-module-kotlin'
23+
24+
/* Logging */
25+
compileOnly 'org.slf4j:slf4j-api:2.0.16'
2426

2527
/* Testing */
2628
testImplementation platform('org.junit:junit-bom:5.11.4')
2729
testImplementation 'org.junit.jupiter:junit-jupiter-api'
2830
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
2931
testImplementation 'org.junit.jupiter:junit-jupiter-params'
32+
3033
testImplementation 'io.mockk:mockk:1.13.16'
31-
testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
34+
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
35+
36+
testImplementation 'org.slf4j:slf4j-api:2.0.16'
37+
38+
testImplementation(platform('com.fasterxml.jackson:jackson-bom:2.18.2'))
39+
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
40+
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2'
3241
}
3342

3443
test {

‎expediagroup-sdk-core/src/main/kotlin/com/expediagroup/sdk/core/logging/RequestLogger.kt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ internal object RequestLogger {
3333
maxBodyLogSize: Long? = null,
3434
maskBody: (String) -> String = { it },
3535
maskHeaders: (Headers) -> Headers = { it },
36-
loggableContentTypes: List<MediaType> = emptyList()
36+
loggableContentTypes: List<MediaType>? = null
3737
) {
3838
try {
3939
var logString =
@@ -44,7 +44,13 @@ internal object RequestLogger {
4444
if (logger.isDebugEnabled) {
4545
val requestBodyString =
4646
request.body?.let {
47-
maskBody(it.readLoggableBody(maxBodyLogSize, it.mediaType()?.charset, loggableContentTypes))
47+
maskBody(
48+
it.readLoggableBody(
49+
maxBodyLogSize = maxBodyLogSize,
50+
charset = it.mediaType()?.charset,
51+
loggableContentTypes = loggableContentTypes
52+
)
53+
)
4854
}
4955

5056
logString += ", Body=$requestBodyString"
@@ -61,14 +67,14 @@ internal object RequestLogger {
6167
private fun RequestBody.readLoggableBody(
6268
maxBodyLogSize: Long?,
6369
charset: Charset?,
64-
loggableContentTypes: List<MediaType> = emptyList()
70+
loggableContentTypes: List<MediaType>?
6571
): String {
6672
this.mediaType().also {
6773
if (it === null) {
6874
return "Request body of unknown media type cannot be logged"
6975
}
7076

71-
if (!isLoggable(it, loggableContentTypes)) {
77+
if (!isLoggable(it, loggableContentTypes ?: emptyList())) {
7278
return "Request body of type ${it.fullType} cannot be logged"
7379
}
7480
}

‎expediagroup-sdk-core/src/main/kotlin/com/expediagroup/sdk/core/logging/ResponseLogger.kt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal object ResponseLogger {
3232
maxBodyLogSize: Long? = null,
3333
maskBody: (String) -> String = { it },
3434
maskHeaders: (Headers) -> Headers = { it },
35-
loggableContentTypes: List<MediaType> = emptyList()
35+
loggableContentTypes: List<MediaType>? = null
3636
) {
3737
try {
3838
var logString =
@@ -43,7 +43,13 @@ internal object ResponseLogger {
4343
if (logger.isDebugEnabled) {
4444
val responseBodyString =
4545
response.body?.let {
46-
maskBody(it.readLoggableBody(maxBodyLogSize, it.mediaType()?.charset, loggableContentTypes))
46+
maskBody(
47+
it.readLoggableBody(
48+
maxBodyLogSize = maxBodyLogSize,
49+
charset = it.mediaType()?.charset,
50+
loggableContentTypes = loggableContentTypes
51+
)
52+
)
4753
}
4854

4955
logString += ", Body=$responseBodyString"
@@ -60,14 +66,14 @@ internal object ResponseLogger {
6066
private fun ResponseBody.readLoggableBody(
6167
maxBodyLogSize: Long?,
6268
charset: Charset?,
63-
loggableContentTypes: List<MediaType> = emptyList()
69+
loggableContentTypes: List<MediaType>?
6470
): String {
6571
this.mediaType().also {
6672
if (it === null) {
6773
return "Response body of unknown media type cannot be logged"
6874
}
6975

70-
if (!isLoggable(it, loggableContentTypes)) {
76+
if (!isLoggable(it, loggableContentTypes ?: emptyList())) {
7177
return "Response body of type ${it.fullType} cannot be logged"
7278
}
7379
}

‎expediagroup-sdk-core/src/test/kotlin/com/expediagroup/sdk/core/logging/ResponseLoggerTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ class ResponseLoggerTest {
277277
.method(Method.POST)
278278
.build()
279279
).body(
280-
ResponseBody.create(Buffer(), mediaType = CommonMediaTypes.APPLICATION_OCTET_STREAM))
280+
ResponseBody.create(Buffer(), mediaType = CommonMediaTypes.APPLICATION_OCTET_STREAM)
281+
)
281282
.build()
282283

283284
every { mockLogger.isDebugEnabled } returns true

‎expediagroup-sdk-graphql/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,23 @@ apply from: "$rootDir/gradle-tasks/publish.gradle"
1414
apply from: "$rootDir/gradle-tasks/signing.gradle"
1515

1616
dependencies {
17-
/* Kotlin */
18-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10'
19-
2017
/* Apollo */
2118
api 'com.apollographql.apollo:apollo-api:4.1.1'
2219

2320
/* EG SDK Core */
24-
api 'com.expediagroup:expediagroup-sdk-core:0.0.6-alpha'
21+
api 'com.expediagroup:expediagroup-sdk-core:0.0.8-alpha'
22+
23+
/* Logging */
24+
compileOnly 'org.slf4j:slf4j-api:2.0.16'
2525

2626
/* Testing */
2727
testImplementation platform('org.junit:junit-bom:5.11.4')
2828
testImplementation 'org.junit.jupiter:junit-jupiter-api'
2929
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
3030
testImplementation 'org.junit.jupiter:junit-jupiter-params'
3131
testImplementation 'io.mockk:mockk:1.13.16'
32-
testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
32+
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
33+
testImplementation 'org.slf4j:slf4j-api:2.0.16'
3334
}
3435

3536
apollo {

‎expediagroup-sdk-rest/build.gradle‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ apply from: "$rootDir/gradle-tasks/publish.gradle"
1313
apply from: "$rootDir/gradle-tasks/signing.gradle"
1414

1515
dependencies {
16-
/* Kotlin */
17-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10'
16+
/* Serialization/Deserialization */
17+
compileOnly(platform('com.fasterxml.jackson:jackson-bom:2.18.2'))
18+
compileOnly 'com.fasterxml.jackson.core:jackson-databind'
19+
compileOnly 'com.fasterxml.jackson.module:jackson-module-kotlin'
1820

19-
/* Serialization */
20-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
21-
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2'
21+
/* Logging */
22+
compileOnly 'org.slf4j:slf4j-api:2.0.16'
2223

2324
/* EG SDK Core */
2425
api 'com.expediagroup:expediagroup-sdk-core:0.0.8-alpha'
@@ -28,8 +29,15 @@ dependencies {
2829
testImplementation 'org.junit.jupiter:junit-jupiter-api'
2930
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
3031
testImplementation 'org.junit.jupiter:junit-jupiter-params'
32+
3133
testImplementation 'io.mockk:mockk:1.13.16'
32-
testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
34+
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
35+
36+
testImplementation 'org.slf4j:slf4j-api:2.0.16'
37+
38+
testImplementation(platform('com.fasterxml.jackson:jackson-bom:2.18.2'))
39+
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
40+
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2'
3341
}
3442

3543
test {

‎expediagroup-sdk-transport-okhttp/build.gradle‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,26 @@ apply from: "$rootDir/gradle-tasks/publish.gradle"
1313
apply from: "$rootDir/gradle-tasks/signing.gradle"
1414

1515
dependencies {
16-
/* Kotlin */
17-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10'
16+
api 'com.squareup.okhttp3:okhttp:4.12.0'
1817

1918
/* EG SDK Core */
20-
api 'com.squareup.okhttp3:okhttp:4.12.0'
21-
compileOnly 'com.expediagroup:expediagroup-sdk-core:0.0.6-alpha'
19+
compileOnly 'com.expediagroup:expediagroup-sdk-core:0.0.8-alpha'
20+
21+
/* Logging */
22+
compileOnly 'org.slf4j:slf4j-api:2.0.16'
2223

2324
/* Testing */
2425
testImplementation platform('org.junit:junit-bom:5.11.4')
2526
testImplementation 'org.junit.jupiter:junit-jupiter-api'
2627
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
2728
testImplementation 'org.junit.jupiter:junit-jupiter-params'
29+
2830
testImplementation 'io.mockk:mockk:1.13.16'
29-
testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
30-
testImplementation(project(":expediagroup-sdk-core"))
31+
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
32+
33+
testImplementation(project(':expediagroup-sdk-core'))
34+
35+
testImplementation 'org.slf4j:slf4j-api:2.0.16'
3136
}
3237

3338
test {

0 commit comments

Comments
 (0)