import org.apache.http.message.BasicNameValuePair;
import org.eclipse.jetty.util.security.Password;
import org.onap.aai.cl.mdc.MdcContext;
-import org.onap.aai.logging.LoggingContext;
import org.onap.aai.restclient.client.OperationResult;
import org.onap.aai.restclient.client.RestClient;
import org.onap.aai.restclient.enums.RestAuthenticationMode;
public ChampDao(String champUrl, String certPassword) {
try {
+ String deobfuscatedCertPassword = certPassword.startsWith("OBF:")?Password.deobfuscate(certPassword):certPassword;
client = new RestClient().authenticationMode(RestAuthenticationMode.SSL_CERT).validateServerHostname(false)
.validateServerCertChain(false).clientCertFile(CrudServiceConstants.CRD_CHAMP_AUTH_FILE)
- .clientCertPassword(Password.deobfuscate(certPassword));
+ .clientCertPassword(deobfuscatedCertPassword);
baseObjectUrl = champUrl + OBJECT_SUB_URL;
baseRelationshipUrl = champUrl + RELATIONSHIP_SUB_URL;
@Override
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);
+ filter.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
List<NameValuePair> queryParams = convertToNameValuePair(filter);
queryParams.addAll(convertToNameValuePair("properties", properties));
// Add the aai_node_type so that AAI can read the data created by gizmo
// TODO: This probably shouldn't be here
- properties.put(org.onap.schema.validation.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
+ properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
Vertex.Builder insertVertexBuilder = new Vertex.Builder(type);
properties.forEach(insertVertexBuilder::property);
// Add the aai_node_type so that AAI can read the data created by gizmo
// TODO: This probably shouldn't be here
- properties.put(org.onap.schema.validation.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
+ properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
Vertex.Builder insertVertexBuilder = new Vertex.Builder(type);
insertVertexBuilder.id(id);
String url = baseTransactionUrl + "/" + id;
Map<String, List<String>> headers = new HashMap<>();
headers.put(HEADER_FROM_APP, Arrays.asList("Gizmo"));
- headers.put(HEADER_TRANS_ID, Arrays.asList(MDC.get(LoggingContext.LoggingField.REQUEST_ID.toString())));
+ headers.put(HEADER_TRANS_ID, Arrays.asList(MDC.get(MdcContext.MDC_REQUEST_ID)));
OperationResult getResult = client.get(url, headers, MediaType.APPLICATION_JSON_TYPE);
// Add the aai_node_type so that AAI can read the data created by gizmo
// TODO: This probably shouldn't be here
- properties.put(org.onap.schema.validation.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
+ properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
Vertex.Builder insertVertexBuilder = new Vertex.Builder(type);
properties.forEach(insertVertexBuilder::property);
// Add the aai_node_type so that AAI can read the data created by gizmo
// TODO: This probably shouldn't be here
- properties.put(org.onap.schema.validation.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
+ properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type);
Vertex.Builder insertVertexBuilder = new Vertex.Builder(type);
insertVertexBuilder.id(id);
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;