Skip to content
This repository has been archived by the owner on Apr 3, 2019. It is now read-only.

Commit

Permalink
added batch support for indexes,
Browse files Browse the repository at this point in the history 
RestOperation now gets an ResultConverter alongside with the object
UpdatableResult is generified
RestConverter now take a RestResult, removed canHandle method
removed IterableConverter and ResultConverters
  • Loading branch information
@jexp
jexp committed Sep 22, 2011
1 parent faabdc1 commit 19beaad
Show file tree
Hide file tree
Showing 22 changed files with 1,515 additions and 1,406 deletions.
9 changes: 3 additions & 6 deletions src/main/java/org/neo4j/rest/graphdb/BatchIterable.java
View file
@@ -1,15 +1,12 @@
package org.neo4j.rest.graphdb;

import org.neo4j.helpers.collection.IterableWrapper;

import java.util.Iterator;
import java.util.Map;

/**
* @author mh
* @since 21.09.11
*/
public class BatchIterable<T> implements Iterable<T>, UpdatableRestResult {
public class BatchIterable<T> implements Iterable<T>, UpdatableRestResult<Iterable<T>> {
private final long batchId;
private RestAPI restApi;
private Iterable<T> data;
Expand All @@ -19,8 +16,8 @@ public BatchIterable(RequestResult requestResult) {
}

@Override
public void updateFrom(Object newValue, RestAPI restApi) {
this.data = (Iterable<T>) newValue;
public void updateFrom(Iterable<T> newValue, RestAPI restApi) {
this.data = newValue;
this.restApi = restApi;
}

Expand Down
198 changes: 118 additions & 80 deletions src/main/java/org/neo4j/rest/graphdb/BatchRestAPI.java
View file
@@ -1,80 +1,118 @@
package org.neo4j.rest.graphdb;


import java.util.Map;

import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.helpers.collection.MapUtil;

public class BatchRestAPI extends RestAPI {

public BatchRestAPI( String uri ) {
super(uri);
}

public BatchRestAPI( String uri, String user, String password ) {
super(uri, user, password);
}

public BatchRestAPI(String uri, ExecutingRestRequest executingRestRequest){
super(uri);
this.restRequest = new RecordingRestRequest(executingRestRequest, new RestOperations());
}

@Override
protected RestRequest createRestRequest( String uri, String user, String password){
return new RecordingRestRequest(new ExecutingRestRequest(uri, user, password),new RestOperations());
}


@Override
public Node createRestNode(RequestResult requestResult) {
final long batchId = requestResult.getBatchId();
Node node = new RestNode("{"+batchId+"}", this);
(getRecordingRequest()).getOperations().addToRestOperation(batchId, node);
return node;
}

@Override
public RestRelationship createRelationship(Node startNode, Node endNode, RelationshipType type, Map<String, Object> props) {
final RestRequest restRequest = ((RestNode)startNode).getRestRequest();
Map<String, Object> data = MapUtil.map("to", ((RestNode)endNode).getUri(), "type", type.name());
if (props!=null && props.size()>0) {
data.put("data",props);
}
//RequestResult requestResult = restRequest.post(restRequest.getUri()+"/relationships", data);
RequestResult requestResult = restRequest.post( "relationships", data);
return createRestRelationship(requestResult, startNode);
}

@Override
public RestRelationship createRestRelationship(RequestResult requestResult, Node startNode) {
final long batchId = requestResult.getBatchId();
RestRelationship relationship = new RestRelationship("{"+batchId+"}", this);
getRecordingRequest().getOperations().addToRestOperation(batchId, relationship);
return relationship;
}

private RecordingRestRequest getRecordingRequest() {
return (RecordingRestRequest)this.restRequest;
}

public RestOperations getRecordedOperations(){
return (getRecordingRequest()).getOperations();
}

public void stop() {
getRecordingRequest().stop();
}

@SuppressWarnings("unchecked")
public Iterable<Relationship> wrapRelationships( RequestResult requestResult ) {
final long batchId = requestResult.getBatchId();
final BatchIterable<Relationship> result = new BatchIterable<Relationship>(requestResult);
getRecordingRequest().getOperations().addToRestOperation(batchId, result);
return result;
}

}
package org.neo4j.rest.graphdb;


import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.PropertyContainer;
import org.neo4j.graphdb.Relationship;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.graphdb.index.IndexHits;
import org.neo4j.helpers.collection.MapUtil;
import org.neo4j.rest.graphdb.index.IndexInfo;
import org.neo4j.rest.graphdb.index.SimpleIndexHits;

import java.util.Map;

public class BatchRestAPI extends RestAPI {

public BatchRestAPI( String uri ) {
super(uri);
}

public BatchRestAPI( String uri, String user, String password ) {
super(uri, user, password);
}

public BatchRestAPI(String uri, ExecutingRestRequest executingRestRequest){
super(uri);
this.restRequest = new RecordingRestRequest(executingRestRequest, new RestOperations());
}

@Override
protected RestRequest createRestRequest( String uri, String user, String password){
return new RecordingRestRequest(new ExecutingRestRequest(uri, user, password),new RestOperations());
}


@Override
public Node createRestNode(RequestResult requestResult) {
final long batchId = requestResult.getBatchId();
Node node = new RestNode("{"+batchId+"}", this);
(getRecordingRequest()).getOperations().addToRestOperation(batchId, node, new RestEntityExtractor(this));
return node;
}

@Override
public RestRelationship createRelationship(Node startNode, Node endNode, RelationshipType type, Map<String, Object> props) {
final RestRequest restRequest = ((RestNode)startNode).getRestRequest();
Map<String, Object> data = MapUtil.map("to", ((RestNode)endNode).getUri(), "type", type.name());
if (props!=null && props.size()>0) {
data.put("data",props);
}
//RequestResult requestResult = restRequest.post(restRequest.getUri()+"/relationships", data);
RequestResult requestResult = restRequest.post( "relationships", data);
return createRestRelationship(requestResult, startNode);
}

@Override
public RestRelationship createRestRelationship(RequestResult requestResult, Node startNode) {
final long batchId = requestResult.getBatchId();
RestRelationship relationship = new RestRelationship("{"+batchId+"}", this);
getRecordingRequest().getOperations().addToRestOperation(batchId, relationship, new RestEntityExtractor(this));
return relationship;
}

private RecordingRestRequest getRecordingRequest() {
return (RecordingRestRequest)this.restRequest;
}

public RestOperations getRecordedOperations(){
return (getRecordingRequest()).getOperations();
}

public void stop() {
getRecordingRequest().stop();
}

@SuppressWarnings("unchecked")
public Iterable<Relationship> wrapRelationships( RequestResult requestResult ) {
final long batchId = requestResult.getBatchId();
final BatchIterable<Relationship> result = new BatchIterable<Relationship>(requestResult);
getRecordingRequest().getOperations().addToRestOperation(batchId, result, new RelationshipIterableConverter(this));
return result;
}

public <S extends PropertyContainer> IndexHits<S> queryIndex(String indexPath, Class<S> entityType) {
RequestResult response = restRequest.get(indexPath);
final long batchId = response.getBatchId();
final SimpleIndexHits<S> result = new SimpleIndexHits<S>(batchId, entityType, this);
getRecordingRequest().getOperations().addToRestOperation(batchId, result, new RestIndexHitsConverter(this,entityType));
return result;
}

public IndexInfo indexInfo(final String indexType) {
return new BatchIndexInfo();
}

private static class BatchIndexInfo implements IndexInfo {

@Override
public boolean checkConfig(String indexName, Map<String, String> config) {
return true;
}

@Override
public String[] indexNames() {
return new String[0];
}

@Override
public boolean exists(String indexName) {
return true;
}

@Override
public Map<String, String> getConfig(String name) {
return null;
}
}
}
29 changes: 29 additions & 0 deletions src/main/java/org/neo4j/rest/graphdb/RelationshipIterableConverter.java
View file
@@ -0,0 +1,29 @@
package org.neo4j.rest.graphdb;

import org.neo4j.graphdb.Relationship;
import org.neo4j.helpers.collection.IterableWrapper;

import java.util.Collection;
import java.util.Map;

/**
* @author mh
* @since 22.09.11
*/
public class RelationshipIterableConverter implements RestResultConverter {
private final RestAPI restAPI;

public RelationshipIterableConverter(RestAPI restAPI) {
this.restAPI = restAPI;
}

@Override
public Object convertFromRepresentation(RequestResult requestResult) {
return new IterableWrapper<Relationship, Object>((Collection<Object>) requestResult.toEntity()) {
@Override
protected Relationship underlyingObjectToObject(Object data) {
return new RestRelationship((Map<?, ?>) data, restAPI);
}
};
}
}

0 comments on commit 19beaad

Please sign in to comment.