Skip to content

test: fix Jetty 12 RuntimeIOException deprecation and Windows POSIX c… #118

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

Open
Yosefnago wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −8
Open

test: fix Jetty 12 RuntimeIOException deprecation and Windows POSIX c… #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions logzio-sender-test/src/main/java/io/logz/test/MockLogzioBulkListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import jakarta.servlet.http.HttpServletResponse;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.ee9.servlet.ServletHolder;
import org.eclipse.jetty.io.RuntimeIOException;
import java.io.UncheckedIOException;
import org.eclipse.jetty.server.Server;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -146,7 +146,7 @@ public void start() throws Exception {
}
attempts++;
if (attempts > 10) {
throw new RuntimeIOException("Failed to start after multiple attempts");
throw new UncheckedIOException(new IOException("Failed to start after multiple attempts"));
}
}
logger.info("Started listening on {}:{} ({})", host, port, this);
Expand All @@ -169,7 +169,7 @@ public void stop() {
}
attempts++;
if (attempts > 10) {
throw new RuntimeIOException("Failed to stop after multiple attempts");
throw new UncheckedIOException(new IOException("Failed to stop after multiple attempts"));
}
}
logger.info("Stopped listening on {}:{} ({})", host, port, this);
Expand Down
16 changes: 11 additions & 5 deletions logzio-sender-test/src/main/java/io/logz/test/TestEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,17 @@ public static File createTempDirectory() {
+buildDirSubString+" in the following classpath: "+classPath));

try {
FileAttribute<Set<PosixFilePermission>> fileAttributes = PosixFilePermissions.asFileAttribute(EnumSet
.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE,
GROUP_READ, GROUP_EXECUTE, GROUP_WRITE,
OTHERS_EXECUTE, OTHERS_READ, OTHERS_WRITE));
return Files.createTempDirectory(buildDir.toPath(), "", fileAttributes).toFile();
boolean isPosixSupported = java.nio.file.FileSystems.getDefault().supportedFileAttributeViews().contains("posix");

if (isPosixSupported) {
FileAttribute<Set<PosixFilePermission>> fileAttributes = PosixFilePermissions.asFileAttribute(EnumSet
.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE,
GROUP_READ, GROUP_EXECUTE, GROUP_WRITE,
OTHERS_EXECUTE, OTHERS_READ, OTHERS_WRITE));
return Files.createTempDirectory(buildDir.toPath(), "", fileAttributes).toFile();
} else {
return Files.createTempDirectory(buildDir.toPath(), "").toFile();
}
} catch (IOException e) {
throw new RuntimeException("Failed creating temp directory in "+buildDir.getAbsolutePath(), e);
}
Expand Down