You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2015/08/18 22:04:50 UTC
[3/6] metamodel git commit: METAMODEL-173: Updated SpringResource as
well
METAMODEL-173: Updated SpringResource as well
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/f3e1783c
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/f3e1783c
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/f3e1783c
Branch: refs/heads/master
Commit: f3e1783c9e141ad37ab92a9ed53718ad1be60531
Parents: d1966b3
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 18 10:19:14 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 18 10:19:14 2015 +0200
----------------------------------------------------------------------
.../apache/metamodel/spring/SpringResource.java | 46 +++++---------------
1 file changed, 10 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/f3e1783c/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java b/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
index 4400859..3ef84c2 100644
--- a/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
+++ b/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
@@ -22,9 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.metamodel.util.Action;
-import org.apache.metamodel.util.FileHelper;
-import org.apache.metamodel.util.Func;
+import org.apache.metamodel.util.AbstractResource;
import org.apache.metamodel.util.Resource;
import org.apache.metamodel.util.ResourceException;
import org.slf4j.Logger;
@@ -34,7 +32,7 @@ import org.slf4j.LoggerFactory;
* A {@link Resource} implementation based on spring's similar
* {@link org.springframework.core.io.Resource} concept.
*/
-public class SpringResource implements Resource {
+public class SpringResource extends AbstractResource implements Resource {
private static final Logger logger = LoggerFactory.getLogger(SpringResource.class);
@@ -43,12 +41,17 @@ public class SpringResource implements Resource {
public SpringResource(org.springframework.core.io.Resource resource) {
_resource = resource;
}
-
+
@Override
- public void append(Action<OutputStream> arg0) throws ResourceException {
+ public OutputStream append() throws ResourceException {
throw new UnsupportedOperationException();
}
-
+
+ @Override
+ public OutputStream write() throws ResourceException {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public long getLastModified() {
try {
@@ -101,35 +104,6 @@ public class SpringResource implements Resource {
}
}
- @Override
- public void read(Action<InputStream> action) throws ResourceException {
- final InputStream in = read();
- try {
- action.run(in);
- } catch (Exception e) {
- throw new ResourceException(this, "Error occurred in read callback", e);
- } finally {
- FileHelper.safeClose(in);
- }
- }
-
- @Override
- public <E> E read(Func<InputStream, E> func) throws ResourceException {
- final InputStream in = read();
- try {
- return func.eval(in);
- } catch (Exception e) {
- throw new ResourceException(this, "Error occurred in read callback", e);
- } finally {
- FileHelper.safeClose(in);
- }
- }
-
- @Override
- public void write(Action<OutputStream> arg0) throws ResourceException {
- throw new UnsupportedOperationException();
- }
-
/**
* Gets the underlying spring {@link org.springframework.core.io.Resource}
* object.