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 md...@apache.org on 2012/05/09 12:40:55 UTC
svn commit: r1336062 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/mk/
main/java/org/apache/jackrabbit/oak/spi/commit/
test/java/org/apache/jackrabbit/oak/kernel/
test/java/org/apache/jackrabbit/oak/namepath/
Author: mduerig
Date: Wed May 9 10:40:54 2012
New Revision: 1336062
URL: http://svn.apache.org/viewvc?rev=1336062&view=rev
Log:
remove unused import, add missing @Override, use isEmpty() instead of size==0, fix in Javadoc
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/CoreValueFactoryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java?rev=1336062&r1=1336061&r2=1336062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java Wed May 9 10:40:54 2012
@@ -174,7 +174,7 @@ public class MicroKernelFactory {
/**
* Delete a directory or file and all subdirectories and files inside it.
*
- * @param path the path
+ * @param file the file denoting the directory to delete
*/
private static void deleteRecursive(File file) {
File[] files = file.listFiles();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java?rev=1336062&r1=1336061&r2=1336062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java Wed May 9 10:40:54 2012
@@ -42,12 +42,14 @@ public class EmptyCommitHook implements
*/
public static final CommitHook INSTANCE = new EmptyCommitHook();
+ @Override
public NodeState beforeCommit(
NodeStore store, NodeState before, NodeState after)
throws CommitFailedException {
return after;
}
+ @Override
public void afterCommit(
NodeStore store, NodeState before, NodeState after) {
// do nothing
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/CoreValueFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/CoreValueFactoryTest.java?rev=1336062&r1=1336061&r2=1336062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/CoreValueFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/CoreValueFactoryTest.java Wed May 9 10:40:54 2012
@@ -21,7 +21,6 @@ import org.apache.jackrabbit.mk.json.Jso
import org.apache.jackrabbit.mk.json.JsopTokenizer;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.api.CoreValueFactory;
-import org.apache.jackrabbit.oak.kernel.CoreValueFactoryImpl;
import org.junit.Before;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java?rev=1336062&r1=1336061&r2=1336062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java Wed May 9 10:40:54 2012
@@ -40,7 +40,7 @@ public class NamePathMapperImplTest {
@Test
public void testInvalidIdentifierPath() {
- List<String> invalid = new ArrayList();
+ List<String> invalid = new ArrayList<String>();
invalid.add('[' + UUID.randomUUID().toString()+ "]abc");
invalid.add('[' + UUID.randomUUID().toString()+ "]/a/b/c");
@@ -102,7 +102,7 @@ public class NamePathMapperImplTest {
@Override
protected String getJcrPrefix(String oakPrefix) {
- if (oakPrefix.length() == 0) {
+ if (oakPrefix.isEmpty()) {
return oakPrefix;
} else {
return "jcr-" + oakPrefix;
@@ -111,7 +111,7 @@ public class NamePathMapperImplTest {
@Override
protected String getOakPrefix(String jcrPrefix) {
- if (jcrPrefix.length() == 0) {
+ if (jcrPrefix.isEmpty()) {
return jcrPrefix;
} else {
return "oak-" + jcrPrefix;