From 595474b99e9e3779fc1368bde8ce5fe93f61ccd6 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Thu, 23 Mar 2023 16:49:58 +0100
Subject: [PATCH] SSDM-13251: Added forgotten change to dss java client.
Removed debug prints from tests
---
.../src/main/java/ch/ethz/sis/afsclient/client/AfsClient.java | 4 +++-
.../ethz/sis/afsserver/client/OpenBisAuthApiClientTest.java | 4 ----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AfsClient.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AfsClient.java
index 04643c68493..fa151f65157 100644
--- a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AfsClient.java
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AfsClient.java
@@ -276,7 +276,9 @@ public final class AfsClient implements PublicAPI
}
} else if (statusCode >= 400 && statusCode < 500)
{
- throw ClientExceptions.CLIENT_ERROR.getInstance(statusCode);
+ // jsonObjectMapper can't deserialize immutable lists sent in the error message.
+ String res = new String(httpResponse.body(), StandardCharsets.UTF_8);
+ throw ClientExceptions.API_ERROR.getInstance(res);
} else if (statusCode >= 500 && statusCode < 600)
{
throw ClientExceptions.SERVER_ERROR.getInstance(statusCode);
diff --git a/server-data-store/src/test/java/ch/ethz/sis/afsserver/client/OpenBisAuthApiClientTest.java b/server-data-store/src/test/java/ch/ethz/sis/afsserver/client/OpenBisAuthApiClientTest.java
index d10cdcfc41b..e36ca1f2eeb 100644
--- a/server-data-store/src/test/java/ch/ethz/sis/afsserver/client/OpenBisAuthApiClientTest.java
+++ b/server-data-store/src/test/java/ch/ethz/sis/afsserver/client/OpenBisAuthApiClientTest.java
@@ -91,7 +91,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest
{
ThrowableReason reason = (ThrowableReason) e.getCause();
String message = ((ExceptionReason) reason.getReason()).getMessage();
- System.out.println(message);
assertTrue(message.matches(
"(?s).*Session .* don't have rights \\[Read\\] over .*to perform the operation List(?s).*"));
}
@@ -111,7 +110,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest
{
ThrowableReason reason = (ThrowableReason) e.getCause();
String message = ((ExceptionReason) reason.getReason()).getMessage();
- System.out.println(message);
assertTrue(message.matches("(?s).*Session .* doesn't exist(?s).*"));
}
}
@@ -131,7 +129,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest
{
ThrowableReason reason = (ThrowableReason) e.getCause();
String message = ((ExceptionReason) reason.getReason()).getMessage();
- System.out.println(message);
assertTrue(message.matches(
"(?s).*Session .* don't have rights \\[Write\\] over .* to perform the operation Write(?s).*"));
}
@@ -155,7 +152,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest
{
ThrowableReason reason = (ThrowableReason) e.getCause();
String message = ((ExceptionReason) reason.getReason()).getMessage();
- System.out.println(message);
assertTrue(message.matches(
"(?s).*Session .* don't have rights \\[(Write|Read), (Write|Read)\\] over .* to perform the operation Move(?s).*"));
}
--
GitLab