svn commit: r1577243 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java

[mduerig]

Author: mduerig
Date: Thu Mar 13 16:55:05 2014
New Revision: 1577243

URL: http://svn.apache.org/r1577243
Log:
OAK-1540: Switch Jackrabbit dependency to 2.8-SNAPSHOT and back once we have 
JCR-3745 released
Adapt to changes in Backend introduced with JCR-3729

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java?rev=1577243&r1=1577242&r2=1577243&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java
 Thu Mar 13 16:55:05 2014
@@ -21,9 +21,12 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
-import java.util.List;
+import java.util.Set;
 
+import com.google.common.collect.Sets;
 import org.apache.commons.io.IOUtils;
+import org.apache.jackrabbit.core.data.AsyncUploadCallback;
+import org.apache.jackrabbit.core.data.AsyncUploadCallback.RESULT;
 import org.apache.jackrabbit.core.data.Backend;
 import org.apache.jackrabbit.core.data.CachingDataStore;
 import org.apache.jackrabbit.core.data.DataIdentifier;
@@ -31,8 +34,6 @@ import org.apache.jackrabbit.core.data.D
 import org.apache.jackrabbit.core.data.DataStoreException;
 import org.apache.jackrabbit.core.data.MultiDataStoreAware;
 
-import com.google.common.collect.Lists;
-
 /**
  * {@link Backend} wrapper over Jackrabbit {@link DataStore} which enables 
using
  * a {@link CachingDataStore} for local file caching.
@@ -72,6 +73,12 @@ public class DataStoreWrapperBackend imp
     }
 
     @Override
+    public void writeAsync(DataIdentifier dataIdentifier, File file,
+            AsyncUploadCallback asyncUploadCallback) throws DataStoreException 
{
+        asyncUploadCallback.call(dataIdentifier, file, RESULT.FAILED);
+    }
+
+    @Override
     public void write(DataIdentifier identifier, File file) throws 
DataStoreException {
         InputStream stream = null;
         try {
@@ -90,8 +97,8 @@ public class DataStoreWrapperBackend imp
     }
 
     @Override
-    public void touch(DataIdentifier identifier, long minModifiedDate) throws 
DataStoreException {
-        // currently no-op
+    public boolean exists(DataIdentifier identifier, boolean touch) throws 
DataStoreException {
+        return exists(identifier);
     }
 
     @Override
@@ -105,9 +112,9 @@ public class DataStoreWrapperBackend imp
     }
 
     @Override
-    public List<DataIdentifier> deleteAllOlderThan(long timestamp) throws 
DataStoreException {
+    public Set<DataIdentifier> deleteAllOlderThan(long timestamp) throws 
DataStoreException {
         dataStore.deleteAllOlderThan(timestamp);
-        return Lists.newArrayList();
+        return Sets.newHashSet();
     }
 
     @Override