Skip to content

Commit f17b037

Browse files
authored
Merge pull request #485 from kazuki-ma/kazuki-ma/organizeDependency
NON-ISSUE Cleanup dependencies.
2 parents fee76bc + aa67d92 commit f17b037

File tree

5 files changed

+7
-20
lines changed

5 files changed

+7
-20
lines changed

line-bot-api-client/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ check.dependsOn integrationTest
4242

4343
dependencies {
4444
api project(':line-bot-model')
45-
implementation project(':line-bot-parser')
46-
implementation 'com.fasterxml.jackson.core:jackson-core'
47-
implementation 'com.fasterxml.jackson.core:jackson-databind'
48-
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
49-
implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names'
45+
implementation project(':line-bot-parser') // TODO: Can we remove it? (By moving LineSignatureValidator)
5046
implementation 'org.slf4j:slf4j-api'
5147

5248
implementation 'com.squareup.okhttp3:logging-interceptor'

line-bot-api-client/src/main/java/com/linecorp/bot/client/LineOAuthClientBuilder.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828

29-
import com.fasterxml.jackson.databind.DeserializationFeature;
3029
import com.fasterxml.jackson.databind.ObjectMapper;
31-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
32-
import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
30+
31+
import com.linecorp.bot.model.objectmapper.ModelObjectMapper;
3332

3433
import lombok.NonNull;
3534
import lombok.Setter;
@@ -178,14 +177,7 @@ private static Interceptor buildLoggingInterceptor() {
178177
}
179178

180179
private static Retrofit.Builder createDefaultRetrofitBuilder() {
181-
final ObjectMapper objectMapper = new ObjectMapper()
182-
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
183-
.enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE)
184-
// Register ParameterNamesModule to read parameter name from lombok generated constructor.
185-
.registerModule(new ParameterNamesModule())
186-
// Register JSR-310(java.time.temporal.*) module and read number as millsec.
187-
.registerModule(new JavaTimeModule())
188-
.configure(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS, false);
180+
final ObjectMapper objectMapper = ModelObjectMapper.createNewObjectMapper();
189181

190182
return new Retrofit.Builder()
191183
.addConverterFactory(JacksonConverterFactory.create(objectMapper));

line-bot-model/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616

1717
dependencies {
18-
implementation 'com.fasterxml.jackson.core:jackson-core'
19-
implementation 'com.fasterxml.jackson.core:jackson-databind'
18+
api 'com.fasterxml.jackson.core:jackson-databind' // Provide configured ObjectMapper.
2019
implementation 'com.fasterxml.jackson.core:jackson-annotations'
2120
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
2221
implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names'

line-bot-parser/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
dependencies {
18-
implementation project(':line-bot-model')
18+
api project(':line-bot-model')
1919
implementation 'com.fasterxml.jackson.core:jackson-databind'
2020
implementation 'org.slf4j:slf4j-api'
2121
}

line-bot-spring-boot/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
dependencies {
1818
api project(':line-bot-api-client')
19-
implementation project(':line-bot-model')
19+
api project(':line-bot-model')
2020
implementation project(':line-bot-servlet')
2121
implementation 'org.springframework.boot:spring-boot-autoconfigure'
2222
implementation 'org.springframework.boot:spring-boot-starter-web'

0 commit comments

Comments
 (0)