Merge pull request #3450 from 1c-syntax/feature/caffeineCache

Добавлено кэширование caffeine

Author: nixel2007

build.gradle.kts

@@ -68,8 +68,12 @@ dependencies {
     api("org.springframework.boot:spring-boot-starter")
     api("org.springframework.boot:spring-boot-starter-websocket")
     api("org.springframework.boot:spring-boot-starter-cache")
+
     api("info.picocli:picocli-spring-boot-starter:4.7.6")
 
+    // кэширование
+    api("com.github.ben-manes.caffeine", "caffeine", "3.2.0")
+
     // lsp4j core
     api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.24.0")
     api("org.eclipse.lsp4j", "org.eclipse.lsp4j.websocket.jakarta", "0.24.0")

src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSBinding.java

@@ -31,6 +31,7 @@
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -40,6 +41,7 @@
 
 @EnableAutoConfiguration
 @ComponentScan("com.github._1c_syntax.bsl.languageserver")
+@EnableCaching(proxyTargetClass = true)
 public class BSLLSBinding {
 
   @Getter(lazy = true, value = AccessLevel.PRIVATE)
@@ -74,17 +76,22 @@ public static ServerContext getServerContext() {
   }
 
   private static SpringApplication createApplication() {
-    return new SpringApplicationBuilder(BSLLSBinding.class)
+    var app = new SpringApplicationBuilder(BSLLSBinding.class)
       .bannerMode(Banner.Mode.OFF)
       .web(WebApplicationType.NONE)
       .logStartupInfo(false)
       .resourceLoader(new DefaultResourceLoader(BSLLSBinding.class.getClassLoader()))
       .lazyInitialization(true)
       .properties(Map.of(
         "app.command.line.runner.enabled", "false",
-        "app.scheduling.enabled", "false"
+        "app.scheduling.enabled", "false",
+        "spring.cache.caffeine.spec", "maximumSize=500,expireAfterAccess=600s",
+        "spring.cache.cache-names", "testIds,testSources"
       ))
       .build();
+
+    app.setRegisterShutdownHook(false);
+    return app;
   }
 
   private static ConfigurableApplicationContext createContext() {

src/main/java/com/github/_1c_syntax/bsl/languageserver/infrastructure/CacheConfiguration.java

@@ -21,7 +21,11 @@
  */
 package com.github._1c_syntax.bsl.languageserver.infrastructure;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -30,4 +34,15 @@
 @Configuration
 @EnableCaching
 public class CacheConfiguration {
+  @Bean
+  public CacheManager cacheManager(Caffeine<Object, Object> caffeine) {
+    var caffeineCacheManager = new CaffeineCacheManager();
+    caffeineCacheManager.setCaffeine(caffeine);
+    return caffeineCacheManager;
+  }
+
+  @Bean
+  public Caffeine<Object, Object> caffeineConfig() {
+    return Caffeine.newBuilder();
+  }
 }

src/main/resources/application.properties

@@ -2,6 +2,7 @@ server.port=8025
 spring.main.banner-mode=off
 spring.main.log-startup-info=false
 spring.cache.cache-names=testIds,testSources
+spring.cache.caffeine.spec=maximumSize=500,expireAfterAccess=600s
 logging.level.org.springframework.boot.autoconfigure.logging=INFO
 logging.level.org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler=warn
 logging.level.com.zaxxer.hikari=warn