aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-process
diff options
context:
space:
mode:
authorBelen Pruvost <belen.pruvost@sonarsource.com>2022-07-28 16:55:41 +0200
committersonartech <sonartech@sonarsource.com>2022-07-28 20:02:56 +0000
commit7ed0c0a19b7a0da9c6c907cab9a57a4d723dd03e (patch)
tree243c1417f126cc6f954c9c3352cf4c7f6ad61794 /server/sonar-process
parentca7e8a8d9687f93d1e4ddad5748aee2d66f57252 (diff)
downloadsonarqube-7ed0c0a19b7a0da9c6c907cab9a57a4d723dd03e.tar.gz
sonarqube-7ed0c0a19b7a0da9c6c907cab9a57a4d723dd03e.zip
SONAR-16647 - Move previous SSE events to DB queue
Diffstat (limited to 'server/sonar-process')
-rw-r--r--server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMember.java12
-rw-r--r--server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMemberImpl.java30
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java35
3 files changed, 0 insertions, 77 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMember.java b/server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMember.java
index 833864b8e96..65f43bae707 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMember.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMember.java
@@ -26,10 +26,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.locks.Lock;
-import org.sonar.core.util.issue.IssueChangeListener;
-import org.sonar.core.util.issue.IssueChangedEvent;
-import org.sonar.core.util.rule.RuleActivationListener;
-import org.sonar.core.util.rule.RuleSetChangedEvent;
import org.sonar.process.ProcessId;
public interface HazelcastMember extends AutoCloseable {
@@ -110,14 +106,6 @@ public interface HazelcastMember extends AutoCloseable {
*/
<T> void callAsync(DistributedCall<T> callable, MemberSelector memberSelector, DistributedCallback<T> callback);
- void subscribeRuleActivationTopic(RuleActivationListener listener);
-
- void publishEvent(RuleSetChangedEvent event);
-
- void subscribeIssueChangeTopic(IssueChangeListener listener);
-
- void publishEvent(IssueChangedEvent event);
-
@Override
void close();
}
diff --git a/server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMemberImpl.java b/server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMemberImpl.java
index bb6a541087d..685910361af 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMemberImpl.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/cluster/hz/HazelcastMemberImpl.java
@@ -27,8 +27,6 @@ import com.hazelcast.core.HazelcastInstanceNotActiveException;
import com.hazelcast.core.IExecutorService;
import com.hazelcast.core.MultiExecutionCallback;
import com.hazelcast.cp.IAtomicReference;
-import com.hazelcast.topic.ITopic;
-import com.hazelcast.topic.MessageListener;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -39,10 +37,6 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.Lock;
import java.util.stream.Collectors;
import org.slf4j.LoggerFactory;
-import org.sonar.core.util.issue.IssueChangeListener;
-import org.sonar.core.util.issue.IssueChangedEvent;
-import org.sonar.core.util.rule.RuleActivationListener;
-import org.sonar.core.util.rule.RuleSetChangedEvent;
class HazelcastMemberImpl implements HazelcastMember {
@@ -132,30 +126,6 @@ class HazelcastMemberImpl implements HazelcastMember {
}
@Override
- public void subscribeRuleActivationTopic(RuleActivationListener listener) {
- ITopic<RuleSetChangedEvent> topic = hzInstance.getTopic("ruleActivated");
- MessageListener<RuleSetChangedEvent> hzListener = message -> listener.listen(message.getMessageObject());
- topic.addMessageListener(hzListener);
- }
-
- @Override
- public void publishEvent(RuleSetChangedEvent event) {
- hzInstance.getTopic("ruleActivated").publish(event);
- }
-
- @Override
- public void subscribeIssueChangeTopic(IssueChangeListener listener) {
- ITopic<IssueChangedEvent> topic = hzInstance.getTopic("issueChanged");
- MessageListener<IssueChangedEvent> hzListener = message -> listener.listen(message.getMessageObject());
- topic.addMessageListener(hzListener);
- }
-
- @Override
- public void publishEvent(IssueChangedEvent event) {
- hzInstance.getTopic("issueChanged").publish(event);
- }
-
- @Override
public void close() {
try {
hzInstance.shutdown();
diff --git a/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java b/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java
index 032143d68d3..cc3e712f63d 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java
@@ -21,8 +21,6 @@ package org.sonar.process.cluster.hz;
import com.hazelcast.cluster.Member;
import com.hazelcast.cluster.memberselector.MemberSelectors;
-import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.topic.ITopic;
import java.net.InetAddress;
import java.util.Arrays;
import java.util.List;
@@ -36,17 +34,10 @@ import org.junit.Test;
import org.junit.rules.DisableOnDebug;
import org.junit.rules.TestRule;
import org.junit.rules.Timeout;
-import org.sonar.core.util.issue.IssueChangeListener;
-import org.sonar.core.util.rule.RuleActivationListener;
import org.sonar.process.NetworkUtilsImpl;
import org.sonar.process.ProcessId;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
public class HazelcastMemberImplTest {
@@ -115,32 +106,6 @@ public class HazelcastMemberImplTest {
assertThat(failures.get(0)).hasMessageContaining("BOOM");
}
- @Test
- public void subscribeRuleActivationTopic_listenerAdded() {
- RuleActivationListener listener = mock(RuleActivationListener.class);
- HazelcastInstance hzInstance = mock(HazelcastInstance.class);
- ITopic<Object> topic = mock(ITopic.class);
- when(hzInstance.getTopic(any())).thenReturn(topic);
- HazelcastMemberImpl underTest = new HazelcastMemberImpl(hzInstance);
-
- underTest.subscribeRuleActivationTopic(listener);
-
- verify(topic, times(1)).addMessageListener(any());
- }
-
- @Test
- public void subscribeIssueChangeTopic_listenerAdded() {
- IssueChangeListener listener = mock(IssueChangeListener.class);
- HazelcastInstance hzInstance = mock(HazelcastInstance.class);
- ITopic<Object> topic = mock(ITopic.class);
- when(hzInstance.getTopic(any())).thenReturn(topic);
- HazelcastMemberImpl underTest = new HazelcastMemberImpl(hzInstance);
-
- underTest.subscribeIssueChangeTopic(listener);
-
- verify(topic, times(1)).addMessageListener(any());
- }
-
private static HazelcastMember newHzMember(int port, int... otherPorts) {
return new HazelcastMemberBuilder(JoinConfigurationType.TCP_IP)
.setProcessId(ProcessId.COMPUTE_ENGINE)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 23:53:09 +0000