Author: angela
Date: Thu Apr 20 09:28:34 2017
New Revision: 1792032
URL: http://svn.apache.org/viewvc?rev=1792032&view=rev
Log:
minor improvement to oak-commons-run: add private constructor to utilities and
remove unused imports
Modified:
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Modes.java
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Utils.java
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java
Modified:
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Modes.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Modes.java?rev=1792032&r1=1792031&r2=1792032&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Modes.java
(original)
+++
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Modes.java
Thu Apr 20 09:28:34 2017
@@ -19,8 +19,6 @@
package org.apache.jackrabbit.oak.commons.run;
-import com.google.common.base.Preconditions;
-
import java.util.Map;
import static com.google.common.base.Preconditions.checkNotNull;
Modified:
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Utils.java?rev=1792032&r1=1792031&r2=1792032&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/commons/run/Utils.java
Thu Apr 20 09:28:34 2017
@@ -25,6 +25,10 @@ import java.util.Arrays;
import java.util.Properties;
public class Utils {
+
+ private Utils() {
+ }
+
public static String getProductInfo(InputStream pom){
String version = getProductVersion(pom);
Modified:
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java?rev=1792032&r1=1792031&r2=1792032&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
(original)
+++
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
Thu Apr 20 09:28:34 2017
@@ -23,7 +23,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.PriorityQueue;
-
import javax.annotation.Nullable;
import com.google.common.base.Function;
@@ -36,7 +35,6 @@ import com.mongodb.DBCollection;
import com.mongodb.DBCursor;
import com.mongodb.DBObject;
import com.mongodb.QueryBuilder;
-
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -47,15 +45,15 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStoreHelper;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
-import static
org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStoreHelper.convertFromDBObject;
-import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.isCommitted;
-
/**
* Helper class to access package private method of DocumentNodeStore and other
* classes in this package.
*/
public class DocumentNodeStoreHelper {
+ private DocumentNodeStoreHelper() {
+ }
+
public static Cache<PathRev, DocumentNodeState>
getNodesCache(DocumentNodeStore dns) {
return dns.getNodeCache();
}
Modified:
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java?rev=1792032&r1=1792031&r2=1792032&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java
(original)
+++
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java
Thu Apr 20 09:28:34 2017
@@ -24,7 +24,10 @@ import javax.annotation.Nonnull;
* Helper class to access package private methods on NodeDocument.
*/
public class NodeDocumentHelper {
-
+
+ private NodeDocumentHelper() {
+ }
+
@Nonnull
public static SortedMap<Revision, String> getLocalMap(
NodeDocument doc, String key) {
Modified:
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java?rev=1792032&r1=1792031&r2=1792032&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java
(original)
+++
jackrabbit/oak/trunk/oak-commons-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreHelper.java
Thu Apr 20 09:28:34 2017
@@ -27,21 +27,23 @@ import com.mongodb.DBCollection;
import com.mongodb.DBObject;
import com.mongodb.QueryBuilder;
import com.mongodb.WriteResult;
-
-import org.apache.jackrabbit.oak.plugins.document.*;
+import org.apache.jackrabbit.oak.plugins.document.Collection;
+import org.apache.jackrabbit.oak.plugins.document.Document;
+import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
+import org.apache.jackrabbit.oak.plugins.document.NodeDocumentHelper;
+import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
-import static com.google.common.collect.Maps.newTreeMap;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
-import static
org.apache.jackrabbit.oak.plugins.document.NodeDocumentHelper.commitRoot;
-import static
org.apache.jackrabbit.oak.plugins.document.NodeDocumentHelper.getLocalCommitRoot;
-import static
org.apache.jackrabbit.oak.plugins.document.NodeDocumentHelper.getLocalMap;
/**
* Helper class to access package private methods on MongoDocumentStore.
*/
public class MongoDocumentStoreHelper {
-
+
+ private MongoDocumentStoreHelper() {
+ }
+
public static void repair(MongoDocumentStore store, String path) {
DBCollection col = store.getDBCollection(NODES);
String id = Utils.getIdFromPath(path);
