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 e0d87c1bd01dc147a7534c51bb144d59f6e86f82 Author: DImuthuUpe <[email protected]> AuthorDate: Mon Mar 22 23:26:36 2021 -0400 Creating the grpc service handlers for DRMS API --- .gitignore | 2 + data-resource-management-service/drms-api/pom.xml | 44 +++++++++++++++++++++- .../java/org/apache/airavata/drms/api/Config.java | 7 ++++ .../apache/airavata/drms/api/DRMSApiRunner.java | 13 +++++++ .../drms/api/handlers/ResourceServiceHandler.java | 34 +++++++++++++++++ .../handlers/StoragePreferenceServiceHandler.java | 35 +++++++++++++++++ .../drms/api/handlers/StorageServiceHandler.java | 35 +++++++++++++++++ data-resource-management-service/drms-core/pom.xml | 12 ++++++ metadata-service/pom.xml | 14 ------- pom.xml | 8 ++++ 10 files changed, 189 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 66ff5f6..cb794d5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ data-orchestrator/data-orchestrator-api/target /data-resource-management-service/drms-api/drms-api.iml /data-resource-management-service/drms-core/drms-core.iml /metadata-service/metadata-service.iml +/metadata-service/data-builders/data-builders.iml +/metadata-service/db-service/db-service.iml diff --git a/data-resource-management-service/drms-api/pom.xml b/data-resource-management-service/drms-api/pom.xml index 2839b3b..a6d5805 100644 --- a/data-resource-management-service/drms-api/pom.xml +++ b/data-resource-management-service/drms-api/pom.xml @@ -11,5 +11,47 @@ <artifactId>drms-api</artifactId> - + <dependencies> + <dependency> + <groupId>org.apache.airavata.data.lake</groupId> + <artifactId>drms-stubs</artifactId> + <version>0.01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.airavata.data.lake</groupId> + <artifactId>stub</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.java}</version> + </dependency> + <dependency> + <groupId>io.github.lognet</groupId> + <artifactId>grpc-spring-boot-starter</artifactId> + <version>${grpc.spring.boot}</version> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <version>2.4.2</version> + </dependency> + <dependency> + <groupId>net.sf.dozer</groupId> + <artifactId>dozer</artifactId> + <version>${dozer}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-services</artifactId> + <version>1.25.0</version> + </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/Config.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/Config.java new file mode 100644 index 0000000..494a21e --- /dev/null +++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/Config.java @@ -0,0 +1,7 @@ +package org.apache.airavata.drms.api; + +import org.springframework.context.annotation.Configuration; + +@Configuration +public class Config { +} diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/DRMSApiRunner.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/DRMSApiRunner.java new file mode 100644 index 0000000..69a2203 --- /dev/null +++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/DRMSApiRunner.java @@ -0,0 +1,13 @@ +package org.apache.airavata.drms.api; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@ComponentScan(basePackages = {"org.apache.airavata.drms"}) +@SpringBootApplication +public class DRMSApiRunner { + public static void main(String[] args) { + SpringApplication.run(DRMSApiRunner.class, args); + } +} diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java new file mode 100644 index 0000000..ecc26a4 --- /dev/null +++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java @@ -0,0 +1,34 @@ +package org.apache.airavata.drms.api.handlers; + +import com.google.protobuf.Empty; +import io.grpc.stub.StreamObserver; +import org.apache.airavata.datalake.drms.storage.*; +import org.lognet.springboot.grpc.GRpcService; + +@GRpcService +public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceImplBase { + @Override + public void fetchResource(ResourceFetchRequest request, StreamObserver<ResourceFetchResponse> responseObserver) { + super.fetchResource(request, responseObserver); + } + + @Override + public void createResource(ResourceCreateRequest request, StreamObserver<ResourceCreateResponse> responseObserver) { + super.createResource(request, responseObserver); + } + + @Override + public void updateResource(ResourceUpdateRequest request, StreamObserver<ResourceUpdateResponse> responseObserver) { + super.updateResource(request, responseObserver); + } + + @Override + public void deletePreferenceStorage(ResourceDeleteRequest request, StreamObserver<Empty> responseObserver) { + super.deletePreferenceStorage(request, responseObserver); + } + + @Override + public void searchResource(ResourceSearchRequest request, StreamObserver<ResourceSearchResponse> responseObserver) { + super.searchResource(request, responseObserver); + } +} diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java new file mode 100644 index 0000000..739921d --- /dev/null +++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java @@ -0,0 +1,35 @@ +package org.apache.airavata.drms.api.handlers; + +import com.google.protobuf.Empty; +import io.grpc.stub.StreamObserver; +import org.apache.airavata.datalake.drms.storage.*; +import org.lognet.springboot.grpc.GRpcService; + +@GRpcService +public class StoragePreferenceServiceHandler extends StoragePreferenceServiceGrpc.StoragePreferenceServiceImplBase { + + @Override + public void fetchStoragePreference(StoragePreferenceFetchRequest request, StreamObserver<StoragePreferenceFetchResponse> responseObserver) { + super.fetchStoragePreference(request, responseObserver); + } + + @Override + public void createStoragePreference(StoragePreferenceCreateRequest request, StreamObserver<StoragePreferenceCreateResponse> responseObserver) { + super.createStoragePreference(request, responseObserver); + } + + @Override + public void updateStoragePreference(StoragePreferenceUpdateRequest request, StreamObserver<StoragePreferenceUpdateResponse> responseObserver) { + super.updateStoragePreference(request, responseObserver); + } + + @Override + public void deletePreferenceStorage(StoragePreferenceDeleteRequest request, StreamObserver<Empty> responseObserver) { + super.deletePreferenceStorage(request, responseObserver); + } + + @Override + public void searchStoragePreference(StoragePreferenceSearchRequest request, StreamObserver<StoragePreferenceSearchResponse> responseObserver) { + super.searchStoragePreference(request, responseObserver); + } +} diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java new file mode 100644 index 0000000..47c6511 --- /dev/null +++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java @@ -0,0 +1,35 @@ +package org.apache.airavata.drms.api.handlers; + +import com.google.protobuf.Empty; +import io.grpc.stub.StreamObserver; +import org.apache.airavata.datalake.drms.storage.*; +import org.lognet.springboot.grpc.GRpcService; + +@GRpcService +public class StorageServiceHandler extends StorageServiceGrpc.StorageServiceImplBase { + + @Override + public void fetchStorage(StorageFetchRequest request, StreamObserver<StorageFetchResponse> responseObserver) { + super.fetchStorage(request, responseObserver); + } + + @Override + public void createStorage(StorageCreateRequest request, StreamObserver<StorageCreateResponse> responseObserver) { + super.createStorage(request, responseObserver); + } + + @Override + public void updateStorage(StorageUpdateRequest request, StreamObserver<StorageUpdateResponse> responseObserver) { + super.updateStorage(request, responseObserver); + } + + @Override + public void deleteStorage(StorageDeleteRequest request, StreamObserver<Empty> responseObserver) { + super.deleteStorage(request, responseObserver); + } + + @Override + public void searchStorage(StorageSearchRequest request, StreamObserver<StorageSearchResponse> responseObserver) { + super.searchStorage(request, responseObserver); + } +} diff --git a/data-resource-management-service/drms-core/pom.xml b/data-resource-management-service/drms-core/pom.xml index 385d937..497ac63 100644 --- a/data-resource-management-service/drms-core/pom.xml +++ b/data-resource-management-service/drms-core/pom.xml @@ -11,5 +11,17 @@ <artifactId>drms-core</artifactId> + <dependencies> + <dependency> + <groupId>org.neo4j</groupId> + <artifactId>neo4j-ogm-core</artifactId> + <version>3.2.20</version> + </dependency> + <dependency> + <groupId>org.neo4j</groupId> + <artifactId>neo4j-ogm-bolt-driver</artifactId> + <version>3.2.20</version> + </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/metadata-service/pom.xml b/metadata-service/pom.xml index 67a3562..1ea277f 100644 --- a/metadata-service/pom.xml +++ b/metadata-service/pom.xml @@ -55,18 +55,4 @@ <version>${dozer}</version> </dependency> </dependencies> - - - <properties> - <protobuf.maven.plugin>0.5.1</protobuf.maven.plugin> - <os.maven.plugin>1.5.0.Final</os.maven.plugin> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> - <protobuf.java>3.10.0</protobuf.java> - <grpc.spring.boot>3.5.1</grpc.spring.boot> - <spring.boot.data.jpa>2.2.1.RELEASE</spring.boot.data.jpa> - <dozer>5.5.1</dozer> - </properties> - - </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index d1ff817..bb2d693 100644 --- a/pom.xml +++ b/pom.xml @@ -82,10 +82,18 @@ <jmockit.version>1.8</jmockit.version> <java.version>11</java.version> <javax.annotation.version>1.3.2</javax.annotation.version> + <maven.compiler.plugin>3.8.1</maven.compiler.plugin> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> + <!-- Grpc / protobuf dependencies --> <protobuf.maven.plugin>0.5.1</protobuf.maven.plugin> <os.maven.plugin>1.5.0.Final</os.maven.plugin> + <protobuf.java>3.10.0</protobuf.java> + <grpc.spring.boot>3.5.1</grpc.spring.boot> + <spring.boot.data.jpa>2.2.1.RELEASE</spring.boot.data.jpa> + <dozer>5.5.1</dozer> <!-- Spring dependencies --> <spring.boot.version>2.4.2</spring.boot.version>
