From e2f4dc35147235e0ab6ec93ffb25dfbea334d6ee Mon Sep 17 00:00:00 2001
From: Luciano Vernaschi <cromoteca@users.noreply.github.com>
Date: Wed, 17 Aug 2022 13:52:07 +0200
Subject: [PATCH] fix: remove the `undefined` return type for Flux endpoint
 methods (#510)

---
 .../java/dev/hilla/generator/typescript/CodeGenerator.java    | 4 ++--
 .../generator/endpoints/flux/expected-FluxTestEndpoint.ts     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/java/endpoint/src/main/java/dev/hilla/generator/typescript/CodeGenerator.java b/packages/java/endpoint/src/main/java/dev/hilla/generator/typescript/CodeGenerator.java
index 3d134fda27..9180e5a450 100644
--- a/packages/java/endpoint/src/main/java/dev/hilla/generator/typescript/CodeGenerator.java
+++ b/packages/java/endpoint/src/main/java/dev/hilla/generator/typescript/CodeGenerator.java
@@ -318,8 +318,8 @@ public String getTypeDeclaration(Schema schema) {
             Schema inner = arraySchema.getItems();
             if (schema.getExtensions() != null
                     && schema.getExtensions().containsKey("x-flux")) {
-                return String.format("Subscription<%s>%s",
-                        this.getTypeDeclaration(inner), optionalSuffix);
+                return String.format("Subscription<%s>",
+                        this.getTypeDeclaration(inner));
             } else {
                 return String.format("Array<%s>%s",
                         this.getTypeDeclaration(inner), optionalSuffix);
diff --git a/packages/java/endpoint/src/test/resources/dev/hilla/generator/endpoints/flux/expected-FluxTestEndpoint.ts b/packages/java/endpoint/src/test/resources/dev/hilla/generator/endpoints/flux/expected-FluxTestEndpoint.ts
index 18da9d45df..9b54d4c4ba 100644
--- a/packages/java/endpoint/src/test/resources/dev/hilla/generator/endpoints/flux/expected-FluxTestEndpoint.ts
+++ b/packages/java/endpoint/src/test/resources/dev/hilla/generator/endpoints/flux/expected-FluxTestEndpoint.ts
@@ -23,7 +23,7 @@ Subscription<User> {
 * Return a list of users
 */
 function _getAllUsers():
-Subscription<User | undefined> | undefined {
+Subscription<User | undefined> {
   return client.subscribe (
     'FluxTestEndpoint', 'getAllUsers',{}
   );