From 938aee15c31a8f2c5faee02f1fb648490e74feb0 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 2 Jun 2024 18:13:49 +0000
Subject: [PATCH] Rename

---
 ...ryExchangeImpl.java => ConnectionQueryExchangeImpl.java} | 6 +++---
 app/src/main/java/module-info.java                          | 2 +-
 .../{QueryExchange.java => ConnectionQueryExchange.java}    | 4 ++--
 beacon/src/main/java/module-info.java                       | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename app/src/main/java/io/xpipe/app/beacon/impl/{QueryExchangeImpl.java => ConnectionQueryExchangeImpl.java} (91%)
 rename beacon/src/main/java/io/xpipe/beacon/api/{QueryExchange.java => ConnectionQueryExchange.java} (86%)

diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/QueryExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionQueryExchangeImpl.java
similarity index 91%
rename from app/src/main/java/io/xpipe/app/beacon/impl/QueryExchangeImpl.java
rename to app/src/main/java/io/xpipe/app/beacon/impl/ConnectionQueryExchangeImpl.java
index 2b67bd9f..3442034c 100644
--- a/app/src/main/java/io/xpipe/app/beacon/impl/QueryExchangeImpl.java
+++ b/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionQueryExchangeImpl.java
@@ -5,14 +5,14 @@ import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStoreEntry;
 import io.xpipe.beacon.BeaconClientException;
 import io.xpipe.beacon.BeaconServerException;
-import io.xpipe.beacon.api.QueryExchange;
+import io.xpipe.beacon.api.ConnectionQueryExchange;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-public class QueryExchangeImpl extends QueryExchange {
+public class ConnectionQueryExchangeImpl extends ConnectionQueryExchange {
 
     @Override
     public Object handle(HttpExchange exchange, Request msg) throws IOException, BeaconClientException, BeaconServerException {
@@ -46,7 +46,7 @@ public class QueryExchangeImpl extends QueryExchange {
         var mapped = new ArrayList<QueryResponse>();
         for (DataStoreEntry e : found) {
             var cat = DataStorage.get().getStorePath(DataStorage.get().getStoreCategoryIfPresent(e.getCategoryUuid()).orElseThrow());
-            var obj = QueryExchange.QueryResponse.builder()
+            var obj = ConnectionQueryExchange.QueryResponse.builder()
                     .uuid(e.getUuid()).category(cat).connection(DataStorage.get()
                     .getStorePath(e)).type(e.getProvider().getId()).build();
             mapped.add(obj);
diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java
index 62981540..01b8e79c 100644
--- a/app/src/main/java/module-info.java
+++ b/app/src/main/java/module-info.java
@@ -127,7 +127,7 @@ open module io.xpipe.app {
             AppLogs.Slf4jProvider;
     provides EventHandler with
             EventHandlerImpl;
-    provides BeaconInterface with ShellStartExchangeImpl, ShellStopExchangeImpl, ShellExecExchangeImpl, QueryExchangeImpl, DaemonOpenExchangeImpl, DaemonFocusExchangeImpl, DaemonStatusExchangeImpl, DaemonStopExchangeImpl,
+    provides BeaconInterface with ShellStartExchangeImpl, ShellStopExchangeImpl, ShellExecExchangeImpl, ConnectionQueryExchangeImpl, DaemonOpenExchangeImpl, DaemonFocusExchangeImpl, DaemonStatusExchangeImpl, DaemonStopExchangeImpl,
             HandshakeExchangeImpl, DaemonModeExchangeImpl,
             AskpassExchangeImpl,
             TerminalWaitExchangeImpl,
diff --git a/beacon/src/main/java/io/xpipe/beacon/api/QueryExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/ConnectionQueryExchange.java
similarity index 86%
rename from beacon/src/main/java/io/xpipe/beacon/api/QueryExchange.java
rename to beacon/src/main/java/io/xpipe/beacon/api/ConnectionQueryExchange.java
index f4d5709f..16ef5273 100644
--- a/beacon/src/main/java/io/xpipe/beacon/api/QueryExchange.java
+++ b/beacon/src/main/java/io/xpipe/beacon/api/ConnectionQueryExchange.java
@@ -10,11 +10,11 @@ import lombok.extern.jackson.Jacksonized;
 import java.util.List;
 import java.util.UUID;
 
-public class QueryExchange extends BeaconInterface<QueryExchange.Request> {
+public class ConnectionQueryExchange extends BeaconInterface<ConnectionQueryExchange.Request> {
 
     @Override
     public String getPath() {
-        return "/query";
+        return "/connection/query";
     }
 
     @Jacksonized
diff --git a/beacon/src/main/java/module-info.java b/beacon/src/main/java/module-info.java
index 873aa3e2..2977ef12 100644
--- a/beacon/src/main/java/module-info.java
+++ b/beacon/src/main/java/module-info.java
@@ -24,8 +24,7 @@ open module io.xpipe.beacon {
             BeaconInterface.Loader;
     provides Module with
             BeaconJacksonModule;
-    provides BeaconInterface with ShellStartExchange, ShellStopExchange, ShellExecExchange, DaemonModeExchange, DaemonStatusExchange, DaemonFocusExchange, DaemonOpenExchange, DaemonStopExchange, HandshakeExchange,
-            QueryExchange,
+    provides BeaconInterface with ShellStartExchange, ShellStopExchange, ShellExecExchange, DaemonModeExchange, DaemonStatusExchange, DaemonFocusExchange, DaemonOpenExchange, DaemonStopExchange, HandshakeExchange, ConnectionQueryExchange,
             AskpassExchange,
             TerminalWaitExchange,
             TerminalLaunchExchange, DaemonVersionExchange;