*/
package org.onap.crud.service;
-import com.att.ecomp.event.api.EventConsumer;
-import com.att.ecomp.event.api.EventPublisher;
+import org.onap.aai.event.api.EventConsumer;
+import org.onap.aai.event.api.EventPublisher;
import org.onap.aai.cl.api.LogFields;
import org.onap.aai.cl.api.Logger;
import org.onap.schema.RelationshipSchemaValidator;
import java.text.SimpleDateFormat;
+import java.util.HashMap;
import java.util.Timer;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
public static Integer getRequestTimeOut() {
return requestTimeOut;
}
+
+ public CrudAsyncGraphDataService(GraphDao dao,
+ EventPublisher asyncRequestPublisher,
+ EventConsumer asyncResponseConsumer) throws CrudException {
+ this(dao,dao,asyncRequestPublisher,asyncResponseConsumer);
+ }
public CrudAsyncGraphDataService(GraphDao dao,
+ GraphDao daoForGet,
EventPublisher asyncRequestPublisher,
EventConsumer asyncResponseConsumer) throws CrudException {
- super(dao);
+ super();
+ this.dao = dao;
+ this.daoForGet = daoForGet;
requestTimeOut = DEFAULT_REQUEST_TIMEOUT;
try {
public String patchVertex(String version, String id, String type, VertexPayload payload)
throws CrudException {
Vertex existingVertex
- = dao.getVertex(id, OxmModelValidator.resolveCollectionType(version, type), version);
+ = dao.getVertex(id, OxmModelValidator.resolveCollectionType(version, type), version, new HashMap<String, String>());
Vertex patchedVertex = OxmModelValidator.validateIncomingPatchPayload(id, version,
type, payload.getProperties(),
existingVertex);
public String updateEdge(String version, String id, String type, EdgePayload payload)
throws CrudException {
- Edge edge = dao.getEdge(id, type);
+ Edge edge = dao.getEdge(id, type, new HashMap<String, String>());
Edge validatedEdge = RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version,
payload);
GraphEvent event = GraphEvent.builder(GraphEventOperation.UPDATE)
public String patchEdge(String version, String id, String type, EdgePayload payload)
throws CrudException {
- Edge edge = dao.getEdge(id, type);
+ Edge edge = dao.getEdge(id, type, new HashMap<String, String>());
Edge patchedEdge = RelationshipSchemaValidator.validateIncomingPatchPayload(edge, version,
payload);
GraphEvent event = GraphEvent.builder(GraphEventOperation.UPDATE)
+ " , operation: " + event.getOperation().toString() + " , result: "
+ response.getResult() + " , error: " + response.getErrorMessage());
}
-
}
\ No newline at end of file