Skip to content
Permalink
Browse files
Minor bug fix in resource create
  • Loading branch information
isururanawaka committed Sep 8, 2021
1 parent 5580b40 commit bb0c58e0162ff4bf0243d0402114a6cf3c3f2749
Showing 2 changed files with 17 additions and 12 deletions.
@@ -153,6 +153,8 @@ public void createResource(ResourceCreateRequest request, StreamObserver<Resourc
serializedMap.put("entityType", exEntity.get().getType());
serializedMap.put("lastModifiedTime", exEntity.get().getCreatedAt());
serializedMap.put("owner", exEntity.get().getOwnerId());
serializedMap.put("firstName", callUser.getFirstName());
serializedMap.put("lastName", callUser.getLastName());

if (serializedMap.containsKey("properties") && serializedMap.get("properties") instanceof List) {
List propertiesList = (List) serializedMap.get("properties");
@@ -164,6 +166,9 @@ public void createResource(ResourceCreateRequest request, StreamObserver<Resourc
serializedMap.remove("properties");
if (!parentId.isEmpty()) {
String parentLabel = request.getResource().getPropertiesMap().get("PARENT_TYPE");
if (parentLabel == null || parentLabel.isEmpty()) {
parentLabel = request.getResource().getPropertiesMap().get("parentType");
}
this.neo4JConnector.mergeNodesWithParentChildRelationShip(serializedMap, new HashMap<>(),
request.getResource().getType(), parentLabel, callUser.getUsername(), entityId,
parentId, callUser.getTenantId());
@@ -20,8 +20,8 @@ static_resources:
- name: local_service
domains: ["*"]
routes:
- match: { prefix: "/org.apache.airavata.datalake.data.orchestrator.api.stub.notification.NotificationService" }
route: { cluster: grpc-dataorch-service, timeout: { seconds: 60 } }
# - match: { prefix: "/org.apache.airavata.datalake.data.orchestrator.api.stub.notification.NotificationService" }
# route: { cluster: grpc-dataorch-service, timeout: { seconds: 60 } }
- match: { prefix: "/" }
route: { cluster: grpc-drms-service, timeout: { seconds: 60 } }
http_filters:
@@ -48,13 +48,13 @@ static_resources:
- socket_address:
address: host.docker.internal
port_value: 7070
- name: grpc-dataorch-service
connect_timeout: 1.25s
type: logical_dns
lb_policy: round_robin
dns_lookup_family: V4_ONLY
http2_protocol_options: { }
hosts:
- socket_address:
address: host.docker.internal
port_value: 8899
# - name: grpc-dataorch-service
# connect_timeout: 1.25s
# type: logical_dns
# lb_policy: round_robin
# dns_lookup_family: V4_ONLY
# http2_protocol_options: { }
# hosts:
# - socket_address:
# address: host.docker.internal
# port_value: 8899

0 comments on commit bb0c58e

Please sign in to comment.