Update code as per suggestions

OpenFeign · Oct 11, 2023 · bffdd7e · bffdd7e
1 parent ac5af83
commit bffdd7e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/reactive/src/main/java/feign/reactive/ReactiveDecoder.java b/reactive/src/main/java/feign/reactive/ReactiveDecoder.java
@@ -16,6 +16,7 @@
 import feign.FeignException;
 import feign.Response;
 import feign.Types;
+import feign.codec.DecodeException;
 import feign.codec.Decoder;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -37,12 +38,18 @@ public Object decode(Response response, Type type) throws IOException, FeignExce
         Class<?> rawType = Types.getRawType(type);
         if (rawType.isAssignableFrom(Mono.class)) {
             Type lastType = Types.resolveLastTypeParameter(type, Mono.class);
-            return Mono.just(delegate.decode(response, lastType));
+            return Mono.fromCallable(() -> delegate.decode(response, lastType));
         }
         if (rawType.isAssignableFrom(Flux.class)) {
             Type lastType = Types.resolveLastTypeParameter(type, Flux.class);
             Type listType = Types.parameterize(List.class, lastType);
-            return Flux.fromIterable((Iterable)delegate.decode(response, listType));
+            Object decoded = delegate.decode(response, listType);
+            if (decoded instanceof Iterable) {
+                return Flux.fromIterable((Iterable) decoded);
+            } else {
+                String errorMessage = "Expected type Iterable, but was: " + decoded.getClass();
+                throw new DecodeException(response.status(), errorMessage, response.request());
+            }
         }
 
         return delegate.decode(response, type);