Java: Moving CircularOutputStream to another package (it's an interna…

…l class so no need to create a copy)
SeleniumHQ · Jan 28, 2016 · 976b5e9 · 976b5e9
1 parent 7130de4
commit 976b5e9
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 7 deletions.
diff --git a/java/client/src/org/openqa/selenium/firefox/internal/Executable.java b/java/client/src/org/openqa/selenium/firefox/internal/Executable.java
@@ -25,7 +25,7 @@
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.os.WindowsUtils;
-import org.openqa.selenium.remote.internal.CircularOutputStream;
+import org.openqa.selenium.io.CircularOutputStream;
 
 import java.io.File;
 import java.io.OutputStream;

diff --git a/java/client/src/org/openqa/selenium/firefox/internal/NewProfileExtensionConnection.java b/java/client/src/org/openqa/selenium/firefox/internal/NewProfileExtensionConnection.java
@@ -32,7 +32,7 @@
 import org.openqa.selenium.remote.Command;
 import org.openqa.selenium.remote.HttpCommandExecutor;
 import org.openqa.selenium.remote.Response;
-import org.openqa.selenium.remote.internal.CircularOutputStream;
+import org.openqa.selenium.io.CircularOutputStream;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/java/client/src/org/openqa/selenium/firefox/internal/Streams.java b/java/client/src/org/openqa/selenium/firefox/internal/Streams.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.firefox.internal;
 
-import org.openqa.selenium.remote.internal.CircularOutputStream;
+import org.openqa.selenium.io.CircularOutputStream;
 
 import java.io.OutputStream;
 

diff --git a/...remote/internal/CircularOutputStream.java → ...nqa/selenium/io/CircularOutputStream.java b/...remote/internal/CircularOutputStream.java → ...nqa/selenium/io/CircularOutputStream.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.internal;
+package org.openqa.selenium.io;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK
@@ -94,7 +94,6 @@ java_library(name = 'remote',
     'http/JsonHttpCommandCodec.java',
     'http/JsonHttpResponseCodec.java',
     'internal/ApacheHttpClient.java',
-    'internal/CircularOutputStream.java',
     'internal/HttpClientFactory.java',
     'internal/JsonToWebElementConverter.java',
     'internal/WebElementToJsonConverter.java',

diff --git a/java/client/src/org/openqa/selenium/remote/build.desc b/java/client/src/org/openqa/selenium/remote/build.desc
@@ -100,7 +100,6 @@ java_library(name = "remote",
     "http/JsonHttpCommandCodec.java",
     "http/JsonHttpResponseCodec.java",
     "internal/ApacheHttpClient.java",
-    "internal/CircularOutputStream.java",
     "internal/JsonToWebElementConverter.java",
     "internal/HttpClientFactory.java",
     "internal/WebElementToJsonConverter.java",

diff --git a/java/client/test/org/openqa/selenium/firefox/internal/StreamsTest.java b/java/client/test/org/openqa/selenium/firefox/internal/StreamsTest.java
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.openqa.selenium.remote.internal.CircularOutputStream;
+import org.openqa.selenium.io.CircularOutputStream;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/java/client/test/org/openqa/selenium/remote/internal/CircularOutputStreamTest.java b/java/client/test/org/openqa/selenium/remote/internal/CircularOutputStreamTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.openqa.selenium.io.CircularOutputStream;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;