Skip to content

Update Thrift to 0.16.0 #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yamasa merged 2 commits into from
Mar 23, 2022
Merged

Update Thrift to 0.16.0 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4a0e49
Upgrade libthrift to 0.16.0
yamasa Mar 23, 2022
b5214ee
Regenerate sample_thrift using Thrift 0.16.0.
yamasa Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ autoService = "1.0.1"
autoServiceKsp = "1.0.0"
okhttp = "4.9.3"
kotlinpoet = "1.10.2"
thrift = "0.13.0"
thrift = "0.16.0"
dexmaker = "2.28.1"
mockito = "4.4.0"
mockitoKotlin = "4.0.0"
Expand Down
1 change: 1 addition & 0 deletions sample_thrift/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ java {

dependencies {
compileOnly(libs.libthrift) {
exclude group: 'org.apache.commons'
exclude group: 'org.apache.httpcomponents'
}
}
6 changes: 2 additions & 4 deletions sample_thrift/src/main/java/com/linecorp/lich/sample/thrift/FooException.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions sample_thrift/src/main/java/com/linecorp/lich/sample/thrift/FooParam.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions sample_thrift/src/main/java/com/linecorp/lich/sample/thrift/FooResponse.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 6 additions & 14 deletions sample_thrift/src/main/java/com/linecorp/lich/sample/thrift/FooService.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions sample_thrift/src/main/java/com/linecorp/lich/sample/thrift/FooUnion.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies {
implementation project(':okhttp')
api libs.okhttp
api(libs.libthrift) {
exclude group: 'org.apache.commons'
exclude group: 'org.apache.httpcomponents'
}

Expand Down
9 changes: 9 additions & 0 deletions thrift/src/main/java/com/linecorp/lich/thrift/OkioTransport.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package com.linecorp.lich.thrift

import okio.BufferedSink
import okio.BufferedSource
import org.apache.thrift.TConfiguration
import org.apache.thrift.transport.TTransport
import java.io.EOFException

Expand Down Expand Up @@ -71,4 +72,12 @@ class OkioTransport(
override fun open() = Unit

override fun close() = Unit

// To keep binary compatibility with libthrift 0.13.0 or lower,
// we provide empty implementations for the following methods.
override fun getConfiguration(): TConfiguration = TConfiguration.DEFAULT

override fun checkReadBytesAvailable(numBytes: Long) = Unit

override fun updateKnownMessageSize(size: Long) = Unit
}