Author: thomasm
Date: Tue Mar 11 10:28:18 2014
New Revision: 1576264
URL: http://svn.apache.org/r1576264
Log:
OAK-98 Source code formatting, code conventions, Javadocs
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.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/DocumentNodeBuilder.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.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/DocumentPropertyState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
Tue Mar 11 10:28:18 2014
@@ -49,7 +49,7 @@ final class BatchCommit {
private List<UpdateOp> ops;
private List<Future<NodeDocument>> results;
- private boolean executing = false;
+ private boolean executing;
BatchCommit(String id, BatchCommitQueue queue, boolean onHold) {
this.id = id;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
Tue Mar 11 10:28:18 2014
@@ -128,7 +128,7 @@ public class Document implements CacheVa
* Determines if this document is sealed or not
* @return true if document is sealed.
*/
- public boolean isSealed(){
+ public boolean isSealed() {
return sealed.get();
}
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=1576264&r1=1576263&r2=1576264&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 11 10:28:18 2014
@@ -472,11 +472,11 @@ public class DocumentMK implements Micro
*/
public Builder setMongoDB(DB db) {
if (db != null) {
- if(this.documentStore == null){
+ if (this.documentStore == null) {
this.documentStore = new MongoDocumentStore(db, this);
}
- if(this.blobStore == null){
+ if (this.blobStore == null) {
this.blobStore = new MongoBlobStore(db);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java
Tue Mar 11 10:28:18 2014
@@ -35,9 +35,9 @@ class DocumentNodeBuilder extends Memory
private final DocumentRootBuilder root;
- private NodeState base = null;
+ private NodeState base;
- private NodeState rootBase = null;
+ private NodeState rootBase;
DocumentNodeBuilder(MemoryNodeBuilder base,
String name,
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
Tue Mar 11 10:28:18 2014
@@ -72,14 +72,14 @@ class DocumentNodeState extends Abstract
*/
static final int MAX_FETCH_SIZE = INITIAL_FETCH_SIZE << 4;
- private final DocumentNodeStore store;
-
final String path;
final Revision rev;
final Map<String, PropertyState> properties = Maps.newHashMap();
Revision lastRevision;
final boolean hasChildren;
+ private final DocumentNodeStore store;
+
/**
* TODO: OAK-1056
*/
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Tue Mar 11 10:28:18 2014
@@ -388,8 +388,7 @@ public final class DocumentNodeStore
if (blobStore instanceof Closeable) {
try {
((Closeable) blobStore).close();
- }
- catch (IOException ex) {
+ } catch (IOException ex) {
LOG.debug("Error closing blob store " + blobStore, ex);
}
}
@@ -773,9 +772,9 @@ public final class DocumentNodeStore
* @return the child nodes.
*/
@Nonnull
- Iterable<DocumentNodeState> getChildNodes(final @Nonnull DocumentNodeState
parent,
- final @Nullable String name,
- final int limit) {
+ Iterable<DocumentNodeState> getChildNodes(@Nonnull final DocumentNodeState
parent,
+ @Nullable final String name,
+ final int limit) {
// Preemptive check. If we know there are no children then
// return straight away
if (checkNotNull(parent).hasNoChildren()) {
@@ -1109,8 +1108,8 @@ public final class DocumentNodeStore
* @param base the base node to compare against.
* @return the json diff.
*/
- String diffChildren(final @Nonnull DocumentNodeState node,
- final @Nonnull DocumentNodeState base) {
+ String diffChildren(@Nonnull final DocumentNodeState node,
+ @Nonnull final DocumentNodeState base) {
PathRev key = diffCacheKey(node.getPath(),
base.getLastRevision(), node.getLastRevision());
try {
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=1576264&r1=1576263&r2=1576264&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 11 10:28:18 2014
@@ -123,7 +123,7 @@ public class DocumentNodeStoreService {
MongoClientOptions.Builder builder =
MongoConnection.getDefaultBuilder();
MongoClientURI mongoURI = new MongoClientURI(uri, builder);
- if (logger.isInfoEnabled()){
+ if (logger.isInfoEnabled()) {
// Take care around not logging the uri directly as it
// might contain passwords
String type = useMK ? "MK" : "NodeStore";
@@ -189,11 +189,11 @@ public class DocumentNodeStoreService {
return blobStore;
}
- private Object prop(Map<String, ?> config, String propName){
+ private Object prop(Map<String, ?> config, String propName) {
return prop(config, propName, PREFIX + propName);
}
- private Object prop(Map<String, ?> config, String propName, String
fwkPropName){
+ private Object prop(Map<String, ?> config, String propName, String
fwkPropName) {
//Prefer framework property first
Object value = bundleContext.getProperty(fwkPropName);
if (value != null) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java
Tue Mar 11 10:28:18 2014
@@ -52,7 +52,7 @@ final class DocumentPropertyState implem
private final String value;
- private PropertyState parsed = null;
+ private PropertyState parsed;
DocumentPropertyState(DocumentNodeStore store, String name, String value) {
this.store = store;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
Tue Mar 11 10:28:18 2014
@@ -55,7 +55,7 @@ import static org.apache.jackrabbit.oak.
/**
* A document storing data about a node.
*/
-final public class NodeDocument extends Document implements CachedNodeDocument{
+public final class NodeDocument extends Document implements CachedNodeDocument{
/**
* Marker document, which indicates the document does not exist.
@@ -217,7 +217,8 @@ final public class NodeDocument extends
/**
* @return the system time this object was created.
*/
- public final long getCreated() {
+ @Override
+ public long getCreated() {
return creationTime;
}
@@ -235,6 +236,7 @@ final public class NodeDocument extends
*
* @param checkTime time at which the check was performed
*/
+ @Override
public void markUpToDate(long checkTime) {
lastCheckTime.set(checkTime);
}
@@ -246,6 +248,7 @@ final public class NodeDocument extends
* @param lastCheckTime time at which current cycle started
* @return if the document was checked
*/
+ @Override
public boolean isUpToDate(long lastCheckTime) {
return lastCheckTime <= this.lastCheckTime.get();
}
@@ -255,6 +258,7 @@ final public class NodeDocument extends
*
* @return the last check time
*/
+ @Override
public long getLastCheckTime() {
return lastCheckTime.get();
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
Tue Mar 11 10:28:18 2014
@@ -28,7 +28,7 @@ import static com.google.common.base.Pre
* A cache key implementation, which is a combination of a path string and a
* revision.
*/
-final public class PathRev implements CacheValue {
+public final class PathRev implements CacheValue {
private final String path;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java
Tue Mar 11 10:28:18 2014
@@ -230,7 +230,6 @@ public class Revision {
return sb;
}
- @SuppressWarnings("UnusedDeclaration")
public String toReadableString() {
StringBuilder buff = new StringBuilder();
buff.append("revision: \"").append(toString()).append("\"");
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java?rev=1576264&r1=1576263&r2=1576264&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
Tue Mar 11 10:28:18 2014
@@ -167,7 +167,7 @@ class UnsavedModifications {
UpdateOp updateOp = null;
Revision lastRev = null;
List<String> ids = new ArrayList<String>();
- for (int i = 0; i < paths.size(); ) {
+ for (int i = 0; i < paths.size();) {
String p = paths.get(i);
Revision r = pending.get(p);
if (r == null) {
