Skip to content

[java] Removing deprecated items in Require.java #15711

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
merged 1 commit into from
May 7, 2025
Merged

[java] Removing deprecated items in Require.java #15711

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
105 changes: 0 additions & 105 deletions java/src/org/openqa/selenium/internal/Require.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.openqa.selenium.internal;

import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
Expand Down Expand Up @@ -161,11 +160,6 @@ public static IntChecker argument(String argName, @Nullable Integer number) {
return new IntChecker(argName, number);
}

@Deprecated(forRemoval = true)
public static FileChecker argument(String argName, @Nullable File file) {
return new FileChecker(argName, file);
}

public static PathChecker argument(String argName, @Nullable Path path) {
return new PathChecker(argName, path);
}
Expand All @@ -180,11 +174,6 @@ public static <T> StateChecker<T> state(String name, @Nullable T state) {
return new StateChecker<>(name, state);
}

@Deprecated(forRemoval = true)
public static FileStateChecker state(String name, @Nullable File file) {
return new FileStateChecker(name, file);
}

public static PathStateChecker state(String name, @Nullable Path path) {
return new PathStateChecker(name, path);
}
Expand Down Expand Up @@ -255,48 +244,6 @@ public int greaterThan(int max, String message) {
}
}

@Deprecated(forRemoval = true)
public static class FileChecker {

private final String argName;
private final @Nullable File file;

FileChecker(String argName, @Nullable File file) {
this.argName = argName;
this.file = file;
}

public File isFile() {
if (file == null) {
throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
}
if (!file.exists()) {
throw new IllegalArgumentException(
String.format(MUST_EXIST, argName, file.getAbsolutePath()));
}
if (!file.isFile()) {
throw new IllegalArgumentException(
String.format(MUST_BE_FILE, argName, file.getAbsolutePath()));
}
return file;
}

public File isDirectory() {
if (file == null) {
throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
}
if (!file.exists()) {
throw new IllegalArgumentException(
String.format(MUST_EXIST, argName, file.getAbsolutePath()));
}
if (!file.isDirectory()) {
throw new IllegalArgumentException(
String.format(MUST_BE_DIR, argName, file.getAbsolutePath()));
}
return file;
}
}

public static class PathChecker {

private final String argName;
Expand Down Expand Up @@ -373,58 +320,6 @@ public T instanceOf(Class<?> cls) {
}
}

@Deprecated(forRemoval = true)
public static class FileStateChecker {

private final String name;
private final @Nullable File file;

FileStateChecker(String name, @Nullable File file) {
this.name = name;
this.file = file;
}

public File isFile() {
if (file == null) {
throw new IllegalStateException(String.format(MUST_BE_SET, name));
}
if (!file.exists()) {
throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
}
if (!file.isFile()) {
throw new IllegalStateException(String.format(MUST_BE_FILE, name, file.getAbsolutePath()));
}
return file;
}

public File isDirectory() {
if (file == null) {
throw new IllegalStateException(String.format(MUST_BE_SET, name));
}
if (!file.exists()) {
throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
}
if (!file.isDirectory()) {
throw new IllegalStateException(String.format(MUST_BE_DIR, name, file.getAbsolutePath()));
}
return file;
}

public File isExecutable() {
if (file == null) {
throw new IllegalStateException(String.format(MUST_BE_SET, name));
}
if (!file.exists()) {
throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
}
if (!file.canExecute()) {
throw new IllegalStateException(
String.format(MUST_BE_EXECUTABLE, name, file.getAbsolutePath()));
}
return file;
}
}

public static class PathStateChecker {

private final String name;
Expand Down
Loading