import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.message.BasicNameValuePair;
import org.eclipse.jetty.util.security.Password;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
import org.onap.aai.cl.mdc.MdcContext;
import org.onap.aai.logging.LoggingContext;
import org.onap.aai.restclient.client.OperationResult;
protected static final String RELATIONSHIP_SUB_URL = "relationships";
protected static final String TRANSACTION_SUB_URL = "transaction";
- private Logger logger = LoggerFactory.getInstance().getLogger(ChampDao.class.getName());
-
// We use a custom vertex serializer for champ because it expects "key"
// instead of "id"
protected static final Gson champGson = new GsonBuilder()
}
@Override
- public List<Edge> getVertexEdges(String id, Map<String, String> queryParams) throws CrudException {
- StringBuilder strBuild = new StringBuilder(baseObjectUrl);
- strBuild.append("/relationships/");
- strBuild.append(id);
- if(queryParams != null && !queryParams.isEmpty())
- {
- strBuild.append("?");
- strBuild.append(URLEncodedUtils.format(convertToNameValuePair(queryParams), Charset.defaultCharset()));
- }
+ public List<Edge> getVertexEdges(String id, Map<String, String> queryParams, String txId) throws CrudException {
+ StringBuilder strBuild = new StringBuilder(baseObjectUrl);
+ strBuild.append("/relationships/");
+ strBuild.append(id);
+
+ Map<String,String> queryParamsCopy = null;
+ if (queryParams != null) {
+ queryParamsCopy = new HashMap<String,String>(queryParams);
+ }
+ else {
+ queryParamsCopy = new HashMap<String,String>();
+ }
- OperationResult getResult = client.get(strBuild.toString(), createHeader(), MediaType.APPLICATION_JSON_TYPE);
+ if (txId != null) {
+ queryParamsCopy.put("transactionId", txId);
+ }
- if (getResult.getResultCode() == 200) {
- return champGson.fromJson(getResult.getResult(), new TypeToken<List<Edge>>() {
- }.getType());
- } else {
- // We didn't find a vertex with the supplied id, so just throw an
- // exception.
- throw createErrorException(getResult, javax.ws.rs.core.Response.Status.NOT_FOUND, "No vertex with id " + id + " found in graph");
- }
+ if (!queryParamsCopy.isEmpty())
+ {
+ strBuild.append("?");
+ strBuild.append(URLEncodedUtils.format(convertToNameValuePair(queryParamsCopy), Charset.defaultCharset()));
+ }
+
+ OperationResult getResult = client.get(strBuild.toString(), createHeader(), MediaType.APPLICATION_JSON_TYPE);
+
+ if (getResult.getResultCode() == 200) {
+ return champGson.fromJson(getResult.getResult(), new TypeToken<List<Edge>>() {
+ }.getType());
+ } else {
+ // We didn't find a vertex with the supplied id, so just throw an
+ // exception.
+ throw createErrorException(getResult, javax.ws.rs.core.Response.Status.NOT_FOUND, "No vertex with id " + id + " found in graph");
+ }
}
@Override
}
@Override
- public OperationResult getVertices(String type, Map<String, Object> filter, HashSet<String> properties, String version) throws CrudException {
+ public OperationResult getVertices(String type, Map<String, Object> filter, Set<String> properties, String version) throws CrudException {
filter.put(org.onap.schema.validation.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
List<NameValuePair> queryParams = convertToNameValuePair(filter);
if (!edge.getType().equalsIgnoreCase(type)) {
// We didn't find an edge with the supplied type, so just throw an
// exception.
- throw new CrudException("No edge with id " + id + "and type " + type + " found in graph",
+ throw new CrudException("No edge with id " + id + " and type " + type + " found in graph",
javax.ws.rs.core.Response.Status.NOT_FOUND);
}
return getResult;
}
@Override
- public void deleteEdge(String id, String type) throws CrudException {
+ public void deleteEdge(String id) throws CrudException {
String url = baseRelationshipUrl + "/" + id;
OperationResult getResult = client.delete(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
}
@Override
- public void deleteEdge(String id, String type, String txId) throws CrudException {
+ public void deleteEdge(String id, String txId) throws CrudException {
String url = baseRelationshipUrl + "/" + id + "?transactionId=" + txId;
OperationResult getResult = client.delete(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
}
@Override
- public Edge getEdge(String id, String type, String txId) throws CrudException {
+ public Edge getEdge(String id, String txId) throws CrudException {
String url = baseRelationshipUrl + "/" + id + "?transactionId=" + txId;
OperationResult getResult = client.get(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
if (getResult.getResultCode() == 200) {
Edge edge = Edge.fromJson(getResult.getResult());
-
- if (!edge.getType().equalsIgnoreCase(type)) {
- // We didn't find an edge with the supplied type, so just throw an
- // exception.
- throw new CrudException("No edge with id " + id + "and type " + type + " found in graph",
- javax.ws.rs.core.Response.Status.NOT_FOUND);
- }
return edge;
} else {
// We didn't find an edge with the supplied id, so just throw an
throw createErrorException(getResult, javax.ws.rs.core.Response.Status.NOT_FOUND, "No edge with id " + id + " found in graph");
}
}
+
+ @Override
+ public Edge getEdge(String id) throws CrudException {
+ String url = baseRelationshipUrl + "/" + id;
+ OperationResult getResult = client.get(url, createHeader(), MediaType.APPLICATION_JSON_TYPE);
+
+ if (getResult.getResultCode() == 200) {
+ Edge edge = Edge.fromJson(getResult.getResult());
+ return edge;
+ } else {
+ // We didn't find an edge with the supplied id, so just throw an exception.
+ throw createErrorException(getResult, javax.ws.rs.core.Response.Status.NOT_FOUND, "No edge with id " + id + " found in graph");
+ }
+ }
public Vertex getVertex(String id, String type, String version, String txId) throws CrudException {
String url = baseObjectUrl + "/" + id + "?transactionId=" + txId;
if (!vert.getType().equalsIgnoreCase(type)) {
// We didn't find a vertex with the supplied type, so just throw an
// exception.
- throw new CrudException("No vertex with id " + id + "and type " + type + " found in graph",
+ throw new CrudException("No vertex with id " + id + " and type " + type + " found in graph",
javax.ws.rs.core.Response.Status.NOT_FOUND);
}
return vert;
}
// https://stackoverflow.com/questions/26942330/convert-mapstring-string-to-listnamevaluepair-is-this-the-most-efficient
- private List<NameValuePair> convertToNameValuePair(String k, HashSet<String> values) {
+ private List<NameValuePair> convertToNameValuePair(String k, Set<String> values) {
List<NameValuePair> nvpList = new ArrayList<>(values.size());
values.forEach((v) -> nvpList.add(new BasicNameValuePair(k, v)));
Code Review / aai / gizmo.git / blobdiff