[airavata-data-lake] branch master updated: Reorganizing MFT Request Handler

[di...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 87df20a  Reorganizing MFT Request Handler
87df20a is described below

commit 87df20aca2a5cf5df284db69d8323d89c663a17b
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Sat Jul 24 10:29:56 2021 -0400

    Reorganizing MFT Request Handler
---
 .../orchestrator/handlers/{ => mft}/MFTRequestHandler.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/MFTRequestHandler.java b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/mft/MFTRequestHandler.java
similarity index 95%
rename from data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/MFTRequestHandler.java
rename to data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/mft/MFTRequestHandler.java
index d6ee3f9..6c3fa6b 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/MFTRequestHandler.java
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/mft/MFTRequestHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.airavata.datalake.orchestrator.handlers;
+package org.apache.airavata.datalake.orchestrator.handlers.mft;
 
 import com.google.protobuf.Struct;
 import io.grpc.ManagedChannel;
@@ -23,7 +23,6 @@ import io.grpc.ManagedChannelBuilder;
 import org.apache.airavata.datalake.drms.DRMSServiceAuthToken;
 import org.apache.airavata.datalake.drms.resource.GenericResource;
 import org.apache.airavata.datalake.drms.storage.*;
-import org.apache.airavata.datalake.orchestrator.handlers.mft.MFTDownloadResponse;
 import org.apache.airavata.mft.api.client.MFTApiClient;
 import org.apache.airavata.mft.api.service.HttpDownloadApiRequest;
 import org.apache.airavata.mft.api.service.HttpDownloadApiResponse;
@@ -36,7 +35,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -60,6 +58,8 @@ public class MFTRequestHandler {
 
     @GetMapping("/mftdownlaod/{resourceid}")
     public MFTDownloadResponse mftDownload(@PathVariable String resourceid) throws Exception {
+
+        logger.info("MFT download request to resource {}", resourceid);
         MFTApiServiceGrpc.MFTApiServiceBlockingStub mftClient = MFTApiClient.buildClient(mftHost, mftPort);
 
         ManagedChannel channel = ManagedChannelBuilder.forAddress(drmsHost, drmsPort).usePlaintext().build();
@@ -138,8 +138,8 @@ public class MFTRequestHandler {
 
             CustosClientProvider custosClientProvider = new CustosClientProvider.Builder().setServerHost("custos.scigap.org")
                     .setServerPort(31499)
-                    .setClientId("custos-whedmgamitu357p4wuke-10002708")
-                    .setClientSec("mrMdl86Ia1H94cikW7CvHoh7L0ASNXQVt2aRzSIj").build();
+                    .setClientId("ccustos-ii8g0cfwsz6ruwezykn9-10002640")
+                    .setClientSec("OxXECszt9dL4lHJQyL444UOU0lKN317D51ez067R").build();
 
             IdentityManagementClient identityManagementClient = custosClientProvider.getIdentityManagementClient();
             Struct struct = identityManagementClient.getToken(null, null, "isjarana@iu.edu", "IJR@circ@1", null, "password");