From 14d4751f9a75a4cefa150455be6b707157f664b7 Mon Sep 17 00:00:00 2001 From: bQUARKz Date: Wed, 6 May 2026 00:25:23 +0100 Subject: [PATCH] package moving --- prometeu-app/src/main/java/p/studio/AppContainer.java | 7 ++++--- ...LspServerLifecycle.java => LspServerLifecycleImpl.java} | 5 +++-- ...rLifecycleTest.java => LspServerLifecycleImplTest.java} | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/{LspServerLifecycle.java => LspServerLifecycleImpl.java} (94%) rename prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/{LspServerLifecycleTest.java => LspServerLifecycleImplTest.java} (89%) diff --git a/prometeu-app/src/main/java/p/studio/AppContainer.java b/prometeu-app/src/main/java/p/studio/AppContainer.java index 6f84a69d..71a310e2 100644 --- a/prometeu-app/src/main/java/p/studio/AppContainer.java +++ b/prometeu-app/src/main/java/p/studio/AppContainer.java @@ -2,9 +2,10 @@ package p.studio; import com.fasterxml.jackson.databind.ObjectMapper; import p.packer.Packer; +import p.studio.lsp.api.LspServerLifecycle; import p.studio.lsp.events.StudioEventBus; import p.studio.lsp.events.StudioPackerEventAdapter; -import p.studio.lsp.services.LspServerLifecycle; +import p.studio.lsp.services.LspServerLifecycleImpl; import p.studio.lsp.services.compiler.CompilerLanguageServiceBridge; import p.studio.lsp.services.host.TcpLspServerHostFactory; import p.studio.utilities.ThemeService; @@ -22,7 +23,7 @@ public final class AppContainer implements Container { private final ObjectMapper mapper; private final EmbeddedPacker embeddedPacker; private final StudioBackgroundTasks backgroundTasks; - private final p.studio.lsp.api.LspServerLifecycle lspServerLifecycle; + private final LspServerLifecycle lspServerLifecycle; public AppContainer() { this.i18nService = new I18nService(); @@ -33,7 +34,7 @@ public final class AppContainer implements Container { this.backgroundTasks = new StudioBackgroundTasks(backgroundExecutor); final Packer packer = Packer.bootstrap(this.mapper, new StudioPackerEventAdapter(studioEventBus)); this.embeddedPacker = new EmbeddedPacker(packer.workspaceService(), packer::close); - this.lspServerLifecycle = new LspServerLifecycle( + this.lspServerLifecycle = new LspServerLifecycleImpl( new TcpLspServerHostFactory(), new CompilerLanguageServiceBridge()); } diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycle.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycleImpl.java similarity index 94% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycle.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycleImpl.java index bab34c5c..af2744ea 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycle.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycleImpl.java @@ -1,5 +1,6 @@ package p.studio.lsp.services; +import p.studio.lsp.api.LspServerLifecycle; import p.studio.lsp.messages.LspProjectContext; import p.studio.lsp.messages.LspServerBootRequest; import p.studio.lsp.messages.LspServerHandle; @@ -11,12 +12,12 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -public final class LspServerLifecycle implements p.studio.lsp.api.LspServerLifecycle { +public final class LspServerLifecycleImpl implements LspServerLifecycle { private final ProjectScopedLspServerHostFactory serverHostFactory; private final CompilerLanguageServiceBridge compilerBridge; private final ConcurrentMap activeServers; - public LspServerLifecycle( + public LspServerLifecycleImpl( final ProjectScopedLspServerHostFactory serverHostFactory, final CompilerLanguageServiceBridge compilerBridge) { this.serverHostFactory = Objects.requireNonNull(serverHostFactory, "serverHostFactory"); diff --git a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleTest.java b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleImplTest.java similarity index 89% rename from prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleTest.java rename to prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleImplTest.java index 0d576e87..6d71a5f7 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleTest.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleImplTest.java @@ -14,13 +14,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -class LspServerLifecycleTest { +class LspServerLifecycleImplTest { @Test void lifecycleBootsAndShutsDownProjectScopedHost() { final FakeHost host = new FakeHost(); final ProjectScopedLspServerHostFactory factory = (request, compilerBridge) -> host; - final var lifecycle = new LspServerLifecycle(factory, new CompilerLanguageServiceBridge()); + final var lifecycle = new LspServerLifecycleImpl(factory, new CompilerLanguageServiceBridge()); final var project = new LspProjectContext("demo", "pbs", Path.of(".")); final var handle = lifecycle.bootServer(LspServerBootRequest.defaults(project)); @@ -37,7 +37,7 @@ class LspServerLifecycleTest { @Test void lifecycleRejectsDoubleBootForSameProject() { final ProjectScopedLspServerHostFactory factory = (request, compilerBridge) -> new FakeHost(); - final var lifecycle = new LspServerLifecycle(factory, new CompilerLanguageServiceBridge()); + final var lifecycle = new LspServerLifecycleImpl(factory, new CompilerLanguageServiceBridge()); final var request = LspServerBootRequest.defaults(new LspProjectContext("demo", "pbs", Path.of("."))); lifecycle.bootServer(request);