changing execution result object

nevermined-io · Sep 8, 2020 · c059957 · c059957
1 parent ce10cc2
commit c059957
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.keyko.nevermined</groupId>
     <artifactId>api</artifactId>
-    <version>0.3.1</version>
+    <version>0.3.2</version>
     <packaging>jar</packaging>
     <name>Nevermined Data Platform Java SDK</name>
     <url>https://github.com/keyko-io/nevermined-sdk-java</url>

diff --git a/src/main/java/io/keyko/nevermined/api/AssetsAPI.java b/src/main/java/io/keyko/nevermined/api/AssetsAPI.java
@@ -1,6 +1,7 @@
 package io.keyko.nevermined.api;
 
 import io.keyko.nevermined.exceptions.*;
+import io.keyko.nevermined.external.GatewayService;
 import io.keyko.nevermined.models.DDO;
 import io.keyko.nevermined.models.DID;
 import io.keyko.nevermined.models.asset.AssetMetadata;
@@ -255,7 +256,7 @@ public interface AssetsAPI {
      * @return an execution id
      * @throws ServiceException ServiceException
      */
-    String execute(String agreementId, DID did, int index, DID workflowDID) throws ServiceException;
+    GatewayService.ServiceExecutionResult execute(String agreementId, DID did, int index, DID workflowDID) throws ServiceException;
 
     /**
      * Return the owner of the asset.

diff --git a/src/main/java/io/keyko/nevermined/api/impl/AssetsImpl.java b/src/main/java/io/keyko/nevermined/api/impl/AssetsImpl.java
@@ -2,6 +2,7 @@
 
 import io.keyko.nevermined.api.AssetsAPI;
 import io.keyko.nevermined.exceptions.*;
+import io.keyko.nevermined.external.GatewayService;
 import io.keyko.nevermined.manager.AgreementsManager;
 import io.keyko.nevermined.manager.AssetsManager;
 import io.keyko.nevermined.manager.NeverminedManager;
@@ -170,7 +171,7 @@ public List<DID> consumerAssets(String consumerAddress) throws ServiceException
     }
 
     @Override
-    public String execute(String agreementId, DID did, int index, DID workflowDID) throws ServiceException {
+    public GatewayService.ServiceExecutionResult execute(String agreementId, DID did, int index, DID workflowDID) throws ServiceException {
         return neverminedManager.executeComputeService(agreementId, did, index, workflowDID);
     }
 

diff --git a/src/main/java/io/keyko/nevermined/manager/NeverminedManager.java b/src/main/java/io/keyko/nevermined/manager/NeverminedManager.java
@@ -24,7 +24,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.web3j.crypto.CipherException;
-import org.web3j.crypto.Hash;
 import org.web3j.crypto.Keys;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 
@@ -969,7 +968,7 @@ public InputStream consumeBinary(String serviceAgreementId, DID did, int service
      * @return an execution id
      * @throws ServiceException ServiceException
      */
-    public String executeComputeService(String agreementId, DID did, int index, DID workflowDID) throws ServiceException {
+    public GatewayService.ServiceExecutionResult executeComputeService(String agreementId, DID did, int index, DID workflowDID) throws ServiceException {
 
         DDO ddo;
 
@@ -995,7 +994,7 @@ public String executeComputeService(String agreementId, DID did, int index, DID
             if (!result.getOk())
                 throw new ServiceException("There was a problem initializing the execution of the service. HTTP Code: " + result.getCode());
 
-            return result.getExecutionId();
+            return result;
 
         } catch (DDOException e) {
             throw new ServiceException("There was an error resolving the DID ", e);

diff --git a/src/test/java/io/keyko/nevermined/api/AssetsApiIT.java b/src/test/java/io/keyko/nevermined/api/AssetsApiIT.java
@@ -9,6 +9,7 @@
 import io.keyko.nevermined.contracts.EscrowAccessSecretStoreTemplate;
 import io.keyko.nevermined.contracts.TemplateStoreManager;
 import io.keyko.nevermined.exceptions.DDOException;
+import io.keyko.nevermined.external.GatewayService;
 import io.keyko.nevermined.manager.ManagerHelper;
 import io.keyko.nevermined.models.Balance;
 import io.keyko.nevermined.models.DDO;
@@ -313,7 +314,7 @@ public void orderAndExecuteComputeService() throws Exception {
         assertNotNull(orderResult.getServiceAgreementId());
 
         // 5. Execute
-        final String executionId = neverminedAPIConsumer.getAssetsAPI().execute(
+        GatewayService.ServiceExecutionResult executionResult = neverminedAPIConsumer.getAssetsAPI().execute(
                 EthereumHelper.add0x(orderResult.getServiceAgreementId()),
                 didComputeService,
                 Service.DEFAULT_COMPUTE_INDEX,
@@ -322,7 +323,7 @@ public void orderAndExecuteComputeService() throws Exception {
         final long endTime = System.currentTimeMillis();
         log.debug("Order method took " + (orderTime - startTime) + " milliseconds");
         log.debug("Execution Request took " + (endTime - startTime) + " milliseconds");
-        assertNotNull(executionId);
+        assertNotNull(executionResult.getExecutionId());
 
     }