diff --git a/pom.xml b/pom.xml index 4a7687b..cb646ae 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.4 + 2.7.18 com.jetbrains.help @@ -14,7 +14,7 @@ Jetbrains-Help Jetbrains-Help - 21 + 8 diff --git a/src/main/java/com/jetbrains/help/context/LicenseContextHolder.java b/src/main/java/com/jetbrains/help/context/LicenseContextHolder.java index c1c69e2..f6661be 100644 --- a/src/main/java/com/jetbrains/help/context/LicenseContextHolder.java +++ b/src/main/java/com/jetbrains/help/context/LicenseContextHolder.java @@ -21,6 +21,7 @@ import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static cn.hutool.crypto.asymmetric.SignAlgorithm.SHA1withRSA; @@ -35,7 +36,7 @@ public class LicenseContextHolder { .setCode(productCode) .setFallbackDate(expiryDate) .setPaidUpTo(expiryDate)) - .toList(); + .collect(Collectors.toList()); LicensePart licensePart = new LicensePart() .setLicenseId(licenseId) .setLicenseeName(licensesName) diff --git a/src/main/java/com/jetbrains/help/context/PluginsContextHolder.java b/src/main/java/com/jetbrains/help/context/PluginsContextHolder.java index 4b25698..afdb286 100644 --- a/src/main/java/com/jetbrains/help/context/PluginsContextHolder.java +++ b/src/main/java/com/jetbrains/help/context/PluginsContextHolder.java @@ -18,6 +18,7 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; @Slf4j @NoArgsConstructor(access = AccessLevel.PRIVATE) @@ -101,7 +102,7 @@ public class PluginsContextHolder { .stream() .filter(plugin -> !PluginsContextHolder.pluginCacheList.contains(new PluginCache().setId(plugin.getId()))) .filter(plugin -> !CharSequenceUtil.equals(plugin.getPricingModel(), "FREE")) - .toList(); + .collect(Collectors.toList()); } public static List pluginConversion(List pluginList) { @@ -117,7 +118,7 @@ public class PluginsContextHolder { .setIcon(PLUGIN_BASIC_URL + plugin.getIcon()) ; }) - .toList(); + .collect(Collectors.toList()); } public static PluginInfo pluginInfo(Long pluginId) { @@ -147,9 +148,9 @@ public class PluginsContextHolder { @Override public final boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PluginCache that)) return false; + if (!(o instanceof PluginCache)) return false; - return id.equals(that.id); + return id.equals(((PluginCache) o).id); } @Override diff --git a/src/main/java/com/jetbrains/help/controller/OpenApiController.java b/src/main/java/com/jetbrains/help/controller/OpenApiController.java index 13b9e42..713f240 100644 --- a/src/main/java/com/jetbrains/help/controller/OpenApiController.java +++ b/src/main/java/com/jetbrains/help/controller/OpenApiController.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; @RestController public class OpenApiController { @@ -41,12 +42,12 @@ public class OpenApiController { .filter(StrUtil::isNotBlank) .map(productCode -> CharSequenceUtil.splitTrim(productCode, ",")) .flatMap(Collection::stream) - .toList(); + .collect(Collectors.toList()); List pluginCodeList = PluginsContextHolder.pluginCacheList() .stream() .map(PluginsContextHolder.PluginCache::getProductCode) .filter(StrUtil::isNotBlank) - .toList(); + .collect(Collectors.toList()); productCodeSet = CollUtil.newHashSet(productCodeList); productCodeSet.addAll(pluginCodeList); }else { diff --git a/src/main/java/com/jetbrains/help/route/IndexController.java b/src/main/java/com/jetbrains/help/route/IndexController.java index 984b6f2..442bee5 100644 --- a/src/main/java/com/jetbrains/help/route/IndexController.java +++ b/src/main/java/com/jetbrains/help/route/IndexController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.io.File; import java.util.List; +import java.util.stream.Collectors; import static org.springframework.http.HttpHeaders.CONTENT_DISPOSITION; import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM; @@ -50,10 +51,10 @@ public class IndexController { if (CharSequenceUtil.isNotBlank(search)) { productCacheList = productCacheList.stream() .filter(productCache -> CharSequenceUtil.containsIgnoreCase(productCache.getName(), search)) - .toList(); + .collect(Collectors.toList()); pluginCacheList = pluginCacheList.stream() .filter(pluginCache -> CharSequenceUtil.containsIgnoreCase(pluginCache.getName(), search)) - .toList(); + .collect(Collectors.toList()); } model.addAttribute("products", productCacheList); model.addAttribute("plugins", pluginCacheList);