diff options
author | 2018-07-19 16:03:44 -0400 | |
---|---|---|
committer | 2018-07-19 16:08:20 -0400 | |
commit | 3bc6a702f2d3d8710c7aaa94cdc8c0ccf3deb759 (patch) | |
tree | 9703ebe15777acc73ad118520f6b1a219f60e107 /src/main/java/org/onap/crud/service/CrudRestService.java | |
parent | 194adee686ebb90488f739f2c637f6cb3def94d5 (diff) |
Auto-resolve edge type
Auto-resolve edge type based on EdgeRules file.
Change-Id: Ic6de47f5172bc410efcdd5f08c1ea5c4f822610e
Issue-ID: AAI-1396
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/crud/service/CrudRestService.java')
-rw-r--r-- | src/main/java/org/onap/crud/service/CrudRestService.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/org/onap/crud/service/CrudRestService.java b/src/main/java/org/onap/crud/service/CrudRestService.java index 25ab43a..3cfc657 100644 --- a/src/main/java/org/onap/crud/service/CrudRestService.java +++ b/src/main/java/org/onap/crud/service/CrudRestService.java @@ -504,10 +504,6 @@ public class CrudRestService { EdgePayload edgePayload = EdgePayload.fromJson(item.getValue().getAsJsonObject().toString()); - if (edgePayload.getType() == null) { - throw new CrudException("Edge Type cannot be null for: " + item.getKey(), Status.BAD_REQUEST); - } - if (!opr.getKey().equalsIgnoreCase("operation")) { throw new CrudException("operation missing in item: " + item.getKey(), Status.BAD_REQUEST); } @@ -697,8 +693,9 @@ public class CrudRestService { } if (payload.getType() == null || payload.getType().isEmpty()) { - throw new CrudException("Missing Edge Type ", Status.BAD_REQUEST); + payload.setType(CrudServiceUtil.determineEdgeType(payload, version)); } + ImmutablePair<EntityTag, String> result = graphDataService.addEdge(version, payload.getType(), payload); response = Response.status(Status.CREATED).entity(result.getValue()).tag(result.getKey()).type(mediaType).build(); } else { |