Skip to content

Modify netty-shaded resources to reference shaded class names - #8258

Merged
ejona86 merged 3 commits into
grpc:masterfrom
dzou:netty-graalvm-fix
Jun 16, 2021
Merged

Modify netty-shaded resources to reference shaded class names#8258
ejona86 merged 3 commits into
grpc:masterfrom
dzou:netty-graalvm-fix

Conversation

@dzou

@dzou dzou commented Jun 14, 2021

Copy link
Copy Markdown
Contributor

This modifies the shading operation to transform native-image resources so they correctly reference shaded class names.

Fixes #7540.

cc/ @meltsufin

@linux-foundation-easycla

linux-foundation-easycla Bot commented Jun 14, 2021

Copy link
Copy Markdown

CLA Signed

The committers are authorized under a signed CLA.

@voidzcy voidzcy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@voidzcy
voidzcy requested a review from ejona86 June 16, 2021 09:22
@Test
public void nettyResourcesUpdated() throws IOException {
InputStream inputStream = NettyChannelBuilder.class.getClassLoader()
.getResourceAsStream("META-INF/native-image/io.netty/transport/reflection-config.json");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We really ought to rename the files as well (the "io.netty" folder), to avoid them colliding with Netty's files. But we can do that as a follow-up.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, will do.

@ejona86 ejona86 added the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Jun 16, 2021
@grpc-kokoro grpc-kokoro removed the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Jun 16, 2021
@ejona86
ejona86 merged commit dc74a31 into grpc:master Jun 16, 2021
@ejona86

ejona86 commented Jun 16, 2021

Copy link
Copy Markdown
Member

@dzou, thank you!

@dzou

dzou commented Jun 16, 2021

Copy link
Copy Markdown
Contributor Author

@dzou, thank you!

Thanks for the quick review!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Apply package name shading to native-image config files in grpc-netty-shaded

4 participants