From fa93d1c8e17ef977e943ba1dead755d44943f11c Mon Sep 17 00:00:00 2001
From: Christopher Schnick <st141923@stud.uni-stuttgart.de>
Date: Thu, 1 Dec 2022 11:58:06 +0100
Subject: [PATCH] Cleanup

---
 .../beacon/exchange/MessageExchanges.java     |  5 ++-
 .../beacon/exchange/ReadExecuteExchange.java  | 36 -------------------
 beacon/src/main/java/module-info.java         |  1 -
 3 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 beacon/src/main/java/io/xpipe/beacon/exchange/ReadExecuteExchange.java

diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java b/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java
index 20f658cc4..ac3ce41d2 100644
--- a/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java
+++ b/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java
@@ -15,7 +15,10 @@ public class MessageExchanges {
     private static void loadAll() {
         if (ALL == null) {
             ALL = ServiceLoader.load(MessageExchange.class).stream()
-                    .map(ServiceLoader.Provider::get)
+                    .map(s -> {
+                        var ex = (MessageExchange) s.get();
+                        return ex;
+                    })
                     .collect(Collectors.toSet());
         }
     }
diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/ReadExecuteExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/ReadExecuteExchange.java
deleted file mode 100644
index 35bf31fad..000000000
--- a/beacon/src/main/java/io/xpipe/beacon/exchange/ReadExecuteExchange.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.xpipe.beacon.exchange;
-
-import io.xpipe.beacon.RequestMessage;
-import io.xpipe.beacon.ResponseMessage;
-import io.xpipe.core.source.DataSourceId;
-import io.xpipe.core.store.DataStore;
-import lombok.Builder;
-import lombok.NonNull;
-import lombok.Value;
-import lombok.extern.jackson.Jacksonized;
-
-/**
- * Sends stream-based data to a daemon.
- */
-public class ReadExecuteExchange implements MessageExchange {
-
-    @Override
-    public String getId() {
-        return "readExecute";
-    }
-
-    @Jacksonized
-    @Builder
-    @Value
-    public static class Request implements RequestMessage {
-        @NonNull
-        DataStore dataStore;
-
-        DataSourceId target;
-    }
-
-    @Jacksonized
-    @Builder
-    @Value
-    public static class Response implements ResponseMessage {}
-}
diff --git a/beacon/src/main/java/module-info.java b/beacon/src/main/java/module-info.java
index cd2826a70..e2609b803 100644
--- a/beacon/src/main/java/module-info.java
+++ b/beacon/src/main/java/module-info.java
@@ -55,7 +55,6 @@ module io.xpipe.beacon {
             SelectExchange,
             ReadExchange,
             QueryTextDataExchange,
-            ReadExecuteExchange,
             ListStoresExchange,
             DialogExchange,
             QueryDataSourceExchange,