SOLR-17931: Remove deprecated code (#3696)

Author: epugh

solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java

@@ -22,8 +22,6 @@
 import java.lang.invoke.MethodHandles;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
-import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.ZooKeeperException;
 import org.apache.solr.common.util.Pair;
 import org.apache.solr.core.SolrResourceLoader;
 import org.apache.solr.core.SolrResourceNotFoundException;
@@ -155,13 +153,6 @@ public Stat getStat() {
     }
   }
 
-  @Override
-  public String getConfigDir() {
-    throw new ZooKeeperException(
-        ErrorCode.SERVER_ERROR,
-        "ZkSolrResourceLoader does not support getConfigDir() - likely, what you are trying to do is not supported in ZooKeeper mode");
-  }
-
   public String getConfigSetZkPath() {
     return configSetZkPath;
   }

solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java

@@ -324,14 +324,6 @@ public Path getConfigPath() {
     return instanceDir.resolve("conf");
   }
 
-  /**
-   * @deprecated use {@link #getConfigPath()}
-   */
-  @Deprecated(since = "9.0.0")
-  public String getConfigDir() {
-    return getConfigPath().toString();
-  }
-
   /**
    * EXPERT
    *

solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java

@@ -20,6 +20,7 @@
 import java.io.UnsupportedEncodingException;
 import java.lang.invoke.MethodHandles;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Date;
@@ -305,7 +306,6 @@ public static boolean isHiddenFile(
     String fname = fnameIn.toUpperCase(Locale.ROOT);
     if (hiddenFiles.contains(fname) || hiddenFiles.contains("*")) {
       if (reportError) {
-        log.error("Cannot access {}", fname);
         rsp.setException(
             new SolrException(SolrException.ErrorCode.FORBIDDEN, "Can not access: " + fnameIn));
       }
@@ -316,7 +316,6 @@ public static boolean isHiddenFile(
     // the effort though to fix it to handle all possibilities though.
     if (fname.contains("..") || fname.startsWith(".")) {
       if (reportError) {
-        log.error("Invalid path: {}", fname);
         rsp.setException(
             new SolrException(SolrException.ErrorCode.FORBIDDEN, "Invalid path: " + fnameIn));
       }
@@ -355,7 +354,6 @@ public static String getAdminFileFromZooKeeper(
 
     // Make sure the file exists, is readable and is not a hidden file
     if (!zkClient.exists(adminFile, true)) {
-      log.error("Can not find: {}", adminFile);
       rsp.setException(
           new SolrException(SolrException.ErrorCode.NOT_FOUND, "Can not find: " + adminFile));
       return null;
@@ -374,9 +372,17 @@ public static Path getAdminFileFromFileSystem(
     if (!Files.exists(configDir)) {
       // TODO: maybe we should just open it this way to start with?
       try {
-        configDir = Path.of(loader.getClassLoader().getResource(loader.getConfigDir()).toURI());
+        URL configUrl = loader.getClassLoader().getResource(loader.getConfigPath().toString());
+        if (configUrl == null) {
+          rsp.setException(
+              new SolrException(
+                  SolrException.ErrorCode.FORBIDDEN,
+                  "Configuration directory resource not found: "
+                      + loader.getConfigPath().toString()));
+          return null;
+        }
+        configDir = Path.of(configUrl.toURI());
       } catch (URISyntaxException e) {
-        log.error("Can not access configuration directory!");
         rsp.setException(
             new SolrException(
                 SolrException.ErrorCode.FORBIDDEN, "Can not access configuration directory!", e));
@@ -390,7 +396,6 @@ public static Path getAdminFileFromFileSystem(
 
     fname = fname.replace('\\', '/'); // normalize slashes
     if (hiddenFiles.contains(fname.toUpperCase(Locale.ROOT))) {
-      log.error("Can not access: {}", fname);
       rsp.setException(
           new SolrException(SolrException.ErrorCode.FORBIDDEN, "Can not access: " + fname));
       return null;
@@ -399,7 +404,6 @@ public static Path getAdminFileFromFileSystem(
     Path filePath = configDir.resolve(fname.startsWith("/") ? fname.substring(1) : fname);
     req.getCoreContainer().assertPathAllowed(filePath);
     if (!filePath.normalize().startsWith(configDir.normalize())) {
-      log.error("Path must be inside core config directory");
       rsp.setException(
           new SolrException(ErrorCode.BAD_REQUEST, "Path must be inside core config directory"));
       return null;

solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java

@@ -50,11 +50,6 @@ public CPUCircuitBreaker() {
     super();
   }
 
-  @Deprecated(since = "9.5")
-  public CPUCircuitBreaker(SolrCore core) {
-    this(core.getCoreContainer());
-  }
-
   public CPUCircuitBreaker(CoreContainer coreContainer) {
     super();
     this.cc = coreContainer;

solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java

@@ -100,9 +100,6 @@ public class JWTAuthPlugin extends AuthenticationPlugin
   private static final long DEFAULT_REFRESH_REPRIEVE_THRESHOLD = 5000;
   static final String PRIMARY_ISSUER = "PRIMARY";
 
-  @Deprecated(since = "9.0") // Remove in 10.0
-  private static final String PARAM_ALG_WHITELIST = "algWhitelist";
-
   private static final Set<String> PROPS =
       Set.of(
           PARAM_BLOCK_UNKNOWN,
@@ -186,14 +183,6 @@ public void init(Map<String, Object> pluginConfig) {
 
     rolesClaim = (String) pluginConfig.get(PARAM_ROLES_CLAIM);
     algAllowlist = (List<String>) pluginConfig.get(PARAM_ALG_ALLOWLIST);
-    // TODO: Remove deprecated warning in Solr 10.0
-    if ((algAllowlist == null || algAllowlist.isEmpty())
-        && pluginConfig.containsKey(PARAM_ALG_WHITELIST)) {
-      log.warn(
-          "Found use of deprecated parameter algWhitelist. Please use {} instead.",
-          PARAM_ALG_ALLOWLIST);
-      algAllowlist = (List<String>) pluginConfig.get(PARAM_ALG_WHITELIST);
-    }
     realm = (String) pluginConfig.getOrDefault(PARAM_REALM, DEFAULT_AUTH_REALM);
 
     Map<String, String> claimsMatch = (Map<String, String>) pluginConfig.get(PARAM_CLAIMS_MATCH);

solr/modules/langid/src/java/org/apache/solr/update/processor/LangIdParams.java

@@ -32,9 +32,6 @@ public interface LangIdParams {
   String ENFORCE_SCHEMA =
       LANGUAGE_ID + ".enforceSchema"; // Enforces that output fields exist in schema
 
-  @Deprecated(since = "9.0.0")
-  String LANG_WHITELIST = LANGUAGE_ID + ".whitelist"; // Old property name for allowed languages
-
   String LANG_ALLOWLIST = LANGUAGE_ID + ".allowlist"; // Allowed languages
   String LCMAP = LANGUAGE_ID + ".lcmap"; // Maps detected langcode to other value
   String MAP_ENABLE = LANGUAGE_ID + ".map"; // Turns on or off the field mapping

solr/modules/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java

@@ -111,16 +111,8 @@ private void initParams(SolrParams params) {
       overwrite = params.getBool(OVERWRITE, false);
       langAllowlist = new HashSet<>();
       threshold = params.getDouble(THRESHOLD, DOCID_THRESHOLD_DEFAULT);
-      final String legacyAllowList = params.get(LANG_WHITELIST, "").trim();
-      if (!legacyAllowList.isEmpty()) {
-        // nowarn compile time string concatenation
-        log.warn(
-            LANG_WHITELIST
-                + " parameter is deprecated; use "
-                + LANG_ALLOWLIST
-                + " instead."); // nowarn
-      }
-      Arrays.stream(params.get(LANG_ALLOWLIST, legacyAllowList).split(","))
+
+      Arrays.stream(params.get(LANG_ALLOWLIST, "").split(","))
           .map(String::trim)
           .filter(lang -> !lang.isEmpty())
           .forEach(langAllowlist::add);

solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java

@@ -474,19 +474,6 @@ public void testAllowlist() throws Exception {
     assertEquals(Set.of("no", "en", "sv"), liProcessor.langAllowlist);
   }
 
-  @Test
-  public void testAllowlistBackwardsCompatabilityWithLegacyAllowlist() throws Exception {
-    // The "legacy allowlist" is "langid.whitelist"
-    ModifiableSolrParams parameters = new ModifiableSolrParams();
-    parameters.add("langid.fl", "name,subject");
-    parameters.add("langid.langField", "language_s");
-    parameters.add("langid.whitelist", "no,en ,, ,sv, sv");
-    liProcessor = createLangIdProcessor(parameters);
-
-    // Make sure that empty language codes have been filtered out and others trimmed.
-    assertEquals(Set.of("no", "en", "sv"), liProcessor.langAllowlist);
-  }
-
   // Various utility methods
 
   private SolrInputDocument englishDoc() {

solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java

@@ -331,20 +331,6 @@ public Builder withParallelUpdates(boolean parallelUpdates) {
       return this;
     }
 
-    /**
-     * When caches are expired then they are refreshed after acquiring a lock. Use this to set the
-     * number of locks.
-     *
-     * <p>Defaults to 3.
-     *
-     * @deprecated Please use {@link #withParallelCacheRefreshes(int)}
-     */
-    @Deprecated(since = "9.2")
-    public Builder setParallelCacheRefreshes(int parallelCacheRefreshesLocks) {
-      this.withParallelCacheRefreshes(parallelCacheRefreshesLocks);
-      return this;
-    }
-
     /**
      * When caches are expired then they are refreshed after acquiring a lock. Use this to set the
      * number of locks.
@@ -356,17 +342,6 @@ public Builder withParallelCacheRefreshes(int parallelCacheRefreshesLocks) {
       return this;
     }
 
-    /**
-     * This is the time to wait to re-fetch the state after getting the same state version from ZK
-     *
-     * @deprecated Please use {@link #withRetryExpiryTime(long, TimeUnit)}
-     */
-    @Deprecated(since = "9.2")
-    public Builder setRetryExpiryTime(int secs) {
-      this.withRetryExpiryTime(secs, TimeUnit.SECONDS);
-      return this;
-    }
-
     /**
      * This is the time to wait to re-fetch the state after getting the same state version from ZK
      */
