diff options
Diffstat (limited to 'src/main/java/org/onap/crud')
4 files changed, 19 insertions, 11 deletions
diff --git a/src/main/java/org/onap/crud/logging/CrudServiceMsgs.java b/src/main/java/org/onap/crud/logging/CrudServiceMsgs.java index 72883a9..2b669ae 100644 --- a/src/main/java/org/onap/crud/logging/CrudServiceMsgs.java +++ b/src/main/java/org/onap/crud/logging/CrudServiceMsgs.java @@ -46,6 +46,14 @@ public enum CrudServiceMsgs implements LogMessageEnum { LOADED_OXM_FILE, /** + * Successfully loaded Edge Properties Files: {0} + * + * <p> + * Arguments: {0} = oxm filename + */ + LOADED_DB_RULE_FILE, + + /** * Unable to load OXM schema: {0} * * <p> diff --git a/src/main/java/org/onap/crud/parser/CrudResponseBuilder.java b/src/main/java/org/onap/crud/parser/CrudResponseBuilder.java index e28f7a7..0c66d81 100644 --- a/src/main/java/org/onap/crud/parser/CrudResponseBuilder.java +++ b/src/main/java/org/onap/crud/parser/CrudResponseBuilder.java @@ -34,7 +34,7 @@ import org.onap.crud.exception.CrudException; import org.onap.crud.service.BulkPayload; import org.onap.crud.service.EdgePayload; import org.onap.crud.service.VertexPayload; -import org.onap.schema.RelationshipSchemaLoader; +import org.onap.schema.EdgeRulesLoader; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -120,7 +120,7 @@ public class CrudResponseBuilder { EdgePayload inEdge = new EdgePayload(); inEdge.setId(e.getId().get()); inEdge.setType(e.getType()); - inEdge.setUrl(URL_BASE + "relationships/" + RelationshipSchemaLoader.getLatestSchemaVersion() + "/" + inEdge.setUrl(URL_BASE + "relationships/" + EdgeRulesLoader.getLatestSchemaVersion() + "/" + e.getType() + "/" + e.getId().get()); inEdge.setSource(URL_BASE + version + "/" + e.getSource().getType() + "/" + e.getSource().getId().get()); @@ -129,7 +129,7 @@ public class CrudResponseBuilder { EdgePayload outEdge = new EdgePayload(); outEdge.setId(e.getId().get()); outEdge.setType(e.getType()); - outEdge.setUrl(URL_BASE + "relationships/" + RelationshipSchemaLoader.getLatestSchemaVersion() + "/" + outEdge.setUrl(URL_BASE + "relationships/" + EdgeRulesLoader.getLatestSchemaVersion() + "/" + e.getType() + "/" + e.getId().get()); outEdge.setTarget(URL_BASE + version + "/" + e.getTarget().getType() + "/" + e.getTarget().getId().get()); outEdges.add(outEdge); diff --git a/src/main/java/org/onap/crud/service/AaiResourceService.java b/src/main/java/org/onap/crud/service/AaiResourceService.java index 6dfbab7..c9a5805 100644 --- a/src/main/java/org/onap/crud/service/AaiResourceService.java +++ b/src/main/java/org/onap/crud/service/AaiResourceService.java @@ -56,7 +56,7 @@ import org.onap.crud.logging.CrudServiceMsgs; import org.onap.crud.logging.LoggingUtil;
import org.onap.crud.service.CrudRestService.Action;
import org.onap.crud.util.CrudServiceConstants;
-import org.onap.schema.RelationshipSchemaLoader;
+import org.onap.schema.EdgeRulesLoader;
import org.onap.schema.RelationshipSchemaValidator;
import org.slf4j.MDC;
@@ -161,11 +161,11 @@ public class AaiResourceService { payload = applyEdgeRulesToPayload(payload);
if(logger.isDebugEnabled()) {
- logger.debug("Creating AAI edge using version " + RelationshipSchemaLoader.getLatestSchemaVersion() );
+ logger.debug("Creating AAI edge using version " + EdgeRulesLoader.getLatestSchemaVersion() );
}
// Now, create our edge in the graph store.
- String result = graphDataService.addEdge(RelationshipSchemaLoader.getLatestSchemaVersion(), type, payload);
+ String result = graphDataService.addEdge(EdgeRulesLoader.getLatestSchemaVersion(), type, payload);
response = Response.status(Status.CREATED).entity(result).type(mediaType).build();
} catch (CrudException e) {
@@ -229,7 +229,7 @@ public class AaiResourceService { payload = applyEdgeRulesToPayload(payload);
// Now, create our edge in the graph store.
- String result = graphDataService.addEdge(RelationshipSchemaLoader.getLatestSchemaVersion(), payload.getType(), payload);
+ String result = graphDataService.addEdge(EdgeRulesLoader.getLatestSchemaVersion(), payload.getType(), payload);
response = Response.status(Status.CREATED).entity(result).type(mediaType).build();
} catch (CrudException ce) {
@@ -304,10 +304,10 @@ public class AaiResourceService { String result;
if (headers.getRequestHeaders().getFirst(HTTP_PATCH_METHOD_OVERRIDE) != null &&
headers.getRequestHeaders().getFirst(HTTP_PATCH_METHOD_OVERRIDE).equalsIgnoreCase("PATCH")) {
- result = graphDataService.patchEdge(RelationshipSchemaLoader.getLatestSchemaVersion(), id, type, payload);
+ result = graphDataService.patchEdge(EdgeRulesLoader.getLatestSchemaVersion(), id, type, payload);
} else {
- result = graphDataService.updateEdge(RelationshipSchemaLoader.getLatestSchemaVersion(), id, type, payload);
+ result = graphDataService.updateEdge(EdgeRulesLoader.getLatestSchemaVersion(), id, type, payload);
}
response = Response.status(Status.OK).entity(result).type(mediaType).build();
diff --git a/src/main/java/org/onap/crud/util/CrudServiceUtil.java b/src/main/java/org/onap/crud/util/CrudServiceUtil.java index 4d108f2..6c251bc 100644 --- a/src/main/java/org/onap/crud/util/CrudServiceUtil.java +++ b/src/main/java/org/onap/crud/util/CrudServiceUtil.java @@ -23,7 +23,7 @@ package org.onap.crud.util; import org.onap.aai.db.props.AAIProperties; import org.onap.crud.exception.CrudException; import org.onap.schema.OxmModelLoader; -import org.onap.schema.RelationshipSchemaLoader; +import org.onap.schema.EdgeRulesLoader; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -77,10 +77,10 @@ public class CrudServiceUtil { // load the schemas try { OxmModelLoader.loadModels(); + EdgeRulesLoader.loadModels (); } catch (Exception e) { throw new CrudException(e); } - RelationshipSchemaLoader.loadModels(); } /** |