From 568b521fae65c67a2b3670bf1c33de8ea19899cd Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 25 Jul 2014 16:38:49 +0100
Subject: [PATCH] Port to latest guava
---
pom.xml | 2 +-
.../java/io/tesla/aether/connector/AetherRepositoryConnector.java | 4 ++--
.../aether/connector/test/suite/ResumeWithClientFailureTest.java | 7 ++++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 31b6101..7f88c1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>14.0.1</version>
+ <version>17.0</version>
</dependency>
<!-- JSR330 -->
<dependency>
diff --git a/src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java b/src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java
index d18f730..07c8d80 100644
--- a/src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java
+++ b/src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java
@@ -89,7 +89,7 @@ import org.eclipse.aether.util.repository.layout.RepositoryLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.io.ByteStreams;
+import com.google.common.io.ByteSource;
import com.google.common.io.Closer;
class AetherRepositoryConnector implements RepositoryConnector {
@@ -790,7 +790,7 @@ class AetherRepositoryConnector implements RepositoryConnector {
Response response = aetherClient.put(uri + ext, new RetryableSource() {
@Override
public void copyTo(OutputStream os) throws IOException {
- ByteStreams.asByteSource(bytes).copyTo(os);
+ ByteSource.wrap(bytes).copyTo(os);
}
@Override
public long length() {
diff --git a/src/test/java/io/tesla/aether/connector/test/suite/ResumeWithClientFailureTest.java b/src/test/java/io/tesla/aether/connector/test/suite/ResumeWithClientFailureTest.java
index 840ff41..8f56781 100644
--- a/src/test/java/io/tesla/aether/connector/test/suite/ResumeWithClientFailureTest.java
+++ b/src/test/java/io/tesla/aether/connector/test/suite/ResumeWithClientFailureTest.java
@@ -26,7 +26,7 @@ import org.eclipse.aether.spi.connector.RepositoryConnector;
import org.eclipse.aether.transfer.TransferEvent;
import org.eclipse.aether.transfer.TransferEvent.EventType;
-import com.google.common.io.Closeables;
+import com.google.common.io.Closer;
public class ResumeWithClientFailureTest extends AetherTestCase {
@@ -128,14 +128,15 @@ public class ResumeWithClientFailureTest extends AetherTestCase {
}
public static void write(byte[] pattern, File file) throws IOException {
+ Closer closer = Closer.create();
file.deleteOnExit();
file.getParentFile().mkdirs();
OutputStream out = null;
try {
- out = new BufferedOutputStream(new FileOutputStream(file));
+ out = closer.register(new BufferedOutputStream(new FileOutputStream(file)));
out.write(pattern);
} finally {
- Closeables.closeQuietly(out);
+ closer.close();
}
}
}
--
1.9.3