From c0215f3230de38b369b0b889bc6e87056c22865b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Sch=C3=B6nenberg?=
 <schoenenberg@users.noreply.github.com>
Date: Thu, 14 Mar 2024 11:42:42 +0100
Subject: [PATCH] fix: restructure exception handling

---
 build.gradle.kts                              |  2 +-
 .../client/IdsClearingHouseServiceImpl.java   | 25 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 90caef7..cc7df4b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -62,7 +62,7 @@ subprojects {
             maven {
                 name = "GitHubPackages"
                 url = uri("https://maven.pkg.github.com/truzzt/mds-ap3")
-                version = "0.2.9"
+                version = "0.2.10"
                 credentials {
                     username = System.getenv("USERNAME")
                     password = System.getenv("TOKEN")
diff --git a/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/IdsClearingHouseServiceImpl.java b/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/IdsClearingHouseServiceImpl.java
index 98850c6..9b6ccf2 100644
--- a/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/IdsClearingHouseServiceImpl.java
+++ b/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/IdsClearingHouseServiceImpl.java
@@ -31,6 +31,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -98,13 +99,13 @@ public void createProcess(ContractAgreement contractAgreement, URL clearingHouse
     }
 
     public void logContractAgreement(ContractAgreement contractAgreement, URL clearingHouseLogUrl) {
-        monitor.info("Logging contract agreement to LoggingHouse with contract id: " + contractAgreement.getId());
+        monitor.info("Logging ContractAgreement to LoggingHouse with contract id: " + contractAgreement.getId());
         var logMessage = new LogMessage(clearingHouseLogUrl, connectorBaseUrl, contractAgreement);
         dispatcherRegistry.dispatch(Object.class, logMessage);
     }
 
     public void logTransferProcess(TransferProcess transferProcess, URL clearingHouseLogUrl) {
-        monitor.info("Logging transferprocess to LoggingHouse");
+        monitor.info("Logging TransferProcess to LoggingHouse");
         var logMessage = new LogMessage(clearingHouseLogUrl, connectorBaseUrl, transferProcess);
         dispatcherRegistry.dispatch(Object.class, logMessage);
     }
@@ -118,20 +119,32 @@ public <E extends Event> void on(EventEnvelope<E> event) {
 
                 // Create Process
                 var extendedProcessUrl = new URL(clearingHouseLogUrl + "/process/" + pid);
-                createProcess(contractAgreement, extendedProcessUrl);
+                try {
+                    createProcess(contractAgreement, extendedProcessUrl);
+                } catch (Exception e) {
+                    monitor.warning("Could not create process in LoggingHouse: " + e.getMessage());
+                }
 
                 // Log Contract Agreement
                 var extendedLogUrl = new URL(clearingHouseLogUrl + "/messages/log/" + pid);
-                logContractAgreement(contractAgreement, extendedLogUrl);
+                try {
+                    logContractAgreement(contractAgreement, extendedLogUrl);
+                } catch (Exception e) {
+                    monitor.warning("Could not log ContractNegotiation to LoggingHouse: " + e.getMessage());
+                }
             } else if (event.getPayload() instanceof TransferProcessEvent transferProcessEvent) {
                 monitor.debug("Logging transfer event with id " + event.getId());
 
                 var transferProcess = resolveTransferProcess(transferProcessEvent);
                 var pid = transferProcess.getContractId();
                 var extendedUrl = new URL(clearingHouseLogUrl + "/messages/log/" + pid);
-                logTransferProcess(transferProcess, extendedUrl);
+                try {
+                    logTransferProcess(transferProcess, extendedUrl);
+                } catch (Exception e) {
+                    monitor.warning("Could not log TransferProcess to LoggingHouse: " + e.getMessage());
+                }
             }
-        } catch (Exception e) {
+        } catch (MalformedURLException e) {
             throw new EdcException("Could not create extended clearinghouse url.");
         }
     }