netty-shaded: Rename the directory of netty shaded resources to avoid collisions

dzou · web-flow · commit ffebe231c0d8 · 2021-09-02T18:12:10.000-04:00
diff --git a/netty/shaded/build.gradle b/netty/shaded/build.gradle
@@ -110,8 +110,9 @@ class NettyResourceTransformer implements Transformer {
 
     @Override
     void transform(TransformerContext context) {
+        String updatedPath = context.path.replace("io.netty", "io.grpc.netty.shaded.io.netty")
         String updatedContent = context.is.getText().replace("io.netty", "io.grpc.netty.shaded.io.netty")
-        resources.put(context.path, updatedContent)
+        resources.put(updatedPath, updatedContent)
     }
 
     @Override
diff --git a/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java b/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java
@@ -78,7 +78,8 @@ public void noNormalNetty() throws Exception {
   @Test
   public void nettyResourcesUpdated() throws IOException {
     InputStream inputStream = NettyChannelBuilder.class.getClassLoader()
-        .getResourceAsStream("META-INF/native-image/io.netty/transport/reflection-config.json");
+        .getResourceAsStream(
+            "META-INF/native-image/io.grpc.netty.shaded.io.netty/transport/reflection-config.json");
     assertThat(inputStream).isNotNull();
 
     Scanner s = new Scanner(inputStream, StandardCharsets.UTF_8.name()).useDelimiter("\\A");

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,9 @@ class NettyResourceTransformer implements Transformer {`
`110`	`110`
`111`	`111`	`@Override`
`112`	`112`	`void transform(TransformerContext context) {`
	`113`	`+ String updatedPath = context.path.replace("io.netty", "io.grpc.netty.shaded.io.netty")`
`113`	`114`	`String updatedContent = context.is.getText().replace("io.netty", "io.grpc.netty.shaded.io.netty")`
`114`		`- resources.put(context.path, updatedContent)`
	`115`	`+ resources.put(updatedPath, updatedContent)`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`@Override`