From c0a1678893a621dfdfa18040471bf5db20307370 Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Thu, 6 Jul 2017 09:58:14 +0300 Subject: [PATCH 1/2] CHE-5350: change names of methods for WebSocket communication --- .../org/eclipse/che/plugin/maven/shared/MavenAttributes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/plugin-maven/che-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java b/plugins/plugin-maven/che-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java index 86fb09bbf70..dfdbfd3873f 100644 --- a/plugins/plugin-maven/che-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java +++ b/plugins/plugin-maven/che-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java @@ -52,8 +52,8 @@ public interface MavenAttributes { String MAVEN_CHANEL_NAME = "maven:workspace"; - String MAVEN_CHANEL_UNSUBSCRIBE = "mavenOutput/subscribe"; - String MAVEN_CHANEL_SUBSCRIBE = "mavenOutput/unsubscribe"; + String MAVEN_CHANEL_UNSUBSCRIBE = "mavenOutput/unsubscribe"; + String MAVEN_CHANEL_SUBSCRIBE = "mavenOutput/subscribe"; String MAVEN_OUTPUT_TEXT_METHOD = "mavenOutput/text"; String MAVEN_OUTPUT_UPDATE_METHOD = "mavenOutput/update"; String MAVEN_OUTPUT_START_STOP_METHOD = "mavenOutput/start_stop"; From 678b01670fd79fbf5a04edba563a3693645007e4 Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Thu, 6 Jul 2017 10:06:49 +0300 Subject: [PATCH 2/2] CHE-5350: rename methods --- .../che/plugin/maven/client/MavenJsonRpcHandler.java | 4 ++-- .../maven/server/core/MavenJsonRpcCommunication.java | 8 ++++---- .../eclipse/che/plugin/maven/shared/MavenAttributes.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/MavenJsonRpcHandler.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/MavenJsonRpcHandler.java index 62530277c0e..a252619a859 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/MavenJsonRpcHandler.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/MavenJsonRpcHandler.java @@ -28,7 +28,7 @@ import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_ARCHETYPE_CHANEL_OUTPUT; import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_ARCHETYPE_CHANEL_SUBSCRIBE; -import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_CHANEL_SUBSCRIBE; +import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_SUBSCRIBE; import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_PERCENT_METHOD; import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_PERCENT_UNDEFINED_METHOD; import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_START_STOP_METHOD; @@ -68,7 +68,7 @@ private void subscribe(RequestTransmitter requestTransmitter) { requestTransmitter.newRequest() .endpointId(WS_AGENT_ENDPOINT) - .methodName(MAVEN_CHANEL_SUBSCRIBE) + .methodName(MAVEN_OUTPUT_SUBSCRIBE) .noParams() .sendAndSkipResult(); diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenJsonRpcCommunication.java b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenJsonRpcCommunication.java index c779700b84b..9cdb14d70f5 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenJsonRpcCommunication.java +++ b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenJsonRpcCommunication.java @@ -36,8 +36,8 @@ import java.util.Set; import static com.google.common.collect.Sets.newConcurrentHashSet; -import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_CHANEL_SUBSCRIBE; -import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_CHANEL_UNSUBSCRIBE; +import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_SUBSCRIBE; +import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_UNSUBSCRIBE; import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_PERCENT_METHOD; import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_PERCENT_UNDEFINED_METHOD; import static org.eclipse.che.plugin.maven.shared.MavenAttributes.MAVEN_OUTPUT_START_STOP_METHOD; @@ -75,13 +75,13 @@ private void unsubscribe() { @Inject private void configureHandlers(RequestHandlerConfigurator configurator) { configurator.newConfiguration() - .methodName(MAVEN_CHANEL_SUBSCRIBE) + .methodName(MAVEN_OUTPUT_SUBSCRIBE) .noParams() .noResult() .withConsumer(endpointIds::add); configurator.newConfiguration() - .methodName(MAVEN_CHANEL_UNSUBSCRIBE) + .methodName(MAVEN_OUTPUT_UNSUBSCRIBE) .noParams() .noResult() .withConsumer(endpointIds::remove); diff --git a/plugins/plugin-maven/che-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java b/plugins/plugin-maven/che-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java index dfdbfd3873f..aa615066958 100644 --- a/plugins/plugin-maven/che-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java +++ b/plugins/plugin-maven/che-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java @@ -52,8 +52,8 @@ public interface MavenAttributes { String MAVEN_CHANEL_NAME = "maven:workspace"; - String MAVEN_CHANEL_UNSUBSCRIBE = "mavenOutput/unsubscribe"; - String MAVEN_CHANEL_SUBSCRIBE = "mavenOutput/subscribe"; + String MAVEN_OUTPUT_UNSUBSCRIBE = "mavenOutput/unsubscribe"; + String MAVEN_OUTPUT_SUBSCRIBE = "mavenOutput/subscribe"; String MAVEN_OUTPUT_TEXT_METHOD = "mavenOutput/text"; String MAVEN_OUTPUT_UPDATE_METHOD = "mavenOutput/update"; String MAVEN_OUTPUT_START_STOP_METHOD = "mavenOutput/start_stop";