This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch plexus1 in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit 3b00acf90a491729a544bbf68155b5f5906b24b0 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sat Dec 13 23:26:41 2025 +0100 Drop dependency to plexus-utils for wagon-provider-api and code cleanup --- wagon-provider-api/pom.xml | 4 -- .../java/org/apache/maven/wagon/AbstractWagon.java | 56 ++++++----------- .../java/org/apache/maven/wagon/StreamWagon.java | 1 + .../org/apache/maven/wagon/StreamingWagon.java | 1 + .../java/org/apache/maven/wagon/WagonUtils.java | 21 +++---- .../apache/maven/wagon/repository/Repository.java | 4 +- .../org/apache/maven/wagon/AbstractWagonTest.java | 72 ++++++++-------------- .../maven/wagon/LazyFileOutputStreamTest.java | 19 +++--- .../org/apache/maven/wagon/StreamWagonTest.java | 55 +++++++++-------- .../maven/wagon/events/SessionEventTest.java | 2 +- .../maven/wagon/events/TransferEventTest.java | 2 +- .../wagon/observers/ChecksumObserverTest.java | 2 +- .../maven/wagon/repository/RepositoryTest.java | 12 +--- 13 files changed, 103 insertions(+), 148 deletions(-) diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml index 80b7f595..61da2286 100644 --- a/wagon-provider-api/pom.xml +++ b/wagon-provider-api/pom.xml @@ -31,10 +31,6 @@ under the License. <description>Maven Wagon API that defines the contract between different Wagon implementations</description> <dependencies> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java index 10a5acaa..9835c317 100644 --- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java +++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java @@ -28,6 +28,7 @@ import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; +import java.nio.file.Files; import java.util.List; import org.apache.maven.wagon.authentication.AuthenticationException; @@ -45,7 +46,6 @@ import org.apache.maven.wagon.repository.Repository; import org.apache.maven.wagon.repository.RepositoryPermissions; import org.apache.maven.wagon.resource.Resource; -import org.codehaus.plexus.util.IOUtil; import static java.lang.Math.max; import static java.lang.Math.min; @@ -124,14 +124,11 @@ public AuthenticationInfo getAuthenticationInfo() { // Connection // ---------------------------------------------------------------------- + @Deprecated public void openConnection() throws ConnectionException, AuthenticationException { try { openConnectionInternal(); - } catch (ConnectionException e) { - fireSessionConnectionRefused(); - - throw e; - } catch (AuthenticationException e) { + } catch (ConnectionException | AuthenticationException e) { fireSessionConnectionRefused(); throw e; @@ -277,12 +274,8 @@ protected void getTransfer(Resource resource, File destination, InputStream inpu fireGetStarted(resource, destination); - OutputStream output = null; - try { - output = new LazyFileOutputStream(destination); + try (OutputStream output = new LazyFileOutputStream(destination)) { getTransfer(resource, output, input, closeInput, maxSize); - output.close(); - output = null; } catch (final IOException e) { if (destination.exists()) { boolean deleted = destination.delete(); @@ -306,8 +299,6 @@ protected void getTransfer(Resource resource, File destination, InputStream inpu } } throw e; - } finally { - IOUtil.close(output); } fireGetCompleted(resource, destination); @@ -341,7 +332,12 @@ protected void getTransfer( throw new TransferFailedException(msg, e); } finally { if (closeInput) { - IOUtil.close(input); + if (input != null) { + try { + input.close(); + } catch (IOException ignore) { + } + } } cleanupGetTransfer(resource); @@ -376,25 +372,14 @@ protected void putTransfer(Resource resource, File source, OutputStream output, */ protected void transfer(Resource resource, File source, OutputStream output, boolean closeOutput) throws TransferFailedException, AuthorizationException, ResourceDoesNotExistException { - InputStream input = null; - - try { - input = new FileInputStream(source); - + try (InputStream input = new FileInputStream(source)) { putTransfer(resource, input, output, closeOutput); - - input.close(); - input = null; } catch (FileNotFoundException e) { fireTransferError(resource, e, TransferEvent.REQUEST_PUT); - throw new TransferFailedException("Specified source file does not exist: " + source, e); } catch (final IOException e) { fireTransferError(resource, e, TransferEvent.REQUEST_PUT); - throw new TransferFailedException("Failure transferring " + source, e); - } finally { - IOUtil.close(input); } } @@ -424,9 +409,13 @@ protected void putTransfer(Resource resource, InputStream input, OutputStream ou throw new TransferFailedException(msg, e); } finally { if (closeOutput) { - IOUtil.close(output); + if (output != null) { + try { + output.close(); + } catch (IOException ignore) { + } + } } - cleanupPutTransfer(resource); } } @@ -779,10 +768,7 @@ protected void postProcessListeners(Resource resource, File source, int requestT transferEvent.setTimestamp(System.currentTimeMillis()); transferEvent.setLocalFile(source); - InputStream input = null; - try { - input = new FileInputStream(source); - + try (InputStream input = Files.newInputStream(source.toPath())) { while (true) { int n = input.read(buffer); @@ -792,15 +778,9 @@ protected void postProcessListeners(Resource resource, File source, int requestT fireTransferProgress(transferEvent, buffer, n); } - - input.close(); - input = null; } catch (IOException e) { fireTransferError(resource, e, requestType); - throw new TransferFailedException("Failed to post-process the source file", e); - } finally { - IOUtil.close(input); } } diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java index 071171ad..c58ebb17 100644 --- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java +++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java @@ -210,6 +210,7 @@ public void getToStream(String resourceName, OutputStream stream) getIfNewerToStream(resourceName, stream, 0); } + @Deprecated public void putFromStream(InputStream stream, String destination) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { Resource resource = new Resource(destination); diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java index 3ddbdbfa..d4ef7e78 100644 --- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java +++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java @@ -69,6 +69,7 @@ boolean getIfNewerToStream(String resourceName, OutputStream stream, long timest * @throws ResourceDoesNotExistException * @throws AuthorizationException */ + @Deprecated void putFromStream(InputStream stream, String destination) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException; diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java index 85ae8855..2bc7cb40 100644 --- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java +++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java @@ -20,16 +20,17 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.LinkedList; import org.apache.maven.wagon.authorization.AuthorizationException; -import org.codehaus.plexus.util.FileUtils; /** * @author <a href="mailto:[email protected]";>Michal Maczka</a> * * @deprecated */ +@Deprecated public final class WagonUtils { private WagonUtils() {} @@ -37,17 +38,13 @@ public static String toString(String resource, Wagon wagon) throws IOException, TransferFailedException, ResourceDoesNotExistException, AuthorizationException { File file = null; - try { file = File.createTempFile("wagon", "tmp"); - wagon.get(resource, file); - - return FileUtils.fileRead(file); + return new String(Files.readAllBytes(file.toPath())); } finally { if (file != null) { boolean deleted = file.delete(); - if (!deleted) { file.deleteOnExit(); } @@ -58,8 +55,7 @@ public static String toString(String resource, Wagon wagon) public static void putDirectory(File dir, Wagon wagon, boolean includeBasdir) throws ResourceDoesNotExistException, TransferFailedException, AuthorizationException { - LinkedList queue = new LinkedList(); - + LinkedList<String> queue = new LinkedList<>(); if (includeBasdir) { queue.add(dir.getName()); } else { @@ -67,18 +63,17 @@ public static void putDirectory(File dir, Wagon wagon, boolean includeBasdir) } while (!queue.isEmpty()) { - String path = (String) queue.removeFirst(); + String path = queue.removeFirst(); File currentDir = new File(dir, path); File[] files = currentDir.listFiles(); - for (int i = 0; i < files.length; i++) { - File file = files[i]; - + assert files != null; + for (File file : files) { String resource; - if (path.length() > 0) { + if (!path.isEmpty()) { resource = path + "/" + file.getName(); } else { resource = file.getName(); diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java index 8111a13a..d8675d60 100644 --- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java +++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java @@ -23,7 +23,6 @@ import org.apache.maven.wagon.PathUtils; import org.apache.maven.wagon.WagonConstants; -import org.codehaus.plexus.util.StringUtils; /** * This class is an abstraction of the location from/to resources @@ -208,7 +207,8 @@ public String toString() { sb.append("Repository["); - if (StringUtils.isNotEmpty(getName())) { + String str = getName(); + if (str != null && !str.isEmpty()) { sb.append(getName()).append("|"); } diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java index 5ae69460..b1c70091 100644 --- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java +++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java @@ -21,8 +21,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Paths; import junit.framework.TestCase; import org.apache.maven.wagon.authentication.AuthenticationException; @@ -37,8 +37,6 @@ import org.apache.maven.wagon.repository.Repository; import org.apache.maven.wagon.repository.RepositoryPermissions; import org.apache.maven.wagon.resource.Resource; -import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.IOUtil; import org.easymock.IAnswer; import static org.easymock.EasyMock.*; @@ -132,7 +130,7 @@ public void testTransferListenerRegistration() { } public void testNoProxyConfiguration() throws ConnectionException, AuthenticationException { - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); wagon.connect(repository); assertNull(wagon.getProxyInfo()); assertNull(wagon.getProxyInfo("http", "www.example.com")); @@ -143,7 +141,7 @@ public void testNoProxyConfiguration() throws ConnectionException, Authenticatio } public void testNullProxyConfiguration() throws ConnectionException, AuthenticationException { - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); wagon.connect(repository, (ProxyInfo) null); assertNull(wagon.getProxyInfo()); assertNull(wagon.getProxyInfo("http", "www.example.com")); @@ -173,7 +171,7 @@ public void testLegacyProxyConfiguration() throws ConnectionException, Authentic ProxyInfo proxyInfo = new ProxyInfo(); proxyInfo.setType("http"); - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); wagon.connect(repository, proxyInfo); assertEquals(proxyInfo, wagon.getProxyInfo()); assertEquals(proxyInfo, wagon.getProxyInfo("http", "www.example.com")); @@ -189,18 +187,16 @@ public void testProxyConfiguration() throws ConnectionException, AuthenticationE final ProxyInfo socksProxyInfo = new ProxyInfo(); socksProxyInfo.setType("http"); - ProxyInfoProvider proxyInfoProvider = new ProxyInfoProvider() { - public ProxyInfo getProxyInfo(String protocol) { - if ("http".equals(protocol) || "dav".equals(protocol)) { - return httpProxyInfo; - } else if ("scp".equals(protocol)) { - return socksProxyInfo; - } - return null; + ProxyInfoProvider proxyInfoProvider = protocol -> { + if ("http".equals(protocol) || "dav".equals(protocol)) { + return httpProxyInfo; + } else if ("scp".equals(protocol)) { + return socksProxyInfo; } + return null; }; - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); wagon.connect(repository, proxyInfoProvider); assertNull(wagon.getProxyInfo()); assertEquals(httpProxyInfo, wagon.getProxyInfo("http", "www.example.com")); @@ -210,7 +206,7 @@ public ProxyInfo getProxyInfo(String protocol) { } public void testSessionOpenEvents() throws Exception { - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); sessionListener.sessionOpening(anyObject(SessionEvent.class)); sessionListener.sessionOpened(anyObject(SessionEvent.class)); @@ -247,7 +243,7 @@ public void testSessionConnectionRefusedEventAuthenticationException() throws Ex private void runTestSessionConnectionRefusedEvent(final WagonException exception) throws ConnectionException, AuthenticationException { - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); sessionListener.sessionOpening(anyObject(SessionEvent.class)); sessionListener.sessionConnectionRefused(anyObject(SessionEvent.class)); @@ -286,8 +282,6 @@ public void testSessionCloseEvents() throws Exception { } public void testSessionCloseRefusedEventConnectionException() throws Exception { - Repository repository = new Repository(); - sessionListener.sessionDisconnecting(anyObject(SessionEvent.class)); sessionListener.sessionError(anyObject(SessionEvent.class)); replay(sessionListener); @@ -322,7 +316,7 @@ public void testGetTransferEvents() throws Exception { wagon.fireTransferDebug("fetch debug message"); - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); wagon.connect(repository); wagon.get(artifact, destination); @@ -339,7 +333,7 @@ public void testGetError() throws Exception { replay(transferListener); try { - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); WagonMock wagon = new WagonMock(true); @@ -369,7 +363,7 @@ public void testPutTransferEvents() wagon.fireTransferDebug("deploy debug message"); - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); wagon.connect(repository); @@ -379,29 +373,17 @@ public void testPutTransferEvents() } public void testStreamShutdown() { - IOUtil.close((InputStream) null); - - IOUtil.close((OutputStream) null); - - InputStreamMock inputStream = new InputStreamMock(); - - assertFalse(inputStream.isClosed()); - - IOUtil.close(inputStream); - - assertTrue(inputStream.isClosed()); - - OutputStreamMock outputStream = new OutputStreamMock(); - - assertFalse(outputStream.isClosed()); - - IOUtil.close(outputStream); + try (InputStreamMock inputStream = new InputStreamMock()) { + assertFalse(inputStream.isClosed()); + } - assertTrue(outputStream.isClosed()); + try (OutputStreamMock outputStream = new OutputStreamMock()) { + assertFalse(outputStream.isClosed()); + } } public void testRepositoryPermissionsOverride() throws ConnectionException, AuthenticationException { - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); RepositoryPermissions original = new RepositoryPermissions(); original.setFileMode("664"); @@ -454,7 +436,7 @@ public void testPostProcessListeners() throws TransferFailedException, IOExcepti File tempFile = File.createTempFile("wagon", "tmp"); tempFile.deleteOnExit(); String content = "content"; - FileUtils.fileWrite(tempFile.getAbsolutePath(), content); + Files.write(Paths.get(tempFile.getAbsolutePath()), content.getBytes()); Resource resource = new Resource("resource"); @@ -478,11 +460,11 @@ public void testPostProcessListeners() throws TransferFailedException, IOExcepti } static final class ProgressAnswer implements IAnswer { - private ByteArrayOutputStream baos = new ByteArrayOutputStream(); + private final ByteArrayOutputStream baos = new ByteArrayOutputStream(); private int size; - public Object answer() throws Throwable { + public Object answer() { byte[] buffer = (byte[]) getCurrentArguments()[1]; int length = (Integer) getCurrentArguments()[2]; baos.write(buffer, 0, length); diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/LazyFileOutputStreamTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/LazyFileOutputStreamTest.java index d630f035..21cc3b0d 100644 --- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/LazyFileOutputStreamTest.java +++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/LazyFileOutputStreamTest.java @@ -19,18 +19,23 @@ package org.apache.maven.wagon; import java.io.File; +import java.nio.file.Files; -import junit.framework.TestCase; -import org.codehaus.plexus.util.FileUtils; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author <a href="mailto:[email protected]";>Michal Maczka</a> * */ -public class LazyFileOutputStreamTest extends TestCase { +public class LazyFileOutputStreamTest { - public void testFileCreation() throws Exception { - File file = File.createTempFile(getName(), null); + @Test + public void fileCreation() throws Exception { + File file = File.createTempFile("LazyFileOutputStreamTest", null); file.delete(); @@ -48,8 +53,6 @@ public void testFileCreation() throws Exception { assertTrue(file.exists()); - String actual = FileUtils.fileRead(file); - - assertEquals(expected, actual); + assertEquals(expected, new String(Files.readAllBytes(file.toPath()))); } } diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java index b4b73572..139e4ddb 100644 --- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java +++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java @@ -18,8 +18,14 @@ */ package org.apache.maven.wagon; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Paths; import java.text.SimpleDateFormat; import junit.framework.TestCase; @@ -29,9 +35,6 @@ import org.apache.maven.wagon.events.TransferListener; import org.apache.maven.wagon.repository.Repository; import org.apache.maven.wagon.resource.Resource; -import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.StringInputStream; -import org.codehaus.plexus.util.StringOutputStream; import static org.easymock.EasyMock.*; @@ -47,7 +50,7 @@ public void fillOutputData(OutputData outputData) throws TransferFailedException protected void openConnectionInternal() throws ConnectionException, AuthenticationException {} } - private Repository repository = new Repository("id", "url"); + private final Repository repository = new Repository("id", "url"); public void testNullInputStream() throws Exception { StreamingWagon wagon = new TestWagon() { @@ -65,8 +68,8 @@ public void fillInputData(InputData inputData) { wagon.connect(repository); wagon.addTransferListener(listener); - try { - wagon.getToStream("resource", new StringOutputStream()); + try (OutputStream os = new ByteArrayOutputStream()) { + wagon.getToStream("resource", os); fail(); } catch (TransferFailedException e) { assertTrue(true); @@ -93,8 +96,8 @@ public void fillOutputData(OutputData inputData) { wagon.connect(repository); wagon.addTransferListener(listener); - try { - wagon.putFromStream(new StringInputStream(""), "resource"); + try (InputStream is = new ByteArrayInputStream("".getBytes())) { + wagon.putFromStream(is, "resource"); fail(); } catch (TransferFailedException e) { assertTrue(true); @@ -117,7 +120,7 @@ public void testTransferFailedExceptionOnInput() throws Exception { public void testTransferFailedExceptionOnOutput() throws Exception { StreamingWagon wagon = new TestWagon() { public void fillOutputData(OutputData inputData) throws TransferFailedException { - throw (TransferFailedException) new TransferFailedException(""); + throw new TransferFailedException(""); } }; @@ -130,8 +133,9 @@ public void fillOutputData(OutputData inputData) throws TransferFailedException wagon.connect(repository); wagon.addTransferListener(listener); - try { - wagon.putFromStream(new StringInputStream(""), "resource"); + + try (InputStream is = new ByteArrayInputStream("".getBytes())) { + wagon.putFromStream(is, "resource"); fail(); } catch (TransferFailedException e) { assertTrue(true); @@ -187,7 +191,7 @@ public void fillInputData(InputData inputData) wagon.connect(repository); wagon.addTransferListener(listener); try { - wagon.getToStream("resource", new StringOutputStream()); + wagon.getToStream("resource", new ByteArrayOutputStream()); fail(); } finally { wagon.disconnect(); @@ -220,7 +224,7 @@ private boolean runTestGetIfNewer(final long resourceTime, long comparisonTime) ResourceDoesNotExistException, AuthorizationException { StreamingWagon wagon = new TestWagon() { public void fillInputData(InputData inputData) { - inputData.setInputStream(new StringInputStream("")); + inputData.setInputStream(new ByteArrayInputStream("".getBytes())); inputData.getResource().setLastModified(resourceTime); } }; @@ -243,14 +247,14 @@ public void testGetToStream() throws Exception { new SimpleDateFormat("yyyy-MM-dd").parse("2008-01-01").getTime(); StreamingWagon wagon = new TestWagon() { public void fillInputData(InputData inputData) { - inputData.setInputStream(new StringInputStream(content)); + inputData.setInputStream(new ByteArrayInputStream(content.getBytes())); inputData.getResource().setLastModified(comparisonTime); } }; wagon.connect(repository); try { - StringOutputStream out = new StringOutputStream(); + OutputStream out = new ByteArrayOutputStream(); wagon.getToStream("resource", out); assertEquals(content, out.toString()); } finally { @@ -264,7 +268,7 @@ public void testGet() throws Exception { new SimpleDateFormat("yyyy-MM-dd").parse("2008-01-01").getTime(); StreamingWagon wagon = new TestWagon() { public void fillInputData(InputData inputData) { - inputData.setInputStream(new StringInputStream(content)); + inputData.setInputStream(new ByteArrayInputStream(content.getBytes())); inputData.getResource().setLastModified(comparisonTime); } }; @@ -275,7 +279,7 @@ public void fillInputData(InputData inputData) { wagon.connect(repository); try { wagon.get("resource", tempFile); - assertEquals(content, FileUtils.fileRead(tempFile)); + assertEquals(content, new String(Files.readAllBytes(tempFile.toPath()))); } finally { wagon.disconnect(); tempFile.delete(); @@ -307,14 +311,14 @@ private boolean runTestGetIfNewerToStream(final long resourceTime, long comparis ResourceDoesNotExistException, AuthorizationException { StreamingWagon wagon = new TestWagon() { public void fillInputData(InputData inputData) { - inputData.setInputStream(new StringInputStream("")); + inputData.setInputStream(new ByteArrayInputStream("".getBytes())); inputData.getResource().setLastModified(resourceTime); } }; wagon.connect(repository); try { - return wagon.getIfNewerToStream("resource", new StringOutputStream(), comparisonTime); + return wagon.getIfNewerToStream("resource", new ByteArrayOutputStream(), comparisonTime); } finally { wagon.disconnect(); } @@ -323,7 +327,7 @@ public void fillInputData(InputData inputData) { public void testPutFromStream() throws Exception { final String content = "the content to return"; - final StringOutputStream out = new StringOutputStream(); + OutputStream out = new ByteArrayOutputStream(); StreamingWagon wagon = new TestWagon() { public void fillOutputData(OutputData outputData) { assertEquals("resource", outputData.getResource().getName()); @@ -335,7 +339,7 @@ public void fillOutputData(OutputData outputData) { wagon.connect(repository); try { - wagon.putFromStream(new StringInputStream(content), "resource"); + wagon.putFromStream(new ByteArrayInputStream(content.getBytes()), "resource"); assertEquals(content, out.toString()); } finally { wagon.disconnect(); @@ -346,7 +350,7 @@ public void testPutFromStreamWithResourceInformation() throws Exception { final String content = "the content to return"; final long lastModified = System.currentTimeMillis(); - final StringOutputStream out = new StringOutputStream(); + OutputStream out = new ByteArrayOutputStream(); StreamingWagon wagon = new TestWagon() { public void fillOutputData(OutputData outputData) { assertEquals("resource", outputData.getResource().getName()); @@ -358,7 +362,8 @@ public void fillOutputData(OutputData outputData) { wagon.connect(repository); try { - wagon.putFromStream(new StringInputStream(content), "resource", content.length(), lastModified); + wagon.putFromStream( + new ByteArrayInputStream(content.getBytes()), "resource", content.length(), lastModified); assertEquals(content, out.toString()); } finally { wagon.disconnect(); @@ -369,10 +374,10 @@ public void testPut() throws Exception { final String content = "the content to return"; final File tempFile = File.createTempFile("wagon", "tmp"); - FileUtils.fileWrite(tempFile.getAbsolutePath(), content); + Files.write(Paths.get(tempFile.getAbsolutePath()), content.getBytes()); tempFile.deleteOnExit(); - final StringOutputStream out = new StringOutputStream(); + OutputStream out = new ByteArrayOutputStream(); Wagon wagon = new TestWagon() { public void fillOutputData(OutputData outputData) { assertEquals("resource", outputData.getResource().getName()); diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/SessionEventTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/SessionEventTest.java index 16c95bcf..d28cdf71 100644 --- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/SessionEventTest.java +++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/SessionEventTest.java @@ -37,7 +37,7 @@ public class SessionEventTest extends TestCase { public void testSessionEventProperties() throws ConnectionException, AuthenticationException { final Wagon wagon = EasyMock.createMock(Wagon.class); - final Repository repo = new Repository(); + final Repository repo = new Repository("fake", "http://fake";); wagon.connect(repo); diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventTest.java index e53cfc53..c4c1212d 100644 --- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventTest.java +++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventTest.java @@ -38,7 +38,7 @@ public class TransferEventTest extends TestCase { public void testTransferEventProperties() throws ConnectionException, AuthenticationException { final Wagon wagon = EasyMock.createMock(Wagon.class); - final Repository repo = new Repository(); + final Repository repo = new Repository("fake", "http://fake";); wagon.connect(repo); diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java index 911ad1c3..68f73ef4 100644 --- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java +++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java @@ -41,7 +41,7 @@ public void setUp() throws Exception { wagon = new WagonMock(true); - Repository repository = new Repository(); + Repository repository = new Repository("fake", "http://fake";); wagon.connect(repository); } diff --git a/wagon-provider-api/src/test/java/org/apache/maven/wagon/repository/RepositoryTest.java b/wagon-provider-api/src/test/java/org/apache/maven/wagon/repository/RepositoryTest.java index 4f6beba3..5a1fc399 100644 --- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/repository/RepositoryTest.java +++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/repository/RepositoryTest.java @@ -30,16 +30,8 @@ public RepositoryTest(final String name) { super(name); } - public void setUp() throws Exception { - super.setUp(); - } - - public void tearDown() throws Exception { - super.tearDown(); - } - - public void testRepositoryProperties() throws Exception { - Repository repository = new Repository(); + public void testRepositoryProperties() { + Repository repository = new Repository("fake", "http://fake";); repository.setBasedir("directory");
