Skip to content

Commit ed6123d

Browse files
barancevbarancev
committed
Moving OS utility classes to internal namespace
1 parent ac5d168 commit ed6123d

23 files changed

Lines changed: 32 additions & 35 deletions

File tree

‎java/client/src/org/openqa/selenium/BUCK‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ java_library(name = 'selenium',
99
':primitives',
1010
'//java/client/src/org/openqa/selenium/interactions:interactions',
1111
'//java/client/src/org/openqa/selenium/internal/io:io',
12+
'//java/client/src/org/openqa/selenium/internal/os:os',
1213
'//java/client/src/org/openqa/selenium/logging:api',
1314
'//java/client/src/org/openqa/selenium/logging:logging',
1415
'//java/client/src/org/openqa/selenium/net:net',
15-
'//java/client/src/org/openqa/selenium/os:os',
1616
'//java/client/src/org/openqa/selenium/security:security',
1717
],
1818
visibility = ['PUBLIC'],
@@ -120,8 +120,8 @@ java_library(name = 'exceptions',
120120
visibility = [
121121
'//java/client/src/org/openqa/selenium/interactions:exceptions',
122122
'//java/client/src/org/openqa/selenium/internal/io:io',
123+
'//java/client/src/org/openqa/selenium/internal/os:os',
123124
'//java/client/src/org/openqa/selenium/net:net',
124-
'//java/client/src/org/openqa/selenium/os:os',
125125
'//java/client/test/org/openqa/selenium/testing:helpers',
126126
],
127127
)
@@ -137,8 +137,8 @@ java_library(
137137
],
138138
visibility = [
139139
'//java/client/src/org/openqa/selenium/internal/io:io',
140+
'//java/client/src/org/openqa/selenium/internal/os:os',
140141
'//java/client/src/org/openqa/selenium/net:net',
141-
'//java/client/src/org/openqa/selenium/os:os',
142142
],
143143
)
144144

‎java/client/src/org/openqa/selenium/firefox/FirefoxBinary.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static org.openqa.selenium.Platform.MAC;
2424
import static org.openqa.selenium.Platform.UNIX;
2525
import static org.openqa.selenium.Platform.WINDOWS;
26-
import static org.openqa.selenium.os.WindowsUtils.getPathsInProgramFiles;
26+
import static org.openqa.selenium.internal.os.WindowsUtils.getPathsInProgramFiles;
2727

2828
import com.google.common.collect.ImmutableList;
2929
import com.google.common.collect.Iterables;
@@ -34,8 +34,8 @@
3434
import org.openqa.selenium.WebDriverException;
3535
import org.openqa.selenium.firefox.internal.Executable;
3636
import org.openqa.selenium.internal.io.FileHandler;
37-
import org.openqa.selenium.os.CommandLine;
38-
import org.openqa.selenium.os.ExecutableFinder;
37+
import org.openqa.selenium.internal.os.CommandLine;
38+
import org.openqa.selenium.internal.os.ExecutableFinder;
3939

4040
import java.io.File;
4141
import java.io.FileNotFoundException;

‎java/client/src/org/openqa/selenium/internal/io/BUCK‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ java_library(
77
],
88
visibility = [
99
'//java/client/src/org/openqa/selenium:selenium',
10-
'//java/client/src/org/openqa/selenium/os:os',
10+
'//java/client/src/org/openqa/selenium/internal/os:os',
1111
],
1212
)
1313

java/client/src/org/openqa/selenium/os/BUCK renamed to java/client/src/org/openqa/selenium/internal/os/BUCK

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ java_library(
22
name = 'os',
33
srcs = glob(['*.java']),
44
deps = [
5-
'//java/client/src/org/openqa/selenium:beta',
65
'//java/client/src/org/openqa/selenium:exceptions',
76
'//java/client/src/org/openqa/selenium:platform',
87
'//java/client/src/org/openqa/selenium/internal/io:io',

java/client/src/org/openqa/selenium/os/CommandLine.java renamed to java/client/src/org/openqa/selenium/internal/os/CommandLine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.os;
18+
package org.openqa.selenium.internal.os;
1919

2020

2121
import com.google.common.annotations.VisibleForTesting;

java/client/src/org/openqa/selenium/os/ExecutableFinder.java renamed to java/client/src/org/openqa/selenium/internal/os/ExecutableFinder.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616
// under the License.
1717

1818

19-
package org.openqa.selenium.os;
19+
package org.openqa.selenium.internal.os;
2020

2121
import static org.openqa.selenium.Platform.WINDOWS;
2222

2323
import java.io.File;
2424
import java.io.IOException;
25-
import java.lang.reflect.InvocationTargetException;
26-
import java.lang.reflect.Method;
2725
import java.nio.file.Files;
2826
import java.util.Map;
2927

java/client/src/org/openqa/selenium/os/Kernel32.java renamed to java/client/src/org/openqa/selenium/internal/os/Kernel32.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.os;
18+
package org.openqa.selenium.internal.os;
1919

2020
import com.sun.jna.Native;
2121
import com.sun.jna.win32.W32APIOptions;

java/client/src/org/openqa/selenium/os/OsProcess.java renamed to java/client/src/org/openqa/selenium/internal/os/OsProcess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.os;
18+
package org.openqa.selenium.internal.os;
1919

2020
import java.io.File;
2121
import java.io.OutputStream;

java/client/src/org/openqa/selenium/os/ProcessUtils.java renamed to java/client/src/org/openqa/selenium/internal/os/ProcessUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// under the License.
1717

1818

19-
package org.openqa.selenium.os;
19+
package org.openqa.selenium.internal.os;
2020

2121
import org.openqa.selenium.Platform;
2222

@@ -28,8 +28,8 @@
2828
import java.util.logging.Logger;
2929

3030
import static org.openqa.selenium.Platform.WINDOWS;
31-
import static org.openqa.selenium.os.WindowsUtils.killPID;
32-
import static org.openqa.selenium.os.WindowsUtils.thisIsWindows;
31+
import static org.openqa.selenium.internal.os.WindowsUtils.killPID;
32+
import static org.openqa.selenium.internal.os.WindowsUtils.thisIsWindows;
3333

3434
import com.sun.jna.Pointer;
3535
import com.sun.jna.platform.win32.WinNT;

java/client/src/org/openqa/selenium/os/UnixProcess.java renamed to java/client/src/org/openqa/selenium/internal/os/UnixProcess.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.os;
18+
package org.openqa.selenium.internal.os;
1919

2020
import static com.google.common.base.Preconditions.checkNotNull;
2121
import static com.google.common.collect.ImmutableMap.copyOf;
2222
import static java.util.concurrent.TimeUnit.SECONDS;
23-
import static org.openqa.selenium.os.WindowsUtils.thisIsWindows;
23+
import static org.openqa.selenium.internal.os.WindowsUtils.thisIsWindows;
2424

2525
import com.google.common.annotations.VisibleForTesting;
2626
import com.google.common.collect.Maps;

0 commit comments

Comments
 (0)