Author: thomasm
Date: Tue Mar 25 14:22:40 2014
New Revision: 1581346
URL: http://svn.apache.org/r1581346
Log:
OAK-98 Source code formatting, code conventions, Javadocs
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CachingDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/KryoFactory.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java?rev=1581346&r1=1581345&r2=1581346&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
Tue Mar 25 14:22:40 2014
@@ -41,7 +41,7 @@ public interface DiffCache {
* @return the diff or {@code null} if unknown.
*/
@CheckForNull
- public String getChanges(@Nonnull Revision from,
+ String getChanges(@Nonnull Revision from,
@Nonnull Revision to,
@Nonnull String path);
@@ -54,7 +54,7 @@ public interface DiffCache {
* @return the cache entry.
*/
@Nonnull
- public Entry newEntry(@Nonnull Revision from,
+ Entry newEntry(@Nonnull Revision from,
@Nonnull Revision to);
public interface Entry {
@@ -65,13 +65,13 @@ public interface DiffCache {
* @param path the path of the parent node.
* @param changes the child node changes.
*/
- public void append(@Nonnull String path,
+ void append(@Nonnull String path,
@Nonnull String changes);
/**
* Called when all changes have been appended and the entry is ready
* to be used by the cache.
*/
- public void done();
+ void done();
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1581346&r1=1581345&r2=1581346&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Tue Mar 25 14:22:40 2014
@@ -731,12 +731,12 @@ public class DocumentMK implements Micro
return this;
}
- public Builder clock(Clock clock){
+ public Builder clock(Clock clock) {
this.clock = clock;
return this;
}
- public Clock getClock(){
+ public Clock getClock() {
return clock;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1581346&r1=1581345&r2=1581346&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Tue Mar 25 14:22:40 2014
@@ -131,17 +131,17 @@ public class DocumentNodeStoreService {
protected void activate(ComponentContext context, Map<String, ?> config)
throws Exception {
this.context = context;
- if(blobStore == null &&
- PropertiesUtil.toBoolean(prop(CUSTOM_BLOB_STORE), false)){
- log.info("BlobStore use enabled. DocumentNodeStoreService would be
initialized when " +
- "BlobStore would be available");
- }else{
+ if (blobStore == null &&
+ PropertiesUtil.toBoolean(prop(CUSTOM_BLOB_STORE), false)) {
+ log.info("BlobStore use enabled. DocumentNodeStoreService would be
initialized when "
+ + "BlobStore would be available");
+ } else {
registerNodeStore();
}
}
protected void registerNodeStore() throws IOException {
- if(context == null){
+ if (context == null) {
log.info("Component still not activated. Ignoring the
initialization call");
return;
}
@@ -235,7 +235,7 @@ public class DocumentNodeStoreService {
registerNodeStore();
}
- protected void unbindBlobStore(BlobStore blobStore){
+ protected void unbindBlobStore(BlobStore blobStore) {
this.blobStore = null;
unregisterNodeStore();
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java?rev=1581346&r1=1581345&r2=1581346&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
Tue Mar 25 14:22:40 2014
@@ -118,7 +118,7 @@ public final class UpdateOp {
*
* @return true if any change operation is created
*/
- public boolean hasChanges(){
+ public boolean hasChanges() {
return !changes.isEmpty();
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CachingDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CachingDocumentStore.java?rev=1581346&r1=1581345&r2=1581346&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CachingDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CachingDocumentStore.java
Tue Mar 25 14:22:40 2014
@@ -27,5 +27,5 @@ public interface CachingDocumentStore ex
/**
* @return status information about the cache
*/
- public CacheStats getCacheStats();
+ CacheStats getCacheStats();
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/KryoFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/KryoFactory.java?rev=1581346&r1=1581345&r2=1581346&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/KryoFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/KryoFactory.java
Tue Mar 25 14:22:40 2014
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.plugins
*/
public class KryoFactory {
- public static Kryo createInstance(DocumentStore documentStore){
+ public static Kryo createInstance(DocumentStore documentStore) {
Kryo kryo = new Kryo();
kryo.setReferences(false);
kryo.register(Revision.class, new Serializers.RevisionSerizlizer());
