From a63a338433daf23a1160e9c99175bcbbd5978f86 Mon Sep 17 00:00:00 2001
From: Daniel Naber <naber@danielnaber.de>
Date: Sat, 15 Oct 2022 14:10:09 +0200
Subject: [PATCH] "warmUp" has been removed (didn't do anything anyway for
 quite some time)

---
 .../src/main/resources/server.properties.sample              | 1 -
 .../main/java/org/languagetool/server/HTTPServerConfig.java  | 5 +----
 .../src/main/java/org/languagetool/server/Server.java        | 1 -
 languagetool-standalone/CHANGES.md                           | 1 +
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/languagetool-rpm-package/src/main/resources/server.properties.sample b/languagetool-rpm-package/src/main/resources/server.properties.sample
index 345ab8059e8f..0a1093df4110 100644
--- a/languagetool-rpm-package/src/main/resources/server.properties.sample
+++ b/languagetool-rpm-package/src/main/resources/server.properties.sample
@@ -15,7 +15,6 @@ password = keystorepwd
 #   each with ngram occurrence counts; activates the confusion rule if supported (optional)
 # 'maxWorkQueueSize' - reject request if request queue gets larger than this (optional)
 # 'rulesFile' - a file containing rules configuration, such as .langugagetool.cfg (optional)
-# 'warmUp' - set to 'true' to warm up server at start, i.e. run a short check with all languages (optional)
 
 # Maximum text length. Optional - longer texts will cause an error.
 maxTextLength = 120000
diff --git a/languagetool-server/src/main/java/org/languagetool/server/HTTPServerConfig.java b/languagetool-server/src/main/java/org/languagetool/server/HTTPServerConfig.java
index 98a6b1081947..05a2b17866c2 100644
--- a/languagetool-server/src/main/java/org/languagetool/server/HTTPServerConfig.java
+++ b/languagetool-server/src/main/java/org/languagetool/server/HTTPServerConfig.java
@@ -192,7 +192,7 @@ public void setRestrictManagedAccounts(boolean restrictManagedAccounts) {
     "pipelineExpireTimeInSeconds", "pipelinePrewarming", "prometheusMonitoring", "prometheusPort", "remoteRulesFile",
     "requestLimit", "requestLimitInBytes", "requestLimitPeriodInSeconds", "requestLimitWhitelistUsers", "requestLimitWhitelistLimit",
     "rulesFile", "secretTokenKey", "serverURL",
-    "skipLoggingChecks", "skipLoggingRuleMatches", "timeoutRequestLimit", "trustXForwardForHeader", "warmUp",
+    "skipLoggingChecks", "skipLoggingRuleMatches", "timeoutRequestLimit", "trustXForwardForHeader",
     "keystore", "password", "maxTextLengthPremium", "maxTextLengthAnonymous", "maxTextLengthLoggedIn", "gracefulDatabaseFailure",
     "ngramLangIdentData",
     "dbTimeoutSeconds", "dbErrorRateThreshold", "dbTimeoutRateThreshold", "dbDownIntervalSeconds",
@@ -386,9 +386,6 @@ private void parseConfigFile(File file, boolean loadLangModel) {
           throw new IllegalArgumentException("Use of cacheTTLSeconds without also setting cacheSize has no effect.");
         }
         cacheTTLSeconds = Integer.parseInt(getOptionalProperty(props, "cacheTTLSeconds", "300"));
-        if (props.containsKey("warmUp")) {
-          System.err.println("Setting ignored: 'warmUp'. Look into using pipelineCaching and pipelinePrewarming instead.");
-        }
         maxErrorsPerWordRate = Float.parseFloat(getOptionalProperty(props, "maxErrorsPerWordRate", "0"));
         maxSpellingSuggestions = Integer.parseInt(getOptionalProperty(props, "maxSpellingSuggestions", "0"));
         blockedReferrers = Arrays.asList(getOptionalProperty(props, "blockedReferrers", "").split(",\\s*"));
diff --git a/languagetool-server/src/main/java/org/languagetool/server/Server.java b/languagetool-server/src/main/java/org/languagetool/server/Server.java
index bc72738ddd55..b48c10934d5b 100644
--- a/languagetool-server/src/main/java/org/languagetool/server/Server.java
+++ b/languagetool-server/src/main/java/org/languagetool/server/Server.java
@@ -142,7 +142,6 @@ protected static void printCommonConfigFileOptions() {
     System.out.println("                                    https://fasttext.cc/docs/en/support.html");
     System.out.println("                 'maxWorkQueueSize' - reject request if request queue gets larger than this (optional)");
     System.out.println("                 'rulesFile' - a file containing rules configuration, such as .langugagetool.cfg (optional)");
-    System.out.println("                 'warmUp' - set to 'true' to warm up server at start, i.e. run a short check with all languages (optional)");
     System.out.println("                 'blockedReferrers' - a comma-separated list of HTTP referrers (and 'Origin' headers) that are blocked and will not be served (optional)");
     System.out.println("                 'premiumOnly' - activate only the premium rules (optional)");
     System.out.println("                 'disabledRuleIds' - a comma-separated list of rule ids that are turned off for this server (optional)");
diff --git a/languagetool-standalone/CHANGES.md b/languagetool-standalone/CHANGES.md
index 2dd6429d846c..7d316d382860 100644
--- a/languagetool-standalone/CHANGES.md
+++ b/languagetool-standalone/CHANGES.md
@@ -5,6 +5,7 @@
 ...
 
 ### General
+  * The `warmup` setting for the config file, which had no effect anymore, has been removed
   * The deprecated `--word2vecmodel` and `--neuralnetworkmodel` options has been removed,
     as these features were not maintained and had never been used on languagetool.org