Skip to content

Upgrade Drift to Netty 4.2.1. #135

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
martint merged 3 commits into from
May 15, 2025
Merged

Upgrade Drift to Netty 4.2.1. #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83e67b3
Upgrade airbase to 259
wendigo May 15, 2025
63d1d96
Update netty to 4.2.1.Final
wendigo May 15, 2025
f8cab92
Add maven wrapper
wendigo May 15, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
distribution: temurin
java-version: 21
- name: Maven Install
run: mvn install -B -V -DskipTests -Dair.check.skip-all
run: ./mvnw install -B -V -DskipTests -Dair.check.skip-all
- name: Maven Tests
run: mvn install -B -P ci
run: ./mvnw install -B -P ci
19 changes: 19 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
17 changes: 16 additions & 1 deletion drift-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
</properties>

<dependencies>

<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
Expand Down Expand Up @@ -111,4 +110,20 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
11 changes: 11 additions & 0 deletions drift-codec/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,17 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
16 changes: 16 additions & 0 deletions drift-idl-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,20 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
22 changes: 22 additions & 0 deletions drift-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
Expand All @@ -152,4 +158,20 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
3 changes: 2 additions & 1 deletion drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.net.URL;
import java.nio.file.Paths;
import java.security.GeneralSecurityException;
import java.util.List;
import java.util.Optional;
Expand Down Expand Up @@ -204,7 +205,7 @@ private static File getResourceFile(String name)
if (resource == null) {
throw new IllegalArgumentException("Resource not found " + name);
}
return new File(resource.getFile());
return Paths.get(resource.getFile()).toFile();
}

@Target({FIELD, PARAMETER, METHOD})
Expand Down
19 changes: 19 additions & 0 deletions drift-javadoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,29 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${dep.junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit-platform</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions drift-javadoc/src/test/java/io/airlift/drift/javadoc/TestJavdocIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ private static void assertGenerated(File basedir, String name)
URL expected = getResource(format("basic/%s.txt", name));

name += META_SUFFIX;
assertThat(new File(basedir, format("target/classes/its/%s.class", name))).isFile();
assertThat(new File(basedir, format("target/generated-sources/annotations/its/%s.java", name)))
.usingCharset(UTF_8).hasContent(asCharSource(expected, UTF_8).read());
assertThat(basedir.toPath().resolve(format("target/classes/its/%s.class", name))).isRegularFile();
assertThat(basedir.toPath().resolve(format("target/generated-sources/annotations/its/%s.java", name)))
.usingCharset(UTF_8)
.hasContent(asCharSource(expected, UTF_8).read());
}
}
7 changes: 7 additions & 0 deletions drift-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${dep.junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion drift-maven-plugin/src/test/java/io/airlift/drift/javadoc/TestIdlGeneratorIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private void assertGenerated(String testName)
.assertErrorFreeLog();

String expected = Resources.toString(getResource(format("expected/%s.txt", testName)), UTF_8);
String actual = Files.asCharSource(new File(basedir, "target/test.thrift"), UTF_8).read();
String actual = Files.asCharSource(basedir.toPath().resolve("target/test.thrift").toFile(), UTF_8).read();
assertEquals(expected, actual);
}
}
11 changes: 11 additions & 0 deletions drift-protocol/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
Expand Down
16 changes: 16 additions & 0 deletions drift-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,20 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
16 changes: 16 additions & 0 deletions drift-transport-apache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,20 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
6 changes: 3 additions & 3 deletions ...-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.airlift.units.Duration;
import org.testng.annotations.Test;

import java.io.File;
import java.nio.file.Paths;
import java.util.Map;

import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
Expand Down Expand Up @@ -78,8 +78,8 @@ public void testExplicitPropertyMappings()
.setSocksProxy(HostAndPort.fromParts("localhost", 11))
.setMaxFrameSize(new DataSize(55, MEGABYTE))
.setSslEnabled(true)
.setTrustCertificate(new File("trust"))
.setKey(new File("key"))
.setTrustCertificate(Paths.get("trust").toFile())
.setKey(Paths.get("key").toFile())
.setKeyPassword("key_password");

assertFullMapping(properties, expected);
Expand Down
43 changes: 42 additions & 1 deletion drift-transport-netty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,32 @@

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<artifactId>netty-buffer</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-base</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -140,4 +165,20 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
3 changes: 2 additions & 1 deletion ...nsport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/ReloadableSslContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ public synchronized void reload()

SslContextBuilder sslContextBuilder;
if (forClient) {
sslContextBuilder = SslContextBuilder.forClient().keyManager(privateKey, certificateChain);
sslContextBuilder = SslContextBuilder.forClient().keyManager(privateKey, certificateChain)
.endpointIdentificationAlgorithm(null);
}
else {
sslContextBuilder = SslContextBuilder.forServer(privateKey, certificateChain);
Expand Down
6 changes: 3 additions & 3 deletions ...tty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import io.airlift.units.Duration;
import org.testng.annotations.Test;

import java.io.File;
import java.nio.file.Paths;
import java.util.Map;

import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
Expand Down Expand Up @@ -85,8 +85,8 @@ public void testExplicitPropertyMappings()
.setSocksProxy(HostAndPort.fromParts("localhost", 11))
.setMaxFrameSize(new DataSize(55, MEGABYTE))
.setSslEnabled(true)
.setTrustCertificate(new File("trust"))
.setKey(new File("key"))
.setTrustCertificate(Paths.get("trust").toFile())
.setKey(Paths.get("key").toFile())
.setKeyPassword("key_password")
.setSessionCacheSize(678)
.setSessionTimeout(new Duration(78, HOURS))
Expand Down
6 changes: 3 additions & 3 deletions ...tty/src/test/java/io/airlift/drift/transport/netty/server/TestDriftNettyServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import io.airlift.units.Duration;
import org.testng.annotations.Test;

import java.io.File;
import java.nio.file.Paths;
import java.util.Map;

import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
Expand Down Expand Up @@ -87,8 +87,8 @@ public void testExplicitPropertyMappings()
.setSslContextRefreshTime(new Duration(33, MINUTES))
.setAllowPlaintext(false)
.setSslEnabled(true)
.setTrustCertificate(new File("trust"))
.setKey(new File("key"))
.setTrustCertificate(Paths.get("trust").toFile())
.setKey(Paths.get("key").toFile())
.setKeyPassword("key_password")
.setSessionCacheSize(678)
.setSessionTimeout(new Duration(78, HOURS))
Expand Down
Loading