ISPN-16410 Capture an exception if the put schema fails

tristantarrant · Aug 21, 2024 · ca218fe · ca218fe
1 parent d9dada3
commit ca218fe
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/server/rest/src/main/java/org/infinispan/rest/resources/ProtobufResource.java b/server/rest/src/main/java/org/infinispan/rest/resources/ProtobufResource.java
@@ -27,6 +27,7 @@
 import org.infinispan.query.remote.impl.ProtobufMetadataManagerImpl;
 import org.infinispan.rest.InvocationHelper;
 import org.infinispan.rest.NettyRestResponse;
+import org.infinispan.rest.RestRequestHandler;
 import org.infinispan.rest.cachemanager.RestCacheManager;
 import org.infinispan.rest.framework.ContentSource;
 import org.infinispan.rest.framework.ResourceHandler;
@@ -113,16 +114,25 @@ private CompletionStage<RestResponse> createOrReplace(RestRequest request, boole
 
       CompletableFuture<Object> putSchema;
       if (create) {
-         putSchema = cache.putIfAbsentAsync(schemaName, contents.asString()).thenApply(result -> {
-            if (result == null) {
+         putSchema = cache.putIfAbsentAsync(schemaName, contents.asString()).whenComplete((result, ex) -> {
+            if (ex != null) {
+               builder.status(HttpResponseStatus.INTERNAL_SERVER_ERROR).entity(RestRequestHandler.filterCause(ex));
+            } else if (result == null) {
                builder.status(HttpResponseStatus.CREATED);
             } else {
                builder.status(HttpResponseStatus.CONFLICT);
             }
-            return result;
          });
       } else {
-         putSchema = cache.putAsync(schemaName, contents.asString()).thenApply(result -> builder.status(HttpResponseStatus.OK));
+         putSchema = cache.putAsync(schemaName, contents.asString())
+                 .whenComplete((result, ex) -> {
+                    if (ex == null) {
+                       builder.status(HttpResponseStatus.OK);
+                    } else {
+                       builder.status(HttpResponseStatus.INTERNAL_SERVER_ERROR)
+                               .entity(RestRequestHandler.filterCause(ex));
+                    }
+                 });
       }
 
       return putSchema.thenCompose(r -> {