Author: thomasm
Date: Tue Feb 3 12:50:05 2015
New Revision: 1656712
URL: http://svn.apache.org/r1656712
Log:
OAK-98 Source code formatting, code conventions
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java?rev=1656712&r1=1656711&r2=1656712&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
Tue Feb 3 12:50:05 2015
@@ -117,7 +117,7 @@ public class DataStoreBlobStore implemen
@Override
public DataRecord getRecordIfStored(DataIdentifier identifier) throws
DataStoreException {
- if(isInMemoryRecord(identifier)){
+ if (isInMemoryRecord(identifier)) {
return getDataRecord(identifier.toString());
}
return delegate.getRecordIfStored(identifier);
@@ -125,7 +125,7 @@ public class DataStoreBlobStore implemen
@Override
public DataRecord getRecord(DataIdentifier identifier) throws
DataStoreException {
- if(isInMemoryRecord(identifier)){
+ if (isInMemoryRecord(identifier)) {
return getDataRecord(identifier.toString());
}
return delegate.getRecord(identifier);
@@ -218,7 +218,7 @@ public class DataStoreBlobStore implemen
try {
checkNotNull(encodedBlobId, "BlobId must be specified");
BlobId id = BlobId.of(encodedBlobId);
- if(encodeLengthInId && id.hasLengthInfo()){
+ if (encodeLengthInId && id.hasLengthInfo()) {
return id.length;
}
return getDataRecord(id.blobId).getLength();
@@ -247,16 +247,16 @@ public class DataStoreBlobStore implemen
checkNotNull(encodedBlobId);
String blobId = extractBlobId(encodedBlobId);
//Reference are not created for in memory record
- if(InMemoryDataRecord.isInstance(blobId)){
+ if (InMemoryDataRecord.isInstance(blobId)) {
return null;
}
DataRecord record;
try {
record = delegate.getRecord(new DataIdentifier(blobId));
- if(record != null){
+ if (record != null) {
return record.getReference();
- }else{
+ } else {
log.debug("No blob found for id [{}]", blobId);
}
} catch (DataStoreException e) {
@@ -298,7 +298,7 @@ public class DataStoreBlobStore implemen
@Override
public void setBlockSize(int x) {
-
+ // nothing to do
}
@Override
@@ -321,7 +321,7 @@ public class DataStoreBlobStore implemen
@Override
public void startMark() throws IOException {
-
+ // nothing to do
}
@Override
@@ -331,7 +331,7 @@ public class DataStoreBlobStore implemen
@Override
public void clearCache() {
-
+ // nothing to do
}
@Override
@@ -361,10 +361,10 @@ public class DataStoreBlobStore implemen
}
return false;
}
- }),new Function<DataRecord, String>() {
+ }), new Function<DataRecord, String>() {
@Override
public String apply(DataRecord input) {
- if(encodeLengthInId) {
+ if (encodeLengthInId) {
return BlobId.of(input).encodedValue();
}
return input.getIdentifier().toString();
@@ -423,16 +423,16 @@ public class DataStoreBlobStore implemen
private DataRecord getDataRecord(String blobId) throws DataStoreException {
DataRecord id;
- if(InMemoryDataRecord.isInstance(blobId)){
+ if (InMemoryDataRecord.isInstance(blobId)) {
id = InMemoryDataRecord.getInstance(blobId);
- }else{
+ } else {
id = delegate.getRecord(new DataIdentifier(blobId));
}
checkNotNull(id, "No DataRecord found for blobId [%s]", blobId);
return id;
}
- private boolean isInMemoryRecord(DataIdentifier identifier){
+ private static boolean isInMemoryRecord(DataIdentifier identifier) {
return InMemoryDataRecord.isInstance(identifier.toString());
}
@@ -469,15 +469,15 @@ public class DataStoreBlobStore implemen
return record;
}
- private String getBlobId(DataRecord dr){
- if(encodeLengthInId){
+ private String getBlobId(DataRecord dr) {
+ if (encodeLengthInId) {
return BlobId.of(dr).encodedValue();
}
return dr.getIdentifier().toString();
}
- private String extractBlobId(String encodedBlobId){
- if(encodeLengthInId){
+ private String extractBlobId(String encodedBlobId) {
+ if (encodeLengthInId) {
return BlobId.of(encodedBlobId).blobId;
}
return encodedBlobId;
@@ -507,36 +507,36 @@ public class DataStoreBlobStore implemen
BlobId(String encodedBlobId) {
int indexOfSep = encodedBlobId.lastIndexOf(SEP);
- if(indexOfSep != -1){
+ if (indexOfSep != -1) {
this.blobId = encodedBlobId.substring(0, indexOfSep);
this.length =
Long.valueOf(encodedBlobId.substring(indexOfSep+SEP.length()));
- }else{
+ } else {
this.blobId = encodedBlobId;
this.length = -1;
}
}
- String encodedValue(){
- if(hasLengthInfo()){
+ String encodedValue() {
+ if (hasLengthInfo()) {
return blobId + SEP + String.valueOf(length);
- } else{
+ } else {
return blobId;
}
}
- boolean hasLengthInfo(){
+ boolean hasLengthInfo() {
return length != -1;
}
- static boolean isEncoded(String encodedBlobId){
+ static boolean isEncoded(String encodedBlobId) {
return encodedBlobId.contains(SEP);
}
- static BlobId of(String encodedValue){
+ static BlobId of(String encodedValue) {
return new BlobId(encodedValue);
}
- static BlobId of(DataRecord dr){
+ static BlobId of(DataRecord dr) {
return new BlobId(dr);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java?rev=1656712&r1=1656711&r2=1656712&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java
Tue Feb 3 12:50:05 2015
@@ -29,7 +29,7 @@ import org.apache.jackrabbit.core.data.d
import org.apache.jackrabbit.core.util.db.ConnectionFactory;
import org.osgi.service.component.ComponentContext;
-@Component(policy = ConfigurationPolicy.REQUIRE, name=DbDataStoreService.NAME)
+@Component(policy = ConfigurationPolicy.REQUIRE, name =
DbDataStoreService.NAME)
public class DbDataStoreService extends AbstractDataStoreService{
public static final String NAME =
"org.apache.jackrabbit.oak.plugins.blob.datastore.DbDataStore";
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java?rev=1656712&r1=1656711&r2=1656712&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
Tue Feb 3 12:50:05 2015
@@ -26,7 +26,7 @@ import org.apache.felix.scr.annotations.
import org.apache.jackrabbit.core.data.DataStore;
import org.osgi.service.component.ComponentContext;
-@Component(policy = ConfigurationPolicy.REQUIRE,
name=FileDataStoreService.NAME)
+@Component(policy = ConfigurationPolicy.REQUIRE, name =
FileDataStoreService.NAME)
public class FileDataStoreService extends AbstractDataStoreService{
public static final String NAME =
"org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore";
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java?rev=1656712&r1=1656711&r2=1656712&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/InMemoryDataRecord.java
Tue Feb 3 12:50:05 2015
@@ -123,7 +123,7 @@ class InMemoryDataRecord implements Data
@Override
public DataIdentifier getIdentifier() {
- if(identifier == null){
+ if (identifier == null) {
identifier = new DataIdentifier(toString());
}
return identifier;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java?rev=1656712&r1=1656711&r2=1656712&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
Tue Feb 3 12:50:05 2015
@@ -68,7 +68,7 @@ public class OakFileDataStore extends Fi
@Override
protected byte[] getOrCreateReferenceKey() throws DataStoreException {
- if(referenceKey != null){
+ if (referenceKey != null) {
return referenceKey;
}
return super.getOrCreateReferenceKey();
@@ -104,7 +104,7 @@ public class OakFileDataStore extends Fi
/**
* Noop map which eats up all the put call
*/
- static class NoOpMap<K,V> extends AbstractMap<K,V> {
+ static class NoOpMap<K, V> extends AbstractMap<K, V> {
@Override
public V put(K key, V value) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java?rev=1656712&r1=1656711&r2=1656712&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java
Tue Feb 3 12:50:05 2015
@@ -28,7 +28,7 @@ import org.apache.jackrabbit.aws.ext.ds.
import org.apache.jackrabbit.core.data.DataStore;
import org.osgi.service.component.ComponentContext;
-@Component(policy = ConfigurationPolicy.REQUIRE, name=S3DataStoreService.NAME)
+@Component(policy = ConfigurationPolicy.REQUIRE, name =
S3DataStoreService.NAME)
public class S3DataStoreService extends AbstractDataStoreService{
public static final String NAME =
"org.apache.jackrabbit.oak.plugins.blob.datastore.S3DataStore";
