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 dj...@apache.org on 2015/10/06 09:33:21 UTC
svn commit: r1706959 - in /jackrabbit/oak/trunk:
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTestSuite.java
oak-parent/pom.xml
Author: dj
Date: Tue Oct 6 07:33:21 2015
New Revision: 1706959
URL: http://svn.apache.org/viewvc?rev=1706959&view=rev
Log:
OAK-3166: Apply adjustments for newly exported JackrabbitSession#getItemOrNull
Added:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTestSuite.java (with props)
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java?rev=1706959&r1=1706958&r2=1706959&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java Tue Oct 6 07:33:21 2015
@@ -165,14 +165,7 @@ public class SessionImpl implements Jack
}
}
- /**
- * Returns the node at the specified absolute path in the workspace or
- * {@code null} if no such node exists.
- *
- * @param absPath An absolute path.
- * @return the specified {@code Node} or {@code null}.
- * @throws RepositoryException If another error occurs.
- */
+ @Override
@CheckForNull
public Node getNodeOrNull(final String absPath) throws RepositoryException {
checkNotNull(absPath);
@@ -188,14 +181,7 @@ public class SessionImpl implements Jack
});
}
- /**
- * Returns the property at the specified absolute path in the workspace or
- * {@code null} if no such node exists.
- *
- * @param absPath An absolute path.
- * @return the specified {@code Property} or {@code null}.
- * @throws RepositoryException if another error occurs.
- */
+ @Override
@CheckForNull
public Property getPropertyOrNull(final String absPath) throws RepositoryException {
if (checkNotNull(absPath).equals("/")) {
@@ -221,15 +207,7 @@ public class SessionImpl implements Jack
}
}
- /**
- * Returns the node at the specified absolute path in the workspace. If no
- * such node exists, then it returns the property at the specified path.
- * If no such property exists, then it return {@code null}.
- *
- * @param absPath An absolute path.
- * @return the specified {@code Item} or {@code null}.
- * @throws RepositoryException if another error occurs.
- */
+ @Override
@CheckForNull
public Item getItemOrNull(final String absPath) throws RepositoryException {
checkNotNull(absPath);
Added: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTestSuite.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTestSuite.java?rev=1706959&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTestSuite.java (added)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTestSuite.java Tue Oct 6 07:33:21 2015
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.jcr.session;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.jackrabbit.core.integration.GetOrNullTest;
+
+/**
+ * Reuse JackrabbitSession tests
+ */
+public class JackrabbitSessionTestSuite extends TestCase {
+
+ public static Test suite() {
+ TestSuite testSuite = new TestSuite();
+ testSuite.addTestSuite(GetOrNullTest.class);
+ return testSuite;
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTestSuite.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1706959&r1=1706958&r2=1706959&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Tue Oct 6 07:33:21 2015
@@ -42,7 +42,7 @@
<project.reporting.outputEncoding>
${project.build.sourceEncoding}
</project.reporting.outputEncoding>
- <jackrabbit.version>2.11.0</jackrabbit.version>
+ <jackrabbit.version>2.11.1</jackrabbit.version>
<mongo.host>127.0.0.1</mongo.host>
<mongo.port>27017</mongo.port>
<mongo.db>MongoMKDB</mongo.db>