iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-4340: Upgrade spring-boot-admin module (#10508) 

* JAVA-4340: Upgrade spring-boot-admin module

* JAVA-4340: eviction policy correction
This commit is contained in:
freelansam 2021-02-23 00:19:12 +05:30 committed by GitHub
parent b9c6f1c09b
commit bd4ff652f8
4 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-modules/spring-boot-admin/spring-boot-admin-client/pom.xml
View File

@ -61,7 +61,7 @@
</build> </build>
<properties> <properties>
<spring-boot-admin-starter-client.version>2.2.2</spring-boot-admin-starter-client.version> <spring-boot-admin-starter-client.version>2.4.0</spring-boot-admin-starter-client.version>
<spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version> <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
</properties> </properties>
</project> </project>

5
spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml
View File

@ -82,10 +82,9 @@
</build> </build>
<properties> <properties>
<spring-boot-admin-server.version>2.2.2</spring-boot-admin-server.version> <spring-boot-admin-server.version>2.4.0</spring-boot-admin-server.version>
<spring-boot-admin-starter-client.version>2.2.2</spring-boot-admin-starter-client.version> <spring-boot-admin-starter-client.version>2.4.0</spring-boot-admin-starter-client.version>
<spring-boot-admin-server-ui-login.version>1.5.7</spring-boot-admin-server-ui-login.version> <spring-boot-admin-server-ui-login.version>1.5.7</spring-boot-admin-server-ui-login.version>
<spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version> <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
<spring-boot.version>2.3.3.RELEASE</spring-boot.version>
</properties> </properties>
</project> </project>

3
spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java
View File

@ -1,11 +1,12 @@
package com.baeldung.springbootadminserver; package com.baeldung.springbootadminserver;
import de.codecentric.boot.admin.server.config.AdminServerHazelcastAutoConfiguration;
import de.codecentric.boot.admin.server.config.EnableAdminServer; import de.codecentric.boot.admin.server.config.EnableAdminServer;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@EnableAdminServer @EnableAdminServer
@SpringBootApplication @SpringBootApplication(exclude = AdminServerHazelcastAutoConfiguration.class)
public class SpringBootAdminServerApplication { public class SpringBootAdminServerApplication {
public static void main(String[] args) { public static void main(String[] args) {

28
spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java
View File

@ -1,12 +1,13 @@
package com.baeldung.springbootadminserver.configs; package com.baeldung.springbootadminserver.configs;
import com.hazelcast.config.Config; import com.hazelcast.config.Config;
import com.hazelcast.config.EvictionConfig;
import com.hazelcast.config.EvictionPolicy; import com.hazelcast.config.EvictionPolicy;
import com.hazelcast.config.InMemoryFormat; import com.hazelcast.config.InMemoryFormat;
import com.hazelcast.config.MapConfig; import com.hazelcast.config.MapConfig;
import com.hazelcast.config.MergePolicyConfig; import com.hazelcast.config.MergePolicyConfig;
import com.hazelcast.config.TcpIpConfig; import com.hazelcast.config.TcpIpConfig;
import com.hazelcast.map.merge.PutIfAbsentMapMergePolicy; import com.hazelcast.spi.merge.PutIfAbsentMergePolicy;
import java.util.Collections; import java.util.Collections;
@ -18,28 +19,23 @@ public class HazelcastConfig {
@Bean @Bean
public Config hazelcast() { public Config hazelcast() {
MapConfig eventStoreMap = new MapConfig("spring-boot-admin-event-store").setInMemoryFormat(InMemoryFormat.OBJECT) MapConfig eventStoreMap = new MapConfig("spring-boot-admin-event-store")
.setBackupCount(1) .setInMemoryFormat(InMemoryFormat.OBJECT).setBackupCount(1)
.setEvictionPolicy(EvictionPolicy.NONE) .setEvictionConfig(new EvictionConfig().setEvictionPolicy(EvictionPolicy.NONE))
.setMergePolicyConfig(new MergePolicyConfig(PutIfAbsentMapMergePolicy.class.getName(), 100)); .setMergePolicyConfig(new MergePolicyConfig(PutIfAbsentMergePolicy.class.getName(), 100));
MapConfig sentNotificationsMap = new MapConfig("spring-boot-admin-application-store").setInMemoryFormat(InMemoryFormat.OBJECT) MapConfig sentNotificationsMap = new MapConfig("spring-boot-admin-application-store")
.setBackupCount(1) .setInMemoryFormat(InMemoryFormat.OBJECT).setBackupCount(1)
.setEvictionPolicy(EvictionPolicy.LRU) .setEvictionConfig(new EvictionConfig().setEvictionPolicy(EvictionPolicy.LRU))
.setMergePolicyConfig(new MergePolicyConfig(PutIfAbsentMapMergePolicy.class.getName(), 100)); .setMergePolicyConfig(new MergePolicyConfig(PutIfAbsentMergePolicy.class.getName(), 100));
Config config = new Config(); Config config = new Config();
config.addMapConfig(eventStoreMap); config.addMapConfig(eventStoreMap);
config.addMapConfig(sentNotificationsMap); config.addMapConfig(sentNotificationsMap);
config.setProperty("hazelcast.jmx", "true"); config.setProperty("hazelcast.jmx", "true");
config.getNetworkConfig() config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);
.getJoin() TcpIpConfig tcpIpConfig = config.getNetworkConfig().getJoin().getTcpIpConfig();
.getMulticastConfig()
.setEnabled(false);
TcpIpConfig tcpIpConfig = config.getNetworkConfig()
.getJoin()
.getTcpIpConfig();
tcpIpConfig.setEnabled(true); tcpIpConfig.setEnabled(true);
tcpIpConfig.setMembers(Collections.singletonList("127.0.0.1")); tcpIpConfig.setMembers(Collections.singletonList("127.0.0.1"));
return config; return config;