You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/05/13 12:25:56 UTC
[airavata-data-lake] 20/30: Genric merger
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
commit c08549b0fc742c3c105c09e08bb9f21f5594b39b
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Thu Mar 25 12:49:46 2021 -0400
Genric merger
---
.../java/org/apache/airavata/datalake/metadata/clients/Test.java | 1 -
.../metadata/backend/neo4j/curd/operators/TenantServiceImpl.java | 1 -
.../org/apache/airavata/datalake/metadata/mergers/GenericMerger.java | 5 +++++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/metadata-service/db-service/client/src/main/java/org/apache/airavata/datalake/metadata/clients/Test.java b/metadata-service/db-service/client/src/main/java/org/apache/airavata/datalake/metadata/clients/Test.java
index b70c246..b2705ad 100644
--- a/metadata-service/db-service/client/src/main/java/org/apache/airavata/datalake/metadata/clients/Test.java
+++ b/metadata-service/db-service/client/src/main/java/org/apache/airavata/datalake/metadata/clients/Test.java
@@ -125,7 +125,6 @@ public class Test {
tenant = tenant.toBuilder().setDomain("testing.com").build();
-
TenantMetadataAPIRequest tenantMetadataAPIRequest = TenantMetadataAPIRequest
.newBuilder()
.setTenant(tenant)
diff --git a/metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/TenantServiceImpl.java b/metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/TenantServiceImpl.java
index f727997..63a1362 100644
--- a/metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/TenantServiceImpl.java
+++ b/metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/TenantServiceImpl.java
@@ -1,7 +1,6 @@
package org.apache.airavata.datalake.metadata.backend.neo4j.curd.operators;
import org.apache.airavata.datalake.metadata.backend.Connector;
-import org.apache.airavata.datalake.metadata.backend.neo4j.model.nodes.Entity;
import org.apache.airavata.datalake.metadata.backend.neo4j.model.nodes.Tenant;
import org.neo4j.ogm.cypher.ComparisonOperator;
diff --git a/metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/mergers/GenericMerger.java b/metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/mergers/GenericMerger.java
index c3a003c..65a4d3b 100644
--- a/metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/mergers/GenericMerger.java
+++ b/metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/mergers/GenericMerger.java
@@ -4,11 +4,14 @@ import org.apache.airavata.datalake.metadata.backend.Connector;
import org.apache.airavata.datalake.metadata.backend.neo4j.curd.operators.*;
import org.apache.airavata.datalake.metadata.backend.neo4j.model.nodes.*;
import org.apache.airavata.datalake.metadata.parsers.ExecutionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.List;
public class GenericMerger implements Merger {
+ private static final Logger LOGGER = LoggerFactory.getLogger(GenericMerger.class);
private static Connector connector;
@@ -20,9 +23,11 @@ public class GenericMerger implements Merger {
public Entity merge(Entity entity) {
ExecutionContext executionContext = entity.getExecutionContext();
executionContext.getNeo4JConvertedModels().values().forEach(en -> {
+ LOGGER.info("Entity name " + ((Entity) en).getSearchableId());
List<Entity> entityList = genericService((Entity) en).find(en);
if (!entityList.isEmpty()) {
Entity exEnt = entityList.get(0);
+ LOGGER.info("selected entity name " + exEnt.getSearchableId());
((Entity) en).setId(exEnt.getId());
}
});