You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2016/08/02 11:32:01 UTC
svn commit: r1754881 - in
/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore:
DataStoreBlobStore.java InMemoryDataRecord.java
Author: tomekr
Date: Tue Aug 2 11:32:01 2016
New Revision: 1754881
URL: http://svn.apache.org/viewvc?rev=1754881&view=rev
Log:
OAK-4629: Make it possible to override blob accessing methods in DataStoreBlobStore
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java?rev=1754881&r1=1754880&r2=1754881&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java Tue Aug 2 11:32:01 2016
@@ -68,7 +68,7 @@ import static com.google.common.collect.
public class DataStoreBlobStore implements DataStore, BlobStore, GarbageCollectableBlobStore {
private final Logger log = LoggerFactory.getLogger(getClass());
- private final DataStore delegate;
+ protected final DataStore delegate;
/**
* If set to true then the blob length information would be encoded as part of blobId
@@ -419,7 +419,7 @@ public class DataStoreBlobStore implemen
//~---------------------------------------------< Internal >
- private InputStream getStream(String blobId) throws IOException {
+ protected InputStream getStream(String blobId) throws IOException {
try {
InputStream in = getDataRecord(blobId).getStream();
if (!(in instanceof BufferedInputStream)){
@@ -431,7 +431,7 @@ public class DataStoreBlobStore implemen
}
}
- private DataRecord getDataRecord(String blobId) throws DataStoreException {
+ protected DataRecord getDataRecord(String blobId) throws DataStoreException {
DataRecord id;
if (InMemoryDataRecord.isInstance(blobId)) {
id = InMemoryDataRecord.getInstance(blobId);
@@ -486,7 +486,7 @@ public class DataStoreBlobStore implemen
return dr.getIdentifier().toString();
}
- private String extractBlobId(String encodedBlobId) {
+ protected String extractBlobId(String encodedBlobId) {
if (encodeLengthInId) {
return BlobId.of(encodedBlobId).blobId;
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java?rev=1754881&r1=1754880&r2=1754881&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java Tue Aug 2 11:32:01 2016
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
/**
* Represents binary data which is backed by a byte[] (in memory).
*/
-class InMemoryDataRecord implements DataRecord {
+public class InMemoryDataRecord implements DataRecord {
/**
* Logger instance for this class
@@ -89,7 +89,7 @@ class InMemoryDataRecord implements Data
* @param id DataRecord identifier
* @return true if it can be converted
*/
- static boolean isInstance(String id) {
+ public static boolean isInstance(String id) {
return id.startsWith(PREFIX);
}
@@ -98,7 +98,7 @@ class InMemoryDataRecord implements Data
* @param id DataRecord identifier
* @return the instance
*/
- static InMemoryDataRecord getInstance(String id) throws IllegalArgumentException {
+ public static InMemoryDataRecord getInstance(String id) throws IllegalArgumentException {
assert id.startsWith(PREFIX);
id = id.substring(PREFIX.length());
int len = id.length();