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 ca...@apache.org on 2017/10/09 23:18:50 UTC
svn commit: r1811626 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/
oak-core/src/test/java/org/apache/jackrabbit/oak/query/facet/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/
oak-query-spi/ oa...
Author: catholicon
Date: Mon Oct 9 23:18:50 2017
New Revision: 1811626
URL: http://svn.apache.org/viewvc?rev=1811626&view=rev
Log:
OAK-6790: FacetResult class isn't exposed anymore
Added:
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java (contents, props changed)
- copied, changed from r1811611, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java (contents, props changed)
- copied, changed from r1811611, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java
jackrabbit/oak/trunk/oak-query-spi/src/test/java/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java (contents, props changed)
- copied, changed from r1811611, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
jackrabbit/oak/trunk/oak-query-spi/pom.xml
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1811626&r1=1811625&r2=1811626&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java Mon Oct 9 23:18:50 2017
@@ -29,7 +29,7 @@ import java.util.List;
import org.apache.jackrabbit.core.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;
-import org.apache.jackrabbit.oak.query.facet.FacetResult;
+import org.apache.jackrabbit.oak.spi.query.facet.FacetResult;
import org.junit.After;
import org.junit.Before;
Modified: jackrabbit/oak/trunk/oak-query-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/pom.xml?rev=1811626&r1=1811625&r2=1811626&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-query-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-query-spi/pom.xml Mon Oct 9 23:18:50 2017
@@ -40,6 +40,7 @@
<instructions>
<Export-Package>
org.apache.jackrabbit.oak.spi.query,
+ org.apache.jackrabbit.oak.spi.query.facet,
org.apache.jackrabbit.oak.spi.query.fulltext
</Export-Package>
</instructions>
@@ -116,6 +117,19 @@
<artifactId>jsr305</artifactId>
</dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
-</project>
\ No newline at end of file
+</project>
Copied: jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java (from r1811611, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java?p2=jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java&r1=1811611&r2=1811626&rev=1811626&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java (original)
+++ jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java Mon Oct 9 23:18:50 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.query.facet;
+package org.apache.jackrabbit.oak.spi.query.facet;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
Propchange: jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java (from r1811611, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java?p2=jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java&r1=1811611&r2=1811626&rev=1811626&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java Mon Oct 9 23:18:50 2017
@@ -15,6 +15,6 @@
* limitations under the License.
*/
@Version("1.0")
-package org.apache.jackrabbit.oak.query.facet;
+package org.apache.jackrabbit.oak.spi.query.facet;
import org.osgi.annotation.versioning.Version;
Propchange: jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java (from r1811611, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java?p2=jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java&r1=1811611&r2=1811626&rev=1811626&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java (original)
+++ jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java Mon Oct 9 23:18:50 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.query.facet;
+package org.apache.jackrabbit.oak.spi.query.facet;
import javax.jcr.Value;
import javax.jcr.query.QueryResult;
Propchange: jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1811626&r1=1811625&r2=1811626&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java Mon Oct 9 23:18:50 2017
@@ -20,19 +20,15 @@ package org.apache.jackrabbit.oak.jcr.qu
import javax.jcr.Node;
import javax.jcr.NodeIterator;
-import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.jcr.Value;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
-import javax.jcr.query.Row;
-import javax.jcr.query.RowIterator;
import java.util.List;
import org.apache.jackrabbit.core.query.AbstractQueryTest;
-import org.apache.jackrabbit.oak.query.facet.FacetResult;
+import org.apache.jackrabbit.oak.spi.query.facet.FacetResult;
/**
* Test for faceting capabilities via JCR API