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/07/05 19:04:58 UTC

[airavata-data-lake] branch master updated (5f1a867 -> d85ae90)

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git.


    from 5f1a867  Merge pull request #12 from isururanawaka/workflow_merge
     new 1212f69  imporve data listner and orchestrator
     new 90f2ae2  Data orchestrator outbound event processor saves entites in DRMS
     new d85ae90  Merge pull request #13 from isururanawaka/workflow_merge

The 73 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/dist/conf/config.yml                  |  13 +-
 .../file/client/model/Configuration.java           |  72 +++--
 .../file/client/watcher/FileWatcher.java           |  15 +-
 .../src/main/resources/config.yml                  |  13 +-
 .../messaging/model/NotificationEvent.java         |  68 +++--
 .../model/NotificationEventDeserializer.java       |  13 +-
 .../model/NotificationEventSerializer.java         |   7 +-
 .../persistance/DataOrchestratorEntity.java        | 116 +++++--
 .../DataOrchestratorEventRepository.java           |   8 +
 .../registry/persistance/EntityStatus.java         |   9 -
 .../registry/persistance/EventStatus.java          |  11 +
 .../data-orchestrator-api-server/pom.xml           |  11 +
 .../datalake/orchestrator/Configuration.java       |  50 ++--
 .../handlers/OrchestratorEventHandler.java         |  18 +-
 .../processor/InboundEventProcessor.java           | 132 ++++++--
 .../processor/OutboundEventProcessor.java          | 155 ++++++----
 .../src/main/resources/application.properties      |   4 +-
 .../src/main/resources/config.yml                  |  10 +-
 .../drms/api/handlers/ResourceServiceHandler.java  |   6 +-
 .../handlers/StoragePreferenceServiceHandler.java  |   4 +-
 metadata-service/data-builders/pom.xml             |  20 --
 metadata-service/db-rest-proxy/Dockerfile          |   3 -
 metadata-service/db-rest-proxy/pom.xml             |  16 -
 .../db-rest-proxy/src/main/resources/README.MD     |   7 -
 .../db-rest-proxy/src/main/resources/envoy.yaml    |  48 ---
 .../db-rest-proxy/src/main/resources/metadata.pb   | Bin 19283 -> 0 bytes
 metadata-service/db-service/client/pom.xml         |  28 --
 .../metadata/clients/MetadataServiceClient.java    |  35 ---
 .../clients/MetadataServiceClientBuilder.java      |  12 -
 .../airavata/datalake/metadata/clients/Test.java   | 332 ---------------------
 metadata-service/db-service/pom.xml                |  28 --
 metadata-service/db-service/server/pom.xml         |  69 -----
 .../airavata/datalake/metadata/AppConfig.java      | 114 -------
 .../datalake/metadata/Neo4JServiceInitializer.java |  16 -
 .../datalake/metadata/XmlConfiguration.java        |   9 -
 .../datalake/metadata/backend/Connector.java       |  10 -
 .../airavata/datalake/metadata/backend/Person.java |  72 -----
 .../metadata/backend/neo4j/Neo4JConnector.java     |  53 ----
 .../neo4j/curd/operators/CustomNodeService.java    |   8 -
 .../neo4j/curd/operators/GenericService.java       | 100 -------
 .../backend/neo4j/curd/operators/GroupService.java |   5 -
 .../neo4j/curd/operators/GroupServiceImpl.java     |  43 ---
 .../neo4j/curd/operators/ResourceService.java      |  14 -
 .../neo4j/curd/operators/ResourceServiceImpl.java  |  93 ------
 .../neo4j/curd/operators/SearchOperator.java       |  33 --
 .../backend/neo4j/curd/operators/Service.java      |  32 --
 .../neo4j/curd/operators/TenantService.java        |   6 -
 .../neo4j/curd/operators/TenantServiceImpl.java    |  48 ---
 .../backend/neo4j/curd/operators/UserService.java  |   5 -
 .../neo4j/curd/operators/UserServiceImpl.java      |  44 ---
 .../metadata/backend/neo4j/model/nodes/Entity.java | 133 ---------
 .../metadata/backend/neo4j/model/nodes/Group.java  | 213 -------------
 .../backend/neo4j/model/nodes/Resource.java        | 211 -------------
 .../metadata/backend/neo4j/model/nodes/Role.java   |  37 ---
 .../backend/neo4j/model/nodes/ServiceAccount.java  |  29 --
 .../metadata/backend/neo4j/model/nodes/Tenant.java | 130 --------
 .../metadata/backend/neo4j/model/nodes/User.java   | 137 ---------
 .../backend/neo4j/model/relationships/Belongs.java |   9 -
 .../neo4j/model/relationships/ConfiguredWith.java  |   7 -
 .../backend/neo4j/model/relationships/Has.java     |   9 -
 .../neo4j/model/relationships/HasAccess.java       |  23 --
 .../neo4j/model/relationships/HasChildGroup.java   |   9 -
 .../model/relationships/HasChildResource.java      |   8 -
 .../neo4j/model/relationships/HasChildUser.java    |  19 --
 .../neo4j/model/relationships/HasParentGroup.java  |  19 --
 .../model/relationships/HasParentResource.java     |   7 -
 .../backend/neo4j/model/relationships/HasRole.java |   8 -
 .../neo4j/model/relationships/MemberOf.java        |  19 --
 .../neo4j/model/relationships/Relationship.java    |  81 -----
 .../neo4j/model/relationships/SharedWith.java      |  25 --
 .../metadata/exceptions/DBConnectorException.java  |  10 -
 .../metadata/handlers/GroupServiceHandler.java     |  93 ------
 .../metadata/handlers/ResourceServiceHandler.java  | 151 ----------
 .../metadata/handlers/TenantServiceHandler.java    | 142 ---------
 .../metadata/handlers/UserServiceHandler.java      |  67 -----
 .../metadata/interceptors/Authenticator.java       | 114 -------
 .../interceptors/InterceptorPipelineExecutor.java  |  69 -----
 .../metadata/interceptors/ServiceInterceptor.java  |   7 -
 .../datalake/metadata/mergers/GenericMerger.java   |  51 ----
 .../airavata/datalake/metadata/mergers/Merger.java |   9 -
 .../metadata/parsers/ExecutionContext.java         |  21 --
 .../datalake/metadata/parsers/GroupParser.java     |  97 ------
 .../airavata/datalake/metadata/parsers/Parser.java |  16 -
 .../datalake/metadata/parsers/ResourceParser.java  | 135 ---------
 .../datalake/metadata/parsers/TenantParser.java    | 123 --------
 .../datalake/metadata/parsers/UserParser.java      |  53 ----
 .../src/main/resources/application.properties      |  27 --
 .../src/main/resources/applicationContext.xml      |  12 -
 metadata-service/db-service/stub/pom.xml           |  76 -----
 .../stub/src/main/proto/common/Common.proto        |  18 --
 .../stub/src/main/proto/group/Group.proto          |  88 ------
 .../stub/src/main/proto/resource/Resource.proto    | 118 --------
 .../stub/src/main/proto/tenant/Tenant.proto        |  71 -----
 .../db-service/stub/src/main/proto/user/User.proto |  63 ----
 metadata-service/pom.xml                           |  20 --
 95 files changed, 481 insertions(+), 4341 deletions(-)
 delete mode 100644 data-orchestrator/data-orchestrator-registry/src/main/java/org/apache/airavata/datalake/orchestrator/registry/persistance/EntityStatus.java
 create mode 100644 data-orchestrator/data-orchestrator-registry/src/main/java/org/apache/airavata/datalake/orchestrator/registry/persistance/EventStatus.java
 delete mode 100644 metadata-service/data-builders/pom.xml
 delete mode 100644 metadata-service/db-rest-proxy/Dockerfile
 delete mode 100644 metadata-service/db-rest-proxy/pom.xml
 delete mode 100644 metadata-service/db-rest-proxy/src/main/resources/README.MD
 delete mode 100644 metadata-service/db-rest-proxy/src/main/resources/envoy.yaml
 delete mode 100644 metadata-service/db-rest-proxy/src/main/resources/metadata.pb
 delete mode 100644 metadata-service/db-service/client/pom.xml
 delete mode 100644 metadata-service/db-service/client/src/main/java/org/apache/airavata/datalake/metadata/clients/MetadataServiceClient.java
 delete mode 100644 metadata-service/db-service/client/src/main/java/org/apache/airavata/datalake/metadata/clients/MetadataServiceClientBuilder.java
 delete mode 100644 metadata-service/db-service/client/src/main/java/org/apache/airavata/datalake/metadata/clients/Test.java
 delete mode 100644 metadata-service/db-service/pom.xml
 delete mode 100644 metadata-service/db-service/server/pom.xml
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/AppConfig.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/Neo4JServiceInitializer.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/XmlConfiguration.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/Connector.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/Person.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/Neo4JConnector.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/CustomNodeService.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/GenericService.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/GroupService.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/GroupServiceImpl.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/ResourceService.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/ResourceServiceImpl.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/SearchOperator.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/Service.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/TenantService.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/TenantServiceImpl.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/UserService.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/curd/operators/UserServiceImpl.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/nodes/Entity.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/nodes/Group.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/nodes/Resource.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/nodes/Role.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/nodes/ServiceAccount.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/nodes/Tenant.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/nodes/User.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/Belongs.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/ConfiguredWith.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/Has.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/HasAccess.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/HasChildGroup.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/HasChildResource.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/HasChildUser.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/HasParentGroup.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/HasParentResource.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/HasRole.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/MemberOf.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/Relationship.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/backend/neo4j/model/relationships/SharedWith.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/exceptions/DBConnectorException.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/handlers/GroupServiceHandler.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/handlers/ResourceServiceHandler.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/handlers/TenantServiceHandler.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/handlers/UserServiceHandler.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/interceptors/Authenticator.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/interceptors/InterceptorPipelineExecutor.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/interceptors/ServiceInterceptor.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/mergers/GenericMerger.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/mergers/Merger.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/parsers/ExecutionContext.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/parsers/GroupParser.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/parsers/Parser.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/parsers/ResourceParser.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/parsers/TenantParser.java
 delete mode 100644 metadata-service/db-service/server/src/main/java/org/apache/airavata/datalake/metadata/parsers/UserParser.java
 delete mode 100644 metadata-service/db-service/server/src/main/resources/application.properties
 delete mode 100644 metadata-service/db-service/server/src/main/resources/applicationContext.xml
 delete mode 100644 metadata-service/db-service/stub/pom.xml
 delete mode 100644 metadata-service/db-service/stub/src/main/proto/common/Common.proto
 delete mode 100644 metadata-service/db-service/stub/src/main/proto/group/Group.proto
 delete mode 100644 metadata-service/db-service/stub/src/main/proto/resource/Resource.proto
 delete mode 100644 metadata-service/db-service/stub/src/main/proto/tenant/Tenant.proto
 delete mode 100644 metadata-service/db-service/stub/src/main/proto/user/User.proto
 delete mode 100644 metadata-service/pom.xml