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