You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/02/10 22:47:52 UTC
[02/10] isis git commit: ISIS-1288: file changes for upgrade to Guava
ISIS-1288: file changes for upgrade to Guava
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cf8c2d1e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cf8c2d1e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cf8c2d1e
Branch: refs/heads/master
Commit: cf8c2d1e8dccf3882cfa41e0182f2f6827a1fb89
Parents: 12f9dfa
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:15:35 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:15:35 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/isis/applib/value/Blob.java | 10 ++--------
.../src/main/java/org/apache/isis/applib/value/Clob.java | 10 ++--------
.../apache/isis/core/commons/lang/ClassExtensions.java | 7 +++----
.../server/resources/VersionReprRenderer.java | 2 +-
4 files changed, 8 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cf8c2d1e/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java b/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
index 73700f8..7403c4d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
@@ -26,8 +26,7 @@ import java.io.Serializable;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.OutputSupplier;
+import com.google.common.io.ByteSource;
public final class Blob implements NamedWithMimeType, Serializable {
@@ -91,12 +90,7 @@ public final class Blob implements NamedWithMimeType, Serializable {
}
public void writeBytesTo(final OutputStream os) throws IOException {
- ByteStreams.write(bytes, new OutputSupplier<OutputStream>() {
- @Override
- public OutputStream getOutput() throws IOException {
- return os;
- }
- });
+ ByteSource.wrap(bytes).copyTo(os);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/cf8c2d1e/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java b/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
index 275ee93..41b7b7e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
@@ -26,8 +26,7 @@ import java.io.Writer;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
-import com.google.common.io.CharStreams;
-import com.google.common.io.OutputSupplier;
+import com.google.common.io.CharSource;
public final class Clob implements NamedWithMimeType, Serializable {
@@ -93,12 +92,7 @@ public final class Clob implements NamedWithMimeType, Serializable {
}
public void writeCharsTo(final Writer wr) throws IOException {
- CharStreams.write(chars, new OutputSupplier<Writer>() {
- @Override
- public Writer getOutput() throws IOException {
- return wr;
- }
- });
+ CharSource.wrap(chars).copyTo(wr);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/cf8c2d1e/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
index 3f4a3b9..5f6983d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.commons.lang;
import java.io.IOException;
-import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -29,7 +28,7 @@ import java.net.URL;
import java.nio.charset.Charset;
import java.util.Properties;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import com.google.common.io.Resources;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -156,9 +155,9 @@ public final class ClassExtensions {
public static Properties resourceProperties(final Class<?> extendee, final String suffix) {
try {
final URL url = Resources.getResource(extendee, extendee.getSimpleName()+suffix);
- final InputSupplier<InputStream> inputSupplier = com.google.common.io.Resources.newInputStreamSupplier(url);
+ final ByteSource byteSource = Resources.asByteSource(url);
final Properties properties = new Properties();
- properties.load(inputSupplier.getInput());
+ properties.load(byteSource.openStream());
return properties;
} catch (Exception e) {
return null;
http://git-wip-us.apache.org/repos/asf/isis/blob/cf8c2d1e/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
index 0d1de1d..7668d95 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
@@ -90,7 +90,7 @@ public class VersionReprRenderer extends ReprRendererAbstract<VersionReprRendere
try {
URL resource = Resources.getResource(META_INF_POM_PROPERTIES);
Properties p = new Properties();
- p.load(Resources.newReaderSupplier(resource, Charset.defaultCharset()).getInput());
+ p.load(Resources.asCharSource(resource, Charset.defaultCharset()).openStream());
return p.getProperty("version");
} catch (final Exception ex) {
return "UNKNOWN";