You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by my...@apache.org on 2014/09/09 08:11:24 UTC
svn commit: r1623664 - in
/sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl:
MongoDBResourceProvider.java MongoDBResourceProviderFactory.java
Author: mykee
Date: Tue Sep 9 06:11:23 2014
New Revision: 1623664
URL: http://svn.apache.org/r1623664
Log:
SLING-3916 - Add simple query support to the MongoDBResourceProvider
Modified:
sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java
sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProviderFactory.java
Modified: sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java?rev=1623664&r1=1623663&r2=1623664&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java Tue Sep 9 06:11:23 2014
@@ -37,10 +37,12 @@ import org.slf4j.LoggerFactory;
import com.mongodb.BasicDBObject;
import com.mongodb.BasicDBObjectBuilder;
+import com.mongodb.CommandResult;
import com.mongodb.DBCollection;
import com.mongodb.DBCursor;
import com.mongodb.DBObject;
import com.mongodb.QueryBuilder;
+import com.mongodb.util.JSON;
/**
* The MongoDB resource provider creates resources based on MongoDB entries.
@@ -435,8 +437,52 @@ public class MongoDBResourceProvider imp
return PROP_PATH;
}
- public Iterator<Resource> findResources(ResourceResolver resolver, String query, String language) {
- return null;
+ public Iterator<Resource> findResources(final ResourceResolver resolver, String query, String language) {
+ if ( !language.equals( "mongodb") || query == null || query.length() == 0 || query.indexOf( ".find(" ) <= 0 )
+ {
+ return null;
+ }
+ Iterator<Resource> returnValue = null;
+ final String collectionName = query.substring( 0, query.indexOf( ".find(" ) );
+ DBCollection col = this.getCollection( collectionName );
+ if ( col != null )
+ {
+ String criteria = query.trim().substring( query.indexOf( ".find(" ) + 6, query.length() - 1 );
+ DBObject dbObject = (DBObject) JSON.parse( criteria );
+ final DBCursor cur = col.find( dbObject );
+ final String rootPath = context.getRootWithSlash();
+
+ return new Iterator<Resource>() {
+
+ public boolean hasNext() {
+ return cur.hasNext();
+ }
+
+ public Resource next() {
+ final DBObject obj = cur.next();
+ final String objPath = obj.get(getPROP_PATH()).toString();
+ final int lastSlash = objPath.lastIndexOf('/');
+ final String name;
+ if (lastSlash == -1) {
+ name = objPath;
+ } else {
+ name = objPath.substring(lastSlash + 1);
+ }
+ return new MongoDBResource(resolver,
+ rootPath + collectionName + "/" + name,
+ collectionName,
+ obj,
+ MongoDBResourceProvider.this);
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException("remove");
+ }
+
+ };
+ }
+
+ return returnValue;
}
public Iterator<ValueMap> queryResources(ResourceResolver resolver, String query, String language) {
Modified: sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProviderFactory.java?rev=1623664&r1=1623663&r2=1623664&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProviderFactory.java (original)
+++ sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProviderFactory.java Tue Sep 9 06:11:23 2014
@@ -28,6 +28,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceProvider;
+import org.apache.sling.api.resource.QueriableResourceProvider;
import org.apache.sling.api.resource.ResourceProviderFactory;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.osgi.service.event.EventAdmin;
@@ -50,7 +51,8 @@ policy=ConfigurationPolicy.REQUIRE,
metatype=true)
@Service(value=ResourceProviderFactory.class)
@Properties({
- @Property(name=ResourceProvider.ROOTS, value="/mongo")
+ @Property(name=ResourceProvider.ROOTS, value="/mongo"),
+ @Property(name=QueriableResourceProvider.LANGUAGES, value="mongodb")
})
public class MongoDBResourceProviderFactory implements ResourceProviderFactory {