[Core] Move URLOutputStream to formatters package

The URLOutputStream is only used by formatters. Moving it to the
formatters package allows the visibility of the stream to be reduced
tidying up the effectively public API just a bit more.

core/src/main/java/cucumber/runtime/formatter/HTMLFormatter.java

@@ -16,7 +16,6 @@
 import cucumber.api.event.WriteEvent;
 import cucumber.api.formatter.NiceAppendable;
 import cucumber.runtime.CucumberException;
-import cucumber.runtime.io.URLOutputStream;
 import gherkin.ast.Background;
 import gherkin.ast.DataTable;
 import gherkin.ast.DocString;
@@ -120,6 +119,7 @@ public void receive(TestRunFinished event) {
         }
     };
 
+    @SuppressWarnings("WeakerAccess") // Used by PluginFactory
     public HTMLFormatter(URL htmlReportDir) {
         this(htmlReportDir, createJsOut(htmlReportDir));
     }

core/src/main/java/cucumber/runtime/formatter/JUnitFormatter.java

@@ -13,8 +13,6 @@
 import cucumber.api.formatter.StrictAware;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.Utils;
-import cucumber.runtime.io.URLOutputStream;
-import cucumber.runtime.io.UTF8OutputStreamWriter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -78,6 +76,7 @@ public void receive(TestRunFinished event) {
         }
     };
 
+    @SuppressWarnings("WeakerAccess") // Used by plugin factory
     public JUnitFormatter(URL out) throws IOException {
         this.out = new UTF8OutputStreamWriter(new URLOutputStream(out));
         TestCase.treatConditionallySkippedAsFailure = false;

core/src/main/java/cucumber/runtime/formatter/PluginFactory.java

@@ -6,8 +6,6 @@
 import cucumber.api.event.ConcurrentEventListener;
 import cucumber.api.event.EventListener;
 import cucumber.runtime.CucumberException;
-import cucumber.runtime.io.URLOutputStream;
-import cucumber.runtime.io.UTF8OutputStreamWriter;
 
 import java.io.File;
 import java.io.IOException;

core/src/main/java/cucumber/runtime/formatter/TestNGFormatter.java

@@ -13,8 +13,6 @@
 import cucumber.api.event.TestStepFinished;
 import cucumber.api.formatter.StrictAware;
 import cucumber.runtime.CucumberException;
-import cucumber.runtime.io.URLOutputStream;
-import cucumber.runtime.io.UTF8OutputStreamWriter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;

core/src/main/java/cucumber/runtime/formatter/TimelineFormatter.java

@@ -11,7 +11,6 @@
 import cucumber.api.event.TestSourceRead;
 import cucumber.api.formatter.NiceAppendable;
 import cucumber.runtime.CucumberException;
-import cucumber.runtime.io.URLOutputStream;
 import gherkin.deps.com.google.gson.Gson;
 import gherkin.deps.com.google.gson.GsonBuilder;
 import gherkin.deps.com.google.gson.annotations.SerializedName;

core/src/main/java/cucumber/runtime/io/URLOutputStream.java → core/src/main/java/cucumber/runtime/formatter/URLOutputStream.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.io;
+package cucumber.runtime.formatter;
 
 import gherkin.deps.com.google.gson.Gson;
 import cucumber.util.FixJava;
@@ -13,18 +13,18 @@
  * A stream that can write to both file and http URLs. If it's a file URL, writes with a {@link java.io.FileOutputStream},
  * if it's a http or https URL, writes with a HTTP PUT (by default) or with the specified method.
  */
-public class URLOutputStream extends OutputStream {
+class URLOutputStream extends OutputStream {
     private final URL url;
     private final String method;
     private final int expectedResponseCode;
     private final OutputStream out;
     private final HttpURLConnection urlConnection;
 
-    public URLOutputStream(URL url) throws IOException {
+    URLOutputStream(URL url) throws IOException {
         this(url, "PUT", Collections.<String, String>emptyMap(), 200);
     }
 
-    public URLOutputStream(URL url, String method, Map<String, String> headers, int expectedResponseCode) throws IOException {
+    private URLOutputStream(URL url, String method, Map<String, String> headers, int expectedResponseCode) throws IOException {
         this.url = url;
         this.method = method;
         this.expectedResponseCode = expectedResponseCode;

core/src/main/java/cucumber/runtime/formatter/UTF8OutputStreamWriter.java

@@ -0,0 +1,11 @@
+package cucumber.runtime.formatter;
+
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+
+class UTF8OutputStreamWriter extends OutputStreamWriter {
+    UTF8OutputStreamWriter(OutputStream out) {
+        super(out, Charset.forName("UTF-8"));
+    }
+}

core/src/test/java/cucumber/runtime/formatter/PluginFactoryTest.java

@@ -9,7 +9,6 @@
 import cucumber.runner.TimeServiceStub;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.Utils;
-import cucumber.runtime.io.UTF8OutputStreamWriter;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;

core/src/test/java/cucumber/runtime/io/URLOutputStreamTest.java → core/src/test/java/cucumber/runtime/formatter/URLOutputStreamTest.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.io;
+package cucumber.runtime.formatter;
 
 import cucumber.runtime.Utils;
 import cucumber.util.FixJava;