refactored http calls.

JSON can only be parsed when the request was successful. On http error >=400 the payload is html normally so no json can be parsed. Improved log messages.
GAIA-X4PLC-AAD · Oct 2, 2024 · d808cd7 · d808cd7
1 parent ff1e979
commit d808cd7
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 59 deletions.
diff --git a/...a/berlin/tu/ise/extension/blockchain/catalog/listener/BlockchainSmartContractService.java b/...a/berlin/tu/ise/extension/blockchain/catalog/listener/BlockchainSmartContractService.java
@@ -75,7 +75,6 @@ public ReturnObject sendToVerifiableSmartContract(String jsonString) {
      */
     public ReturnObject sendToSmartContract(String jsonString, String smartContractUrl) {
         monitor.debug(String.format("[%s] Sending data to Smart Contract, this may take some time ...", BlockchainSmartContractService.class.getSimpleName()));
-        String returnJson;
         ReturnObject returnObject = null;
         try {
             URL url = new URL(smartContractUrl);
@@ -85,29 +84,28 @@ public ReturnObject sendToSmartContract(String jsonString, String smartContractU
             http.setRequestProperty("Content-Type", "application/json");
 
             byte[] out = jsonString.getBytes(StandardCharsets.UTF_8);
-
-            OutputStream stream = http.getOutputStream();
-            stream.write(out);
-
-            BufferedReader br;
-            if (100 <= http.getResponseCode() && http.getResponseCode() <= 399) {
-                br = new BufferedReader(new InputStreamReader(http.getInputStream()));
-            } else {
-                br = new BufferedReader(new InputStreamReader(http.getErrorStream()));
+            try (OutputStream stream = http.getOutputStream()) {
+                stream.write(out);
             }
 
-            while ((returnJson = br.readLine()) != null) {
-                monitor.debug(returnJson);
-                ObjectMapper mapper = new ObjectMapper();
-                returnObject = mapper.readValue(returnJson, ReturnObject.class);
+            int responseCode = http.getResponseCode();
+            if (responseCode >= 100 && responseCode <= 399) {
+                try (BufferedReader br = new BufferedReader(new InputStreamReader(http.getInputStream()))) {
+                    StringBuilder response = new StringBuilder();
+                    String line;
+                    while ((line = br.readLine()) != null) {
+                        response.append(line);
+                    }
+                    ObjectMapper mapper = new ObjectMapper();
+                    returnObject = mapper.readValue(response.toString(), ReturnObject.class);
+                }
+            } else {
+                monitor.warning("Failed to send data to Smart Contract with response code: " + responseCode);
             }
-
-            System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
             http.disconnect();
         } catch (Exception e) {
-            monitor.severe(e.toString());
+            monitor.severe("Failed to send data to Smart Contract", e);
         }
-
         return returnObject;
     }
 

diff --git a/.../berlin/tu/ise/extension/blockchain/logger/listener/ContractAgreementEventSubscriber.java b/.../berlin/tu/ise/extension/blockchain/logger/listener/ContractAgreementEventSubscriber.java
@@ -55,11 +55,11 @@ public void accepted(ContractNegotiationAgreed negotiationAgreed) {
             try {
                 Thread.sleep(1000);
                 monitor.debug("Waiting for ContractAgreement to be created for ContractNegotiation: " + negotiationId);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
+            } catch (final InterruptedException e) {
+                monitor.warning("Thread interrupted", e);
             }
             if (i == 9) {
-                monitor.debug("ContractAgreement could not be created for ContractNegotiation: " + negotiationId);
+                monitor.warning("ContractAgreement could not be created for ContractNegotiation: " + negotiationId);
                 return;
             }
         }
@@ -85,14 +85,12 @@ public void accepted(ContractNegotiationAgreed negotiationAgreed) {
         if (returnObject != null && Objects.equals(returnObject.getStatus(), "ok")) {
             monitor.debug("[ContractAgreementEventSubscriber] Data sent to Smart Contract");
         } else {
-            monitor.debug("[ContractAgreementEventSubscriber] Data could not be sent to Smart Contract");
+            monitor.severe("[ContractAgreementEventSubscriber] Data could not be sent to Smart Contract");
         }
-
     }
 
     public static ReturnOperationObject sendToSmartContract(String jsonString, Monitor monitor, String smartContractUrl) {
         monitor.debug("[ContractAgreementEventSubscriber] Sending data to Smart Contract, this may take some time ...");
-        String returnJson;
         ReturnOperationObject returnObject = null;
         try {
             URL url = new URL(smartContractUrl + "/agreement/add");
@@ -102,29 +100,28 @@ public static ReturnOperationObject sendToSmartContract(String jsonString, Monit
             http.setRequestProperty("Content-Type", "application/json");
 
             byte[] out = jsonString.getBytes(StandardCharsets.UTF_8);
-
-            OutputStream stream = http.getOutputStream();
-            stream.write(out);
-
-            BufferedReader br;
-            if (100 <= http.getResponseCode() && http.getResponseCode() <= 399) {
-                br = new BufferedReader(new InputStreamReader(http.getInputStream()));
-            } else {
-                br = new BufferedReader(new InputStreamReader(http.getErrorStream()));
+            try (OutputStream stream = http.getOutputStream()) {
+                stream.write(out);
             }
 
-            while ((returnJson = br.readLine()) != null) {
-                monitor.debug(returnJson);
-                ObjectMapper mapper = new ObjectMapper();
-                returnObject = mapper.readValue(returnJson, ReturnOperationObject.class);
+            int responseCode = http.getResponseCode();
+            if (responseCode >= 100 && responseCode <= 399) {
+                try (BufferedReader br = new BufferedReader(new InputStreamReader(http.getInputStream()))) {
+                    StringBuilder response = new StringBuilder();
+                    String line;
+                    while ((line = br.readLine()) != null) {
+                        response.append(line);
+                    }
+                    ObjectMapper mapper = new ObjectMapper();
+                    returnObject = mapper.readValue(response.toString(), ReturnOperationObject.class);
+                }
+            } else {
+                monitor.warning("Failed to send data to Smart Contract with response code: " + responseCode);
             }
-
-            System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
             http.disconnect();
         } catch (Exception e) {
-            monitor.severe(e.toString());
+            monitor.severe("Failed to send data to Smart Contract", e);
         }
-
         return returnObject;
     }
 

diff --git a/...va/berlin/tu/ise/extension/blockchain/logger/listener/TransferProcessEventSubscriber.java b/...va/berlin/tu/ise/extension/blockchain/logger/listener/TransferProcessEventSubscriber.java
@@ -105,13 +105,12 @@ public void transferProcessInitiated(TransferProcess process) {
         if (returnObject != null && Objects.equals(returnObject.getStatus(), "ok")) {
             monitor.debug("[TransferProcessEventSubscriber] Data sent to Smart Contract");
         } else {
-            monitor.debug("[TransferProcessEventSubscriber] Data could not be sent to Smart Contract");
+            monitor.severe("[TransferProcessEventSubscriber] Data could not be sent to Smart Contract");
         }
     }
 
     public static ReturnOperationObject sendToSmartContract(String jsonString, Monitor monitor, String smartContractUrl) {
         monitor.debug("[TransferProcessEventSubscriber] Sending data to Smart Contract, this may take some time ...");
-        String returnJson;
         ReturnOperationObject returnObject = null;
         try {
             URL url = new URL(smartContractUrl + "/transfer/add");
@@ -121,27 +120,27 @@ public static ReturnOperationObject sendToSmartContract(String jsonString, Monit
             http.setRequestProperty("Content-Type", "application/json");
 
             byte[] out = jsonString.getBytes(StandardCharsets.UTF_8);
-
-            OutputStream stream = http.getOutputStream();
-            stream.write(out);
-
-            BufferedReader br;
-            if (100 <= http.getResponseCode() && http.getResponseCode() <= 399) {
-                br = new BufferedReader(new InputStreamReader(http.getInputStream()));
-            } else {
-                br = new BufferedReader(new InputStreamReader(http.getErrorStream()));
+            try (OutputStream stream = http.getOutputStream()) {
+                stream.write(out);
             }
 
-            while ((returnJson = br.readLine()) != null) {
-                monitor.debug(returnJson);
-                ObjectMapper mapper = new ObjectMapper();
-                returnObject = mapper.readValue(returnJson, ReturnOperationObject.class);
+            int responseCode = http.getResponseCode();
+            if (responseCode >= 100 && responseCode <= 399) {
+                try (BufferedReader br = new BufferedReader(new InputStreamReader(http.getInputStream()))) {
+                    StringBuilder response = new StringBuilder();
+                    String line;
+                    while ((line = br.readLine()) != null) {
+                        response.append(line);
+                    }
+                    ObjectMapper mapper = new ObjectMapper();
+                    returnObject = mapper.readValue(response.toString(), ReturnOperationObject.class);
+                }
+            } else {
+                monitor.warning("Failed to send data to Smart Contract with response code: " + responseCode);
             }
-
-            System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
             http.disconnect();
         } catch (Exception e) {
-            monitor.severe(e.toString());
+            monitor.severe("Failed to send data to Smart Contract", e);
         }
 
         return returnObject;