Skip to content

Commit 7a923ba

Browse files
committed
fix: use tcpip config joiner configuration
1 parent 0cddb00 commit 7a923ba

File tree

2 files changed

+40
-12
lines changed

2 files changed

+40
-12
lines changed

activiti-cloud-messages-service/starters/hazelcast/src/main/java/org/activiti/cloud/starter/messages/hazelcast/HazelcastMessageStoreAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ public Config hazelcastConfig() {
4646
Config config = new Config();
4747

4848
config.getCPSubsystemConfig()
49-
.setCPMemberCount(3)
50-
.setGroupSize(3);
49+
.setCPMemberCount(3);
5150

5251
return config;
5352
}

activiti-cloud-messages-service/starters/hazelcast/src/test/java/org/activiti/cloud/starter/messages/test/hazelcast/HazelcastMessageStoreIT.java

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
import org.activiti.cloud.services.messages.tests.AbstractMessagesCoreIntegrationTests;
21-
import org.junit.jupiter.api.AfterAll;
2221
import org.junit.jupiter.api.Test;
2322
import org.springframework.boot.autoconfigure.SpringBootApplication;
2423
import org.springframework.boot.test.context.TestConfiguration;
2524
import org.springframework.context.annotation.Bean;
25+
import org.springframework.context.annotation.Scope;
2626
import org.springframework.integration.hazelcast.store.HazelcastMessageStore;
2727

2828
import com.hazelcast.config.Config;
29+
import com.hazelcast.config.JoinConfig;
30+
import com.hazelcast.config.NetworkConfig;
2931
import com.hazelcast.core.Hazelcast;
3032
import com.hazelcast.core.HazelcastInstance;
31-
import com.hazelcast.instance.impl.HazelcastInstanceFactory;
3233

3334
public class HazelcastMessageStoreIT extends AbstractMessagesCoreIntegrationTests {
3435

@@ -41,27 +42,55 @@ static class MessagesApplication {
4142
static class HazelcastConfiguration {
4243

4344
@Bean
45+
@Scope("prototype")
46+
public Config hazelcastConfig() {
47+
Config config = new Config();
48+
49+
config.getCPSubsystemConfig()
50+
.setCPMemberCount(3);
51+
52+
NetworkConfig network = config.getNetworkConfig()
53+
.setPortAutoIncrement(true);
54+
network.setPort(5701)
55+
.setPortCount(20);
56+
57+
JoinConfig join = network.getJoin();
58+
59+
join.getMulticastConfig()
60+
.setEnabled(false);
61+
62+
join.getTcpIpConfig()
63+
.setEnabled(true)
64+
.addMember("localhost");
65+
66+
return config;
67+
}
68+
69+
@Bean(destroyMethod = "shutdown")
4470
public HazelcastInstance hazelcastInstance(Config hazelcastConfig) {
71+
hazelcastConfig.getNetworkConfig()
72+
.setPublicAddress("localhost:5701");
73+
4574
return Hazelcast.newHazelcastInstance(hazelcastConfig);
4675
}
4776

48-
@Bean
77+
@Bean(destroyMethod = "shutdown")
4978
public HazelcastInstance hazelcastInstance2(Config hazelcastConfig) {
79+
hazelcastConfig.getNetworkConfig()
80+
.setPublicAddress("localhost:5702");
81+
5082
return Hazelcast.newHazelcastInstance(hazelcastConfig);
5183
}
5284

53-
@Bean
85+
@Bean(destroyMethod = "shutdown")
5486
public HazelcastInstance hazelcastInstance3(Config hazelcastConfig) {
87+
hazelcastConfig.getNetworkConfig()
88+
.setPublicAddress("localhost:5703");
89+
5590
return Hazelcast.newHazelcastInstance(hazelcastConfig);
5691
}
5792
}
5893

59-
@AfterAll
60-
public static void afterAll() {
61-
HazelcastInstanceFactory.terminateAll();
62-
}
63-
64-
6594
@Test
6695
public void testMessageStore() throws Exception {
6796
assertThat(this.aggregatingMessageHandler.getMessageStore()).isInstanceOf(HazelcastMessageStore.class);

0 commit comments

Comments
 (0)