@@ -381,18 +356,6 @@ public Builder withDefaultCollection(String defaultCollection) {
       return this;
     }
 
-    /**
-     * Sets the cache ttl for DocCollection Objects cached.
-     *
-     * @param timeToLiveSeconds ttl value in seconds
-     * @deprecated Please use {@link #withCollectionCacheTtl(long, TimeUnit)}
-     */
-    @Deprecated(since = "9.2")
-    public Builder withCollectionCacheTtl(int timeToLiveSeconds) {
-      withCollectionCacheTtl(timeToLiveSeconds, TimeUnit.SECONDS);
-      return this;
-    }
-
     /**
      * Sets the cache ttl for DocCollection Objects cached.
      *

solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java

@@ -1024,18 +1024,6 @@ public HttpSolrClientBuilderBase<Http2SolrClient.Builder, Http2SolrClient> withS
       return this;
     }
 
-    /**
-     * Set maxConnectionsPerHost for http1 connections, maximum number http2 connections is limited
-     * to 4
-     *
-     * @deprecated Please use {@link #withMaxConnectionsPerHost(int)}
-     */
-    @Deprecated(since = "9.2")
-    public Http2SolrClient.Builder maxConnectionsPerHost(int max) {
-      withMaxConnectionsPerHost(max);
-      return this;
-    }
-
     /**
      * Set the scanning interval to check for updates in the Key Store used by this client. If the
      * interval is unset, 0 or less, then the Key Store Scanner is not created, and the client will
@@ -1053,37 +1041,6 @@ public Http2SolrClient.Builder withKeyStoreReloadInterval(long interval, TimeUni
       return this;
     }
 
-    /**
-     * @deprecated Please use {@link #withIdleTimeout(long, TimeUnit)}
-     */
-    @Deprecated(since = "9.2")
-    public Http2SolrClient.Builder idleTimeout(int idleConnectionTimeout) {
-      withIdleTimeout(idleConnectionTimeout, TimeUnit.MILLISECONDS);
-      return this;
-    }
-
-    /**
-     * @deprecated Please use {@link #withConnectionTimeout(long, TimeUnit)}
-     */
-    @Deprecated(since = "9.2")
-    public Http2SolrClient.Builder connectionTimeout(int connectionTimeout) {
-      withConnectionTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
-      return this;
-    }
-
-    /**
-     * Set a timeout in milliseconds for requests issued by this client.
-     *
-     * @param requestTimeout The timeout in milliseconds
-     * @return this Builder.
-     * @deprecated Please use {@link #withRequestTimeout(long, TimeUnit)}
-     */
-    @Deprecated(since = "9.2")
-    public Http2SolrClient.Builder requestTimeout(int requestTimeout) {
-      withRequestTimeout(requestTimeout, TimeUnit.MILLISECONDS);
-      return this;
-    }
-
     private HttpCookieStore getCookieStore() {
       if (cookieStore == null) {
         return cookieStore;