Apache Solr open-source search software
SOLR-16732: misc sonar fixes (#1525)
Kevin Risden26e81ab3696e
diff --git a/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java b/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.javaindex 3bb7b97f73b..3fea96c2ba8 100644--- a/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java+++ b/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java@@ -259,9 +259,8 @@ public class ContainerPluginsRegistry implements ClusterPropertiesListener, MapW}private static String getActualPath(ApiInfo apiInfo, String path) {- path = path.replaceAll("\\$path-prefix", apiInfo.info.pathPrefix);- path = path.replaceAll("\\$plugin-name", apiInfo.info.name);- return path;+ return path.replace("$path-prefix", Objects.requireNonNullElse(apiInfo.info.pathPrefix, ""))+ .replace("$plugin-name", apiInfo.info.name);}private static Map<String, String> getTemplateVars(PluginMeta pluginMeta) {diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.javaindex d9a1687d28e..2d2669af2ce 100644--- a/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java@@ -60,7 +60,7 @@ final class OverseerElectionContext extends ElectionContext {return;}log.info("I am going to be the leader {}", id);- final String id = leaderSeqPath.substring(leaderSeqPath.lastIndexOf("/") + 1);+ final String id = leaderSeqPath.substring(leaderSeqPath.lastIndexOf('/') + 1);ZkNodeProps myProps = new ZkNodeProps(ID, id);zkClient.makePath(leaderPath, Utils.toJSON(myProps), CreateMode.EPHEMERAL, true);diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.javaindex 10137e5416e..3092dce185e 100644--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java@@ -106,7 +106,7 @@ public class OverseerTaskQueue extends ZkDistributedQueue {Timer.Context time = stats.time(dir + "_remove_event");try {String path = event.getId();- String responsePath = dir + "/" + RESPONSE_PREFIX + path.substring(path.lastIndexOf("-") + 1);+ String responsePath = dir + "/" + RESPONSE_PREFIX + path.substring(path.lastIndexOf('-') + 1);try {zookeeper.setData(responsePath, event.getBytes(), true);@@ -244,7 +244,7 @@ public class OverseerTaskQueue extends ZkDistributedQueue {void createRequestNode(byte[] data, String watchID) throws KeeperException, InterruptedException {createData(- dir + "/" + PREFIX + watchID.substring(watchID.lastIndexOf("-") + 1),+ dir + "/" + PREFIX + watchID.substring(watchID.lastIndexOf('-') + 1),data,CreateMode.PERSISTENT);}diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.javaindex 6a7a3f561d6..40ac1662714 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java@@ -1187,11 +1187,11 @@ public class ZkController implements Closeable {return true;}log.trace("zkHost includes chroot");- String chrootPath = zkHost.substring(zkHost.indexOf("/"), zkHost.length());+ String chrootPath = zkHost.substring(zkHost.indexOf('/'), zkHost.length());SolrZkClient tmpClient =new SolrZkClient.Builder()- .withUrl(zkHost.substring(0, zkHost.indexOf("/")))+ .withUrl(zkHost.substring(0, zkHost.indexOf('/'))).withTimeout(60000, TimeUnit.MILLISECONDS).withConnTimeOut(30000, TimeUnit.MILLISECONDS).build();diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.javaindex 2928f667386..99aa221519a 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java@@ -627,7 +627,7 @@ public class CreateCollectionCmd implements CollApiCmds.CollectionApiCommand {log.info("Only one config set found in zk - using it: {}", configName);}}- return "".equals(configName) ? null : configName;+ return configName != null && configName.isEmpty() ? null : configName;}/** Copies the _default configset to the specified configset name (overwrites if pre-existing) */diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.javaindex 9d36e1461ec..a96496819e2 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java@@ -110,7 +110,7 @@ public class DimensionalRoutedAlias extends RoutedAlias {// something expensive, but if you have malicious users able to run admin commands and create// aliases, it is very likely that you have much bigger problems than an expensive regex.String routeString =- dimension.computeInitialCollectionName().replaceAll(dimension.getAliasName(), "");+ dimension.computeInitialCollectionName().replace(dimension.getAliasName(), "");sb.append(routeString);}return sb.toString();diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/SetAliasPropCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/SetAliasPropCmd.javaindex c1273d7dd3c..671b71dddb6 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/SetAliasPropCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/SetAliasPropCmd.java@@ -69,7 +69,7 @@ public class SetAliasPropCmd implements CollectionApiCommand {// check & cleanup properties. It's a mutable copy.for (Map.Entry<String, String> entry : properties.entrySet()) {String key = entry.getKey();- if ("".equals(key.trim())) {+ if (key.trim().isEmpty()) {throw new SolrException(BAD_REQUEST, "property keys must not be pure whitespace");}if (!key.equals(key.trim())) {@@ -77,7 +77,7 @@ public class SetAliasPropCmd implements CollectionApiCommand {BAD_REQUEST, "property keys should not begin or end with whitespace");}String value = entry.getValue();- if ("".equals(value)) {+ if (value != null && value.isEmpty()) {entry.setValue(null);}}diff --git a/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.javaindex bc65919417d..5752c33b97e 100644--- a/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java+++ b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java@@ -211,9 +211,11 @@ public class CoreDescriptor {if (isUserDefinedProperty(propname)) originalExtraProperties.put(propname, propvalue);else originalCoreProperties.put(propname, propvalue);- if (!requiredProperties.contains(propname)) // Required props are already dealt with- coreProperties.setProperty(+ // Required props are already dealt with+ if (!requiredProperties.contains(propname)) {+ coreProperties.setProperty(propname, PropertiesUtil.substituteProperty(propvalue, containerProperties));+ }}loadExtraProperties();diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.javaindex be5bb3fccb3..e6aca9310af 100644--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java@@ -541,7 +541,7 @@ public class SolrConfig implements MapSerializable {}public String getCleanTag() {- return tag.replaceAll("/", "");+ return tag.replace("/", "");}public String getTagCleanLower() {@@ -773,7 +773,7 @@ public class SolrConfig implements MapSerializable {try {final Matcher ttlMatcher = MAX_AGE.matcher(cacheControlHeader);final String ttlStr = ttlMatcher.find() ? ttlMatcher.group(1) : null;- tmp = (null != ttlStr && !"".equals(ttlStr)) ? Long.valueOf(ttlStr) : null;+ tmp = (null != ttlStr && !ttlStr.isEmpty()) ? Long.valueOf(ttlStr) : null;} catch (Exception e) {log.warn("Ignoring exception while attempting to extract max-age from cacheControl config: {}",diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.javaindex 8e5ea021eac..7017ce47f93 100644--- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java+++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java@@ -224,7 +224,7 @@ public class SolrResourceLoader"Added {} libs to classloader, from paths: {}",urls.size(),urls.stream()- .map(u -> u.getPath().substring(0, u.getPath().lastIndexOf("/")))+ .map(u -> u.getPath().substring(0, u.getPath().lastIndexOf('/'))).sorted().distinct().collect(Collectors.toList()));diff --git a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.javaindex 4995e38a09f..8bd0f2c71ea 100644--- a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java+++ b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java@@ -246,7 +246,7 @@ public class DistribPackageStore implements PackageStore {}String getSimpleName() {- int idx = path.lastIndexOf("/");+ int idx = path.lastIndexOf('/');if (idx == -1) return path;return path.substring(idx + 1);}diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.javaindex 404d2524d8e..ae0cd65b6d4 100644--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java@@ -1457,7 +1457,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw{final String reserve = (String) initArgs.get(RESERVE);- if (reserve != null && !reserve.trim().equals("")) {+ if (reserve != null && !reserve.trim().isEmpty()) {reserveCommitDuration = readIntervalMs(reserve);}}diff --git a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java b/solr/core/src/java/org/apache/solr/handler/StreamHandler.javaindex a9ba23eeeb4..756a7956483 100644--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java@@ -544,7 +544,7 @@ public class StreamHandler extends RequestHandlerBaseIterator<String> paramsIt = params.getParameterNamesIterator();while (paramsIt.hasNext()) {String param = paramsIt.next();- if (param.indexOf(".shards") > -1) {+ if (param.contains(".shards")) {String collection = param.split("\\.")[0];String shardString = params.get(param);String[] shards = shardString.split(",");diff --git a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlersProxy.java b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlersProxy.javaindex 56ce6d51776..cd278fd095a 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlersProxy.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlersProxy.java@@ -96,7 +96,7 @@ public class AdminHandlersProxy {log.debug("Nodes requested: {}", nodes);}if (log.isDebugEnabled()) {- log.debug("{} parameter {} specified on {} request", PARAM_NODES, nodeNames, pathStr);+ log.debug("{} parameter {} specified on {} request", PARAM_NODES, nodeNames, pathStr);}ModifiableSolrParams params = new ModifiableSolrParams(req.getParams());diff --git a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.javaindex 3f967123f94..1b44c63dc6e 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java@@ -173,7 +173,7 @@ public class InfoHandler extends RequestHandlerBase {public Name getPermissionName(AuthorizationContext request) {// Delegate permission to the actual handlerString path = request.getResource();- String lastPath = path.substring(path.lastIndexOf("/") + 1);+ String lastPath = path.substring(path.lastIndexOf('/') + 1);RequestHandlerBase handler = handlers.get(lastPath.toLowerCase(Locale.ROOT));if (handler != null) {return handler.getPermissionName(request);diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.javaindex 7c72ee96c21..e2d8b7715b8 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java@@ -302,7 +302,7 @@ public class ShowFileRequestHandler extends RequestHandlerBase implements Permis// This is slightly off, a valid path is something like ./schema.xml. I don't think it's worth// the effort though to fix it to handle all possibilities though.- if (fname.indexOf("..") >= 0 || fname.startsWith(".")) {+ if (fname.contains("..") || fname.startsWith(".")) {if (reportError) {log.error("Invalid path: {}", fname);rsp.setException(diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SolrEnvironment.java b/solr/core/src/java/org/apache/solr/handler/admin/SolrEnvironment.javaindex 4e032124bb4..1d289ce0422 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SolrEnvironment.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SolrEnvironment.java@@ -40,7 +40,7 @@ public class SolrEnvironment {}public String getLabel() {- return label == null ? null : label.replaceAll("\\+", " ");+ return label == null ? null : label.replace("+", " ");}public String getColor() {diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.javaindex b36ab3e4d99..f0023791c60 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java@@ -411,9 +411,9 @@ public class SystemInfoHandler extends RequestHandlerBase {for (String arg : mx.getInputArguments()) {if (arg.startsWith("-D")&& arg.contains("=")- && RedactionUtils.isSystemPropertySensitive(arg.substring(2, arg.indexOf("=")))) {+ && RedactionUtils.isSystemPropertySensitive(arg.substring(2, arg.indexOf('=')))) {list.add(- String.format(Locale.ROOT, "%s=%s", arg.substring(0, arg.indexOf("=")), REDACT_STRING));+ String.format(Locale.ROOT, "%s=%s", arg.substring(0, arg.indexOf('=')), REDACT_STRING));} else {list.add(arg);}diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.javaindex 1a679f3b471..d05d3862ba7 100644--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java@@ -1306,7 +1306,7 @@ public class RealTimeGetComponent extends SearchComponent {// handle version rangesList<Long> versions = null;- if (versionsStr.indexOf("...") != -1) {+ if (versionsStr.contains("...")) {versions = resolveVersionRanges(versionsStr, ulog);} else {versions =diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/OffsetCorrector.java b/solr/core/src/java/org/apache/solr/handler/tagger/OffsetCorrector.javaindex e3d907c48af..ee919872cc8 100644--- a/solr/core/src/java/org/apache/solr/handler/tagger/OffsetCorrector.java+++ b/solr/core/src/java/org/apache/solr/handler/tagger/OffsetCorrector.java@@ -131,8 +131,9 @@ public abstract class OffsetCorrector {protected int correctEndOffsetForCloseElement(int endOffset) {if (docText.charAt(endOffset - 1) == '>') {final int newEndOffset = docText.lastIndexOf('<', endOffset - 2);- if (newEndOffset > offsetPair[0]) // just to be sure- return newEndOffset;+ if (newEndOffset > offsetPair[0]) { // just to be sure+ return newEndOffset;+ }}return endOffset;}diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/Tagger.java b/solr/core/src/java/org/apache/solr/handler/tagger/Tagger.javaindex aef96e08831..a0230635109 100644--- a/solr/core/src/java/org/apache/solr/handler/tagger/Tagger.java+++ b/solr/core/src/java/org/apache/solr/handler/tagger/Tagger.java@@ -163,8 +163,9 @@ public abstract class Tagger {// determine if the terms index has a term starting with the provided term// TODO create a pool of these cursors to reuse them more? could be trivial impl- if (cursor == null) // (else the existing cursor will be re-used)- cursor = new TermPrefixCursor(terms.iterator(), liveDocs, docIdsCache);+ if (cursor == null) { // (else the existing cursor will be re-used)+ cursor = new TermPrefixCursor(terms.iterator(), liveDocs, docIdsCache);+ }if (cursor.advance(term)) {TagLL newTail =new TagLL(head, cursor, offsetAtt.startOffset(), offsetAtt.endOffset(), null);diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.javaindex b4c31bcf825..cf60152f50a 100644--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java@@ -445,8 +445,9 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInfpublic NamedList<Object> doHighlighting(DocList docs, Query query, SolrQueryRequest req, String[] defaultFields) throws IOException {SolrParams params = req.getParams();- if (!isHighlightingEnabled(params)) // also returns early if no unique key field- return null;+ if (!isHighlightingEnabled(params)) { // also returns early if no unique key field+ return null;+ }boolean rewrite =query != null@@ -761,8 +762,9 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInfhighlighter.getBestTextFragments(tstream, thisText, mergeContiguousFragments, numFragments);for (TextFragment bestTextFragment : bestTextFragments) {- if (bestTextFragment == null) // can happen via mergeContiguousFragments- continue;+ if (bestTextFragment == null) { // can happen via mergeContiguousFragments+ continue;+ }// normally we want a score (must be highlighted), but if preserveMulti then we return a// snippet regardless.if (bestTextFragment.getScore() > 0 || preserveMulti) {diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.javaindex 9285804aa00..4e7729fa49a 100644--- a/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java+++ b/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java@@ -96,7 +96,7 @@ public abstract class SolrHighlighter {for (String field : SolrPluginUtils.split(inField)) {if (field.contains("*")) {// create a Java regular expression from the wildcard string- Pattern fieldRegex = Pattern.compile(field.replaceAll("\\*", ".*"));+ Pattern fieldRegex = Pattern.compile(field.replace("*", ".*"));if (availableFieldNames == null) {availableFieldNames = availableFieldNamesSupplier.get();}diff --git a/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.java b/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.javaindex dd21d45aba6..c025ef59df0 100644--- a/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.java+++ b/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.java@@ -99,7 +99,7 @@ public class JulWatcher extends LogWatcher<LogRecord> {map.put(name, new JulInfo(name, logger));while (true) {- int dot = name.lastIndexOf(".");+ int dot = name.lastIndexOf('.');if (dot < 0) break;name = name.substring(0, dot);if (!map.containsKey(name)) {diff --git a/solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.java b/solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.javaindex bd5029ff962..66ea68ff3a0 100644--- a/solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.java+++ b/solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.java@@ -185,7 +185,10 @@ public class Log4j2Watcher extends LogWatcher<LogEvent> {for (Map.Entry<String, LoggerConfig> logger : loggers.entrySet()) {String name = logger.getKey();- if (logger == root || root.equals(logger) || isRootLogger(name) || "".equals(name)) {+ if (logger == root+ || root.equals(logger)+ || isRootLogger(name)+ || (name != null && name.isEmpty())) {continue;}map.put(name, new Log4j2Info(name, logger.getValue().getLevel()));@@ -197,7 +200,7 @@ public class Log4j2Watcher extends LogWatcher<LogEvent> {map.put(name, new Log4j2Info(name, logger.getLevel()));while (true) {- int dot = name.lastIndexOf(".");+ int dot = name.lastIndexOf('.');if (dot < 0) break;name = name.substring(0, dot);diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxObjectNameFactory.java b/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxObjectNameFactory.javaindex e8c20f98be3..2b19344f569 100644--- a/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxObjectNameFactory.java+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxObjectNameFactory.java@@ -38,9 +38,9 @@ public class JmxObjectNameFactory implements ObjectNameFactory {* @param additionalProperties additional properties as key, value pairs.*/public JmxObjectNameFactory(String reporterName, String domain, String... additionalProperties) {- this.reporterName = reporterName.replaceAll(":", "_");+ this.reporterName = reporterName.replace(":", "_");this.domain = domain;- this.subdomains = domain.replaceAll(":", "_").split("\\.");+ this.subdomains = domain.replace(":", "_").split("\\.");if (additionalProperties != null && (additionalProperties.length % 2) != 0) {throw new IllegalArgumentException("additionalProperties length must be even: " + Arrays.toString(additionalProperties));@@ -69,7 +69,7 @@ public class JmxObjectNameFactory implements ObjectNameFactory {public ObjectName createName(String type, String currentDomain, String name) {SolrMetricInfo metricInfo = SolrMetricInfo.of(name);String safeName = metricInfo != null ? metricInfo.name : name;- safeName = safeName.replaceAll(":", "_");+ safeName = safeName.replace(":", "_");// It turns out that ObjectName(String) mostly preserves key ordering// as specified in the constructor (except for the 'type' key that ends// up at top level) - unlike ObjectName(String, Map) constructor@@ -92,7 +92,7 @@ public class JmxObjectNameFactory implements ObjectNameFactory {}sb.append(','); // separate from other properties} else {- sb.append(currentDomain.replaceAll(":", "_"));+ sb.append(currentDomain.replace(":", "_"));sb.append(':');}} else {diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.javaindex f6210d09da9..b87b162ac63 100644--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java@@ -195,18 +195,19 @@ public class PackageUtils {if (str == null) return null;if (defaults != null) {- for (String param : defaults.keySet()) {+ for (Map.Entry<String, String> entry : defaults.entrySet()) {+ String param = entry.getKey();str =- str.replaceAll(- "\\$\\{" + param + "\\}",- overrides.containsKey(param) ? overrides.get(param) : defaults.get(param));+ str.replace(+ "${" + param + "}",+ overrides.containsKey(param) ? overrides.get(param) : entry.getValue());}}- for (String param : overrides.keySet()) {- str = str.replaceAll("\\$\\{" + param + "\\}", overrides.get(param));+ for (Map.Entry<String, String> entry : overrides.entrySet()) {+ str = str.replace("${" + entry.getKey() + "}", entry.getValue());}- for (String param : systemParams.keySet()) {- str = str.replaceAll("\\$\\{" + param + "\\}", systemParams.get(param));+ for (Map.Entry<String, String> entry : systemParams.entrySet()) {+ str = str.replace("${" + entry.getKey() + "}", entry.getValue());}return str;}diff --git a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.javaindex a81829e169b..ace858667bc 100644--- a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java+++ b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java@@ -326,7 +326,7 @@ public class RequestUtil {}private static void getParamsFromJSON(Map<String, String[]> params, String json) {- if (json.indexOf("params") < 0) {+ if (!json.contains("params")) {return;}diff --git a/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java b/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.javaindex 84da639bd6d..6a49f92fdc3 100644--- a/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java@@ -133,23 +133,23 @@ public class GraphMLResponseWriter implements QueryResponseWriter {}private String xmlEscape(String s) {- if (s.indexOf(">") > -1) {+ if (s.contains(">")) {s = s.replace(">", ">");}- if (s.indexOf("<") > -1) {+ if (s.contains("<")) {s = s.replace("<", "<");}- if (s.indexOf("\"") > -1) {+ if (s.contains("\"")) {s = s.replace("\"", """);}- if (s.indexOf("'") > -1) {+ if (s.contains("'")) {s = s.replace("'", "'");}- if (s.indexOf("&") > -1) {+ if (s.contains("&")) {s = s.replace("&", "&");}diff --git a/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java b/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.javaindex fcf8865a8b6..2e63d5cab2e 100644--- a/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java+++ b/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java@@ -94,7 +94,7 @@ public abstract class BaseSolrResource {final String path = solrRequest.getPath();if (!RestManager.SCHEMA_BASE_PATH.equals(path)) {// don't set webapp property on the request when context and core/collection are excluded- final int cutoffPoint = path.indexOf("/", 1);+ final int cutoffPoint = path.indexOf('/', 1);final String firstPathElement = -1 == cutoffPoint ? path : path.substring(0, cutoffPoint);solrRequest.getContext().put("webapp", firstPathElement); // Context path}diff --git a/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java b/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.javaindex a12b4b41288..c567fc74f37 100644--- a/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java+++ b/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java@@ -212,16 +212,19 @@ public abstract class AbstractEnumField extends PrimitiveFieldType {Integer intValue;final Integer enumInt = enumStringToIntMap.get(stringVal);- if (enumInt != null) // enum int found for string- return enumInt;+ if (enumInt != null) { // enum int found for string+ return enumInt;+ }// enum int not found for stringintValue = tryParseInt(stringVal);- if (intValue == null) // not Integer- intValue = DEFAULT_VALUE;+ if (intValue == null) { // not Integer+ intValue = DEFAULT_VALUE;+ }final String enumString = enumIntToStringMap.get(intValue);- if (enumString != null) // has matching string- return intValue;+ if (enumString != null) { // has matching string+ return intValue;+ }return DEFAULT_VALUE;}@@ -230,7 +233,7 @@ public abstract class AbstractEnumField extends PrimitiveFieldType {Integer intValue = null;try {intValue = Integer.parseInt(valueStr);- } catch (NumberFormatException e) {+ } catch (NumberFormatException ignore) {}return intValue;}diff --git a/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java b/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.javaindex 03603c9509b..3fb6f59c058 100644--- a/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java+++ b/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java@@ -185,7 +185,7 @@ public class CurrencyFieldType extends FieldType implements SchemaAware, Resourcif (field.stored()) {String storedValue = externalVal.toString().trim();- if (storedValue.indexOf(",") < 0) {+ if (!storedValue.contains(",")) {storedValue += "," + defaultCurrency;}f.add(createField(field.getName(), storedValue, StoredField.TYPE));diff --git a/solr/core/src/java/org/apache/solr/schema/DateRangeField.java b/solr/core/src/java/org/apache/solr/schema/DateRangeField.javaindex ccc385fe107..d7a91a41383 100644--- a/solr/core/src/java/org/apache/solr/schema/DateRangeField.java+++ b/solr/core/src/java/org/apache/solr/schema/DateRangeField.java@@ -65,8 +65,9 @@ public class DateRangeField@Overridepublic List<IndexableField> createFields(SchemaField field, Object val) {- if (val instanceof Date || val instanceof Calendar) // From URP?- val = tree.toUnitShape(val);+ if (val instanceof Date || val instanceof Calendar) { // From URP?+ val = tree.toUnitShape(val);+ }return super.createFields(field, val);}diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.javaindex a164a2b2287..8666b971b78 100644--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java@@ -482,7 +482,7 @@ public abstract class FieldType extends FieldProperties {* @return a Query instance to perform prefix search*/public Query getPrefixQuery(QParser parser, SchemaField sf, String termStr) {- if ("".equals(termStr)) {+ if (termStr != null && termStr.isEmpty()) {return getExistenceQuery(parser, sf);}PrefixQuery query = new PrefixQuery(new Term(sf.getName(), termStr));diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.javaindex 96cbb9d5680..1cc5903ba4e 100644--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java@@ -217,7 +217,7 @@ public class ManagedIndexSchemaFactory extends IndexSchemaFactory implements Solfinal SolrZkClient zkClient = zkLoader.getZkController().getZkClient();final String managedSchemaPath = lookupZKManagedSchemaPath();managedSchemaResourceName =- managedSchemaPath.substring(managedSchemaPath.lastIndexOf("/") + 1); // not loving this+ managedSchemaPath.substring(managedSchemaPath.lastIndexOf('/') + 1); // not loving thisStat stat = new Stat();try {// Attempt to load the managed schemadiff --git a/solr/core/src/java/org/apache/solr/schema/PointField.java b/solr/core/src/java/org/apache/solr/schema/PointField.javaindex 29b07a08d15..611dcfc43a4 100644--- a/solr/core/src/java/org/apache/solr/schema/PointField.java+++ b/solr/core/src/java/org/apache/solr/schema/PointField.java@@ -240,7 +240,7 @@ public abstract class PointField extends NumericFieldType {@Overridepublic Query getPrefixQuery(QParser parser, SchemaField sf, String termStr) {- if ("".equals(termStr)) {+ if (termStr != null && termStr.isEmpty()) {return getExistenceQuery(parser, sf);}throw new SolrException(diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java b/solr/core/src/java/org/apache/solr/schema/SchemaManager.javaindex 1d8482cdcea..801863fa882 100644--- a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java+++ b/solr/core/src/java/org/apache/solr/schema/SchemaManager.java@@ -509,7 +509,7 @@ public class SchemaManager {// use current schemareturn (ManagedIndexSchema) core.getLatestSchema();}- schemaResourceName = managedSchemaPath.substring(managedSchemaPath.lastIndexOf("/") + 1);+ schemaResourceName = managedSchemaPath.substring(managedSchemaPath.lastIndexOf('/') + 1);InputStream in = resourceLoader.openResource(schemaResourceName);if (in instanceof ZkSolrResourceLoader.ZkByteArrayInputStream) {int version = ((ZkSolrResourceLoader.ZkByteArrayInputStream) in).getStat().getVersion();diff --git a/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java b/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.javaindex 7b3a6aefa7c..79f856d3c77 100644--- a/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java+++ b/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java@@ -496,7 +496,6 @@ public final class SimplePreAnalyzedParser implements PreAnalyzedParser {String s = f.stringValue();if (s != null) {// encode the equals sign- s = s.replaceAll("=", "\\=");sb.append('=');sb.append(s);sb.append('=');diff --git a/solr/core/src/java/org/apache/solr/search/BitDocSet.java b/solr/core/src/java/org/apache/solr/search/BitDocSet.javaindex 1ac943bb1e6..831de78cb47 100644--- a/solr/core/src/java/org/apache/solr/search/BitDocSet.java+++ b/solr/core/src/java/org/apache/solr/search/BitDocSet.java@@ -248,11 +248,6 @@ public class BitDocSet extends DocSet {public DocIdSetIterator iterator(LeafReaderContext context) {if (context.isTopLevel) {switch (size) {- case 0:- return null;- default:- // we have an explicit size; use it- return new BitSetIterator(bits, size);case -1:// size has not been computed; use bits.length() as an upper bound on costfinal int maxSize = bits.length();@@ -261,6 +256,11 @@ public class BitDocSet extends DocSet {} else {return new BitSetIterator(bits, maxSize);}+ case 0:+ return null;+ default:+ // we have an explicit size; use it+ return new BitSetIterator(bits, size);}}diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.javaindex 8026fa16328..4020ddafe2e 100644--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java@@ -2120,7 +2120,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {FieldType minMaxFieldType = null;if (GroupHeadSelectorType.MIN_MAX.contains(groupHeadSelector.type)) {final String text = groupHeadSelector.selectorText;- if (text.indexOf("(") == -1) {+ if (!text.contains("(")) {minMaxFieldType = searcher.getSchema().getField(text).getType();} else {SolrParams params = new ModifiableSolrParams();@@ -2268,7 +2268,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {* sources if they depend on score*/public static boolean wantsCScore(final String text) {- return (0 <= text.indexOf("cscore()"));+ return (text.contains("cscore()"));}private CollapseScore() {diff --git a/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java b/solr/core/src/java/org/apache/solr/search/DisMaxQParser.javaindex 79f9d705b50..28b86e6011b 100644--- a/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java+++ b/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java@@ -120,7 +120,7 @@ public class DisMaxQParser extends QParser {String[] boostFuncs = solrParams.getParams(DisMaxParams.BF);if (null != boostFuncs && 0 != boostFuncs.length) {for (String boostFunc : boostFuncs) {- if (null == boostFunc || "".equals(boostFunc)) continue;+ if (null == boostFunc || boostFunc.isEmpty()) continue;Map<String, Float> ff = SolrPluginUtils.parseFieldBoosts(boostFunc);for (Map.Entry<String, Float> entry : ff.entrySet()) {Query fq = subQuery(entry.getKey(), FunctionQParserPlugin.NAME).getQuery();diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.javaindex fb5c5a6acfe..89e45e87358 100644--- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java+++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java@@ -551,7 +551,7 @@ public class ExtendedDismaxQParser extends QParser {List<Query> boostFunctions = new ArrayList<>();if (config.hasBoostFunctions()) {for (String boostFunc : config.boostFuncs) {- if (null == boostFunc || "".equals(boostFunc)) continue;+ if (null == boostFunc || boostFunc.isEmpty()) continue;Map<String, Float> ff = SolrPluginUtils.parseFieldBoosts(boostFunc);for (Map.Entry<String, Float> entry : ff.entrySet()) {Query fq = subQuery(entry.getKey(), FunctionQParserPlugin.NAME).getQuery();@@ -1075,7 +1075,7 @@ public class ExtendedDismaxQParser extends QParser {@Overrideprotected Query getPrefixQuery(String field, String val) throws SyntaxError {- if (val.equals("") && field.equals("*")) {+ if (val.isEmpty() && field.equals("*")) {return new MatchAllDocsQuery();}this.type = QType.PREFIX;diff --git a/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java b/solr/core/src/java/org/apache/solr/search/SolrCacheBase.javaindex a14a250bb72..e0716071c02 100644--- a/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java+++ b/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java@@ -52,7 +52,7 @@ public abstract class SolrCacheBase {// odd undocumented legacy behavior, -1 meant "all" (now "100%")strVal = ("-1".equals(input)) ? "100%" : input;- if (strVal.indexOf("%") == (strVal.length() - 1)) {+ if (strVal.indexOf('%') == (strVal.length() - 1)) {autoWarmCount = 0;autoWarmPercentage = Integer.parseInt(strVal.substring(0, strVal.length() - 1));autoWarmByPercentage = true;diff --git a/solr/core/src/java/org/apache/solr/search/function/MultiStringFunction.java b/solr/core/src/java/org/apache/solr/search/function/MultiStringFunction.javaindex a2e7dd7c3d2..6379beb004c 100644--- a/solr/core/src/java/org/apache/solr/search/function/MultiStringFunction.java+++ b/solr/core/src/java/org/apache/solr/search/function/MultiStringFunction.java@@ -79,7 +79,7 @@ public abstract class MultiStringFunction extends ValueSource {public boolean exists(int doc) throws IOException {boolean exists = true;for (FunctionValues val : valsArr) {- exists = exists & val.exists(doc);+ exists = exists && val.exists(doc);}return exists;}diff --git a/solr/core/src/java/org/apache/solr/search/join/ChildFieldValueSourceParser.java b/solr/core/src/java/org/apache/solr/search/join/ChildFieldValueSourceParser.javaindex 2cd3e6a26f2..e4af1ad0d9e 100644--- a/solr/core/src/java/org/apache/solr/search/join/ChildFieldValueSourceParser.java+++ b/solr/core/src/java/org/apache/solr/search/join/ChildFieldValueSourceParser.java@@ -183,7 +183,7 @@ public class ChildFieldValueSourceParser extends ValueSourceParser {childFilter =BlockJoinParentQParser.getCachedBitSetProducer(fp.getReq(), bjQ.getChildQuery());- if (sortFieldName == null || sortFieldName.equals("")) {+ if (sortFieldName == null || sortFieldName.isEmpty()) {throw new SyntaxError("field is omitted in " + fp.getString());}diff --git a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.javaindex f6dfbfe29f5..2108d8cd5b2 100644--- a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java+++ b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java@@ -139,7 +139,7 @@ public class BasicAuthPlugin extends AuthenticationPlugintry {String credentials =new String(Base64.getDecoder().decode(st.nextToken()), StandardCharsets.UTF_8);- int p = credentials.indexOf(":");+ int p = credentials.indexOf(':');if (p != -1) {final String username = credentials.substring(0, p).trim();String pwd = credentials.substring(p + 1).trim();diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.javaindex f1156e53ec6..439cb54e49e 100644--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java@@ -250,7 +250,7 @@ public class HttpSolrCall {}// Parse a core or collection name from the path and attempt to see if it's a core name- idx = path.indexOf("/", 1);+ idx = path.indexOf('/', 1);if (idx > 1) {origCorename = path.substring(1, idx);diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.javaindex ef8f9322a71..38cbc6c7808 100644--- a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java@@ -204,7 +204,7 @@ public class JaspellTernarySearchTrie implements Accountable {int pos;Float occur, one = 1f;while ((word = in.readLine()) != null) {- pos = word.indexOf("\t");+ pos = word.indexOf('\t');occur = one;if (pos != -1) {occur = Float.parseFloat(word.substring(pos + 1).trim());diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.javaindex 7b1d1d858cb..636a2c59240 100644--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java@@ -1002,7 +1002,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {DeleteUpdateCommand cmd, long versionOnUpdate, boolean isReplayOrPeersync)throws IOException {if (versionsStored) {- final boolean leaderLogic = isLeader & !isReplayOrPeersync;+ final boolean leaderLogic = isLeader && !isReplayOrPeersync;if (leaderLogic) {long version = vinfo.getNewClock();cmd.setVersion(-version);diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.javaindex ab6ecab3d29..843dbde6724 100644--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java@@ -859,7 +859,7 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {@Overrideprotected boolean shouldCloneCmdDoc() {boolean willDistrib = isLeader && nodes != null && nodes.size() > 0;- return willDistrib & cloneRequiredOnLeader;+ return willDistrib && cloneRequiredOnLeader;}// helper method, processAdd was getting a bit large.diff --git a/solr/core/src/java/org/apache/solr/util/DateMathParser.java b/solr/core/src/java/org/apache/solr/util/DateMathParser.javaindex eef17572162..cfe0aa0d7d9 100644--- a/solr/core/src/java/org/apache/solr/util/DateMathParser.java+++ b/solr/core/src/java/org/apache/solr/util/DateMathParser.java@@ -244,7 +244,7 @@ public class DateMathParser {}}- if (null == math || math.equals("")) {+ if (null == math || math.isEmpty()) {return p.getNow();}diff --git a/solr/core/src/java/org/apache/solr/util/PackageTool.java b/solr/core/src/java/org/apache/solr/util/PackageTool.javaindex e0e59b6bc88..2c6629fa2db 100644--- a/solr/core/src/java/org/apache/solr/util/PackageTool.java+++ b/solr/core/src/java/org/apache/solr/util/PackageTool.java@@ -75,7 +75,7 @@ public class PackageTool extends SolrCLI.ToolBase {protected void runImpl(CommandLine cli) throws Exception {try {solrUrl = cli.getOptionValues("solrUrl")[cli.getOptionValues("solrUrl").length - 1];- solrBaseUrl = solrUrl.replaceAll("\\/solr$", ""); // strip out ending "/solr"+ solrBaseUrl = solrUrl.replaceAll("/solr$", ""); // strip out ending "/solr"log.info("Solr url:{}, solr base url: {}", solrUrl, solrBaseUrl);String zkHost = getZkHost(cli);if (zkHost == null) {diff --git a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java b/solr/core/src/java/org/apache/solr/util/SimplePostTool.javaindex 4d051235d88..0cf6122c4bc 100644--- a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java+++ b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java@@ -641,7 +641,7 @@ public class SimplePostTool {* @return the normalized URL string*/protected static String normalizeUrlEnding(String link) {- if (link.indexOf("#") > -1) link = link.substring(0, link.indexOf("#"));+ if (link.contains("#")) link = link.substring(0, link.indexOf('#'));if (link.endsWith("?")) link = link.substring(0, link.length() - 1);if (link.endsWith("/")) link = link.substring(0, link.length() - 1);return link;@@ -782,7 +782,7 @@ public class SimplePostTool {}String path = baseUrl.getPath();if (!path.endsWith("/")) {- int sep = path.lastIndexOf("/");+ int sep = path.lastIndexOf('/');String file = path.substring(sep + 1);if (file.contains(".") || file.contains("?")) path = path.substring(0, sep);}@@ -821,7 +821,7 @@ public class SimplePostTool {* @return true if "on"*/protected static boolean isOn(String property) {- return ("true,on,yes,1".indexOf(property) > -1);+ return ("true,on,yes,1".contains(property));}static void warn(String msg) {@@ -862,7 +862,7 @@ public class SimplePostTool {if (p.trim().length() == 0) continue;String[] kv = p.split("=");if (kv.length == 2) {- url = url + (url.indexOf('?') > 0 ? "&" : "?") + kv[0] + "=" + kv[1];+ url = url + (url.contains("?") ? "&" : "?") + kv[0] + "=" + kv[1];} else {warn("Skipping param " + p + " which is not on form key=value");}@@ -895,11 +895,11 @@ public class SimplePostTool {// SolrCellsuffix = "/extract";String urlStr = appendUrlPath(solrUrl, suffix).toString();- if (urlStr.indexOf("resource.name") == -1)+ if (!urlStr.contains("resource.name"))urlStr =appendParam(urlStr, "resource.name=" + URLEncoder.encode(file.getAbsolutePath(), "UTF-8"));- if (urlStr.indexOf("literal.id") == -1)+ if (!urlStr.contains("literal.id"))urlStr =appendParam(urlStr, "literal.id=" + URLEncoder.encode(file.getAbsolutePath(), "UTF-8"));@@ -954,7 +954,7 @@ public class SimplePostTool {*/protected static String guessType(File file) {String name = file.getName();- String suffix = name.substring(name.lastIndexOf(".") + 1);+ String suffix = name.substring(name.lastIndexOf('.') + 1);String type = mimeMap.get(suffix.toLowerCase(Locale.ROOT));return (type != null) ? type : "application/octet-stream";}diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.javaindex c8574c049bd..d03b002e7f3 100755--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java@@ -670,11 +670,13 @@ public class SolrCLI implements CLIO {throw exc;}if (--attempts > 0 && checkCommunicationError(exc)) {- if (!isFirstAttempt) // only show the log warning after the second attempt fails- log.warn(+ if (!isFirstAttempt) {+ // only show the log warning after the second attempt fails+ log.warn("Request to {} failed, sleeping for 5 seconds before re-trying the request ...",getUrl,exc);+ }try {Thread.sleep(5000);} catch (InterruptedException ie) {@@ -1600,7 +1602,7 @@ public class SolrCLI implements CLIO {boolean configExistsInZk =confname != null- && !"".equals(confname.trim())+ && !confname.trim().isEmpty()&& ZkStateReader.from(cloudSolrClient).getZkClient().exists("/configs/" + confname, true);@@ -1609,8 +1611,8 @@ public class SolrCLI implements CLIO {// do nothing} else if (configExistsInZk) {echo("Re-using existing configuration directory " + confname);- } else if (confdir != null && !"".equals(confdir.trim())) {- if (confname == null || "".equals(confname.trim())) {+ } else if (confdir != null && !confdir.trim().isEmpty()) {+ if (confname == null || confname.trim().isEmpty()) {confname = collectionName;}Path confPath = ConfigSetService.getConfigsetPath(confdir, configsetsDir);@@ -1649,7 +1651,7 @@ public class SolrCLI implements CLIO {collectionName,numShards,replicationFactor);- if (confname != null && !"".equals(confname.trim())) {+ if (confname != null && !confname.trim().isEmpty()) {createCollectionUrl =createCollectionUrl + String.format(Locale.ROOT, "&collection.configName=%s", confname);}@@ -1682,7 +1684,7 @@ public class SolrCLI implements CLIO {collectionName,numShards,replicationFactor);- if (confname != null && !"".equals(confname.trim())) {+ if (confname != null && !confname.trim().isEmpty()) {endMessage += String.format(Locale.ROOT, " with config-set '%s'", confname);}@@ -4304,12 +4306,12 @@ public class SolrCLI implements CLIO {String config = StrUtils.join(Arrays.asList(cli.getOptionValues("config")), ' ');// config is base64 encoded (to get around parsing problems), decode it- config = config.replaceAll(" ", "");+ config = config.replace(" ", "");config =new String(Base64.getDecoder().decode(config.getBytes(StandardCharsets.UTF_8)),StandardCharsets.UTF_8);- config = config.replaceAll("\n", "").replaceAll("\r", "");+ config = config.replace("\n", "").replace("\r", "");String solrIncludeFilename = cli.getOptionValue("solrIncludeFile");File includeFile = new File(solrIncludeFilename);diff --git a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.javaindex 0394ed78fbf..e144af88137 100644--- a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java+++ b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java@@ -624,7 +624,7 @@ public class SolrPluginUtils {int result = optionalClauseCount;spec = spec.trim();- if (-1 < spec.indexOf("<")) {+ if (spec.contains("<")) {/* we have conditional spec(s) */spec = spaceAroundLessThanPattern.matcher(spec).replaceAll("<");for (String s : spacePattern.split(spec)) {@@ -893,7 +893,7 @@ public class SolrPluginUtils {public static Sort getSort(SolrQueryRequest req) {String sort = req.getParams().get(CommonParams.SORT);- if (null == sort || sort.equals("")) {+ if (null == sort || sort.isEmpty()) {return null;}diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.javaindex 320cd8f06e1..17e0f02b68a 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java@@ -267,7 +267,7 @@ public class ChaosMonkeyShardSplitTest extends ShardSplitTest {new CloudConfig.CloudConfigBuilder("127.0.0.1", 8983, "solr").build());overseer.close();ElectionContext ec =- new OverseerElectionContext(zkClient, overseer, address.replaceAll("/", "_"));+ new OverseerElectionContext(zkClient, overseer, address.replace("/", "_"));overseerElector.setup(ec);overseerElector.joinElection(ec, false);}diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.javaindex 7ca61a2349f..3fb714faa92 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java@@ -468,7 +468,7 @@ public class LeaderElectionTest extends SolrTestCaseJ4 {if (at != -1) {leaderUrl = leaderUrl.substring(at + 3);}- return Integer.parseInt(leaderUrl.replaceAll("/", ""));+ return Integer.parseInt(leaderUrl.replace("/", ""));}@Testdiff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.javaindex e88cdd4145d..9f5a2f26e8e 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java@@ -387,7 +387,7 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {liveNodes.add(address);when(zkStateReaderMock.getBaseUrlForNodeName(address))- .thenAnswer(invocation -> address.replaceAll("_", "/"));+ .thenAnswer(invocation -> address.replace("_", "/"));}when(solrZkClientMock.getZkClientTimeout()).thenReturn(30000);@@ -764,7 +764,7 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {sliceToNodeUrlsWithoutProtocolPartToNumberOfShardsRunningMapMap = new HashMap<>();List<String> nodeUrlWithoutProtocolPartForLiveNodes = new ArrayList<>(createNodes.size());for (String nodeName : createNodes) {- String nodeUrlWithoutProtocolPart = nodeName.replaceAll("_", "/");+ String nodeUrlWithoutProtocolPart = nodeName.replace("_", "/");if (nodeUrlWithoutProtocolPart.startsWith("http://"))nodeUrlWithoutProtocolPart = nodeUrlWithoutProtocolPart.substring(7);nodeUrlWithoutProtocolPartForLiveNodes.add(nodeUrlWithoutProtocolPart);diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.javaindex 6ad9a77133c..806e567ce51 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java@@ -1031,8 +1031,7 @@ public class OverseerTest extends SolrTestCaseJ4 {.build());overseers.add(overseer);ElectionContext ec =- new OverseerElectionContext(- zkClient, overseer, server.getZkAddress().replaceAll("/", "_"));+ new OverseerElectionContext(zkClient, overseer, server.getZkAddress().replace("/", "_"));overseerElector.setup(ec);overseerElector.joinElection(ec, false);@@ -1868,8 +1867,7 @@ public class OverseerTest extends SolrTestCaseJ4 {.setUseDistributedClusterStateUpdates(false).build());overseers.add(overseer);- ElectionContext ec =- new OverseerElectionContext(zkClient, overseer, address.replaceAll("/", "_"));+ ElectionContext ec = new OverseerElectionContext(zkClient, overseer, address.replace("/", "_"));overseerElector.setup(ec);overseerElector.joinElection(ec, false);return zkClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.javaindex f5728f09387..bbf0138a713 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java@@ -178,7 +178,7 @@ public class TestConfigSetsAPIZkFailure extends SolrTestCaseJ4 {// we know we are doing a copy when we are getting data from the base config set and// the new config set (partially) existsString zkAddress = zkTestServer.getZkAddress();- String chroot = zkAddress.substring(zkAddress.lastIndexOf("/"));+ String chroot = zkAddress.substring(zkAddress.lastIndexOf('/'));if (path.startsWith(chroot + CONFIGS_ZKNODE + "/" + BASE_CONFIGSET_NAME)&& !path.contains(ConfigSetProperties.DEFAULT_FILENAME)) {List<String> children = null;diff --git a/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java b/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.javaindex ff2d715f260..d457bb6a2c9 100644--- a/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java+++ b/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java@@ -113,7 +113,7 @@ public class TrollingIndexReaderFactory extends StandardIndexReaderFactory {new Predicate<StackTraceElement>() {@Overridepublic boolean test(StackTraceElement trace) {- return trace.getClassName().indexOf(className) >= 0;+ return trace.getClassName().contains(className);}@Overridediff --git a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.javaindex bdf4c1849fb..a7b2a65918d 100644--- a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java+++ b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java@@ -393,13 +393,13 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {final String message = thrown.getMessage();assertTrue("Wrong exception thrown on duplicate core names",- message.indexOf("Found multiple cores with the name [core1]") != -1);+ message.contains("Found multiple cores with the name [core1]"));assertTrue(File.separator + "core1 should have been mentioned in the message: " + message,- message.indexOf(File.separator + "core1") != -1);+ message.contains(File.separator + "core1"));assertTrue(File.separator + "core2 should have been mentioned in the message:" + message,- message.indexOf(File.separator + "core2") != -1);+ message.contains(File.separator + "core2"));}@Testdiff --git a/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.javaindex cf0be9581d3..143d35557f4 100644--- a/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java+++ b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java@@ -100,7 +100,7 @@ public class TestSolrDeletionPolicy1 extends SolrTestCaseJ4 {((SolrDeletionPolicy) (delPolicy.getWrappedDeletionPolicy())).getMaxCommitAge().replaceAll("[a-zA-Z]", "")- .replaceAll("-", "");+ .replace("-", "");long age = Long.parseLong(agestr);Thread.sleep(age);diff --git a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.javaindex cba62c4fd54..e43bc486cec 100644--- a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java+++ b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java@@ -824,7 +824,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {private void checkTwoAnonymousChildDocs(String rawJsonStr, boolean anonChildDocs)throws Exception {if (!anonChildDocs) {- rawJsonStr = rawJsonStr.replaceAll("_childDocuments_", "childLabel");+ rawJsonStr = rawJsonStr.replace("_childDocuments_", "childLabel");}SolrQueryRequest req = req("commit", "true");SolrQueryResponse rsp = new SolrQueryResponse();diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.javaindex 91cc9685062..9823fb909ea 100644--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java@@ -113,7 +113,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBaString val2;String val3;try {- payload = payload.replaceAll("CACHENAME", cacheName);+ payload = payload.replace("CACHENAME", cacheName);val1 = String.valueOf(10 * i + 1);payload = payload.replace("CACHEVAL1", val1);val2 = String.valueOf(10 * i + 2);diff --git a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.javaindex 2bb3bb2fcca..6a30ba88db4 100644--- a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java@@ -187,9 +187,9 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase {"Full URL without scheme",numDocs("*:*",- getShardUrl("shard1", cluster).replaceAll("http://", "")+ getShardUrl("shard1", cluster).replace("http://", "")+ ","- + getShardUrl("shard2", cluster).replaceAll("http://", ""),+ + getShardUrl("shard2", cluster).replace("http://", ""),cluster),is(10));diff --git a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.javaindex 7afc2d1d108..8337609faf9 100644--- a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java+++ b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java@@ -1446,7 +1446,7 @@ public class TestExportWriter extends SolrTestCaseJ4 {h.query(req("q", query, "qt", "/export", "fl", pointFieldsFl, "sort", sort));String resultTries =h.query(req("q", query, "qt", "/export", "fl", trieFieldsFl, "sort", sort));- assertJsonEquals(resultPoints.replaceAll("_p", ""), resultTries.replaceAll("_t", ""));+ assertJsonEquals(resultPoints.replace("_p", ""), resultTries.replace("_t", ""));}private void addFloat(SolrInputDocument doc, float value, boolean mv) {diff --git a/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.javaindex 4472ff57034..282db9c917b 100644--- a/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java+++ b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java@@ -159,7 +159,7 @@ public class TestCSVResponseWriter extends SolrTestCaseJ4 {String result = h.query(req("q", "*:*", "wt", "csv", "csv.header", "true", "fl", "*,score"));for (String field :"id,foo_s,foo_i,foo_l,foo_b,foo_f,foo_d,foo_dt,v_ss,v2_ss,score".split(",")) {- assertTrue(result.indexOf(field) >= 0);+ assertTrue(result.contains(field));}// test null values@@ -317,7 +317,7 @@ public class TestCSVResponseWriter extends SolrTestCaseJ4 {buf = new StringWriter();w.write(buf, req, rsp);String s = buf.toString();- assertTrue(s.indexOf("score") >= 0 && s.indexOf("2.718") > 0 && s.indexOf("89.83") > 0);+ assertTrue(s.contains("score") && s.indexOf("2.718") > 0 && s.indexOf("89.83") > 0);// Test field globsrsp.setReturnFields(new SolrReturnFields("id,foo*", req));diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.javaindex 15c5cd66259..ec5d288bc7f 100644--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java@@ -183,7 +183,7 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {} catch (Exception e) {for (Throwable t = e; t != null; t = t.getCause()) {// short circuit out if we found what we expected- if (t.getMessage() != null && -1 != t.getMessage().indexOf(errString)) return;+ if (t.getMessage() != null && t.getMessage().contains(errString)) return;}// otherwise, rethrow it, possibly completely unrelatedthrow new SolrException(@@ -259,7 +259,7 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {} catch (Exception e) {for (Throwable t = e; t != null; t = t.getCause()) {// short circuit out if we found what we expected- if (t.getMessage() != null && -1 != t.getMessage().indexOf(errString)) return;+ if (t.getMessage() != null && t.getMessage().contains(errString)) return;}// otherwise, rethrow it, possibly completely unrelatedthrow new SolrException(@@ -316,7 +316,7 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {} catch (Exception e) {for (Throwable t = e; t != null; t = t.getCause()) {// short circuit out if we found what we expected- if (t.getMessage() != null && -1 != t.getMessage().indexOf(errString)) return;+ if (t.getMessage() != null && t.getMessage().contains(errString)) return;}// otherwise, rethrow it, possibly completely unrelatedthrow new SolrException(@@ -357,7 +357,7 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {} catch (Exception e) {for (Throwable t = e; t != null; t = t.getCause()) {// short circuit out if we found what we expected- if (t.getMessage() != null && -1 != t.getMessage().indexOf(errString)) return;+ if (t.getMessage() != null && t.getMessage().contains(errString)) return;}// otherwise, rethrow it, possibly completely unrelatedthrow new SolrException(@@ -398,7 +398,7 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {} catch (Exception e) {for (Throwable t = e; t != null; t = t.getCause()) {// short circuit out if we found what we expected- if (t.getMessage() != null && -1 != t.getMessage().indexOf(errString)) return;+ if (t.getMessage() != null && t.getMessage().contains(errString)) return;}// otherwise, rethrow it, possibly completely unrelatedthrow new SolrException(diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.javaindex 5c0511da18e..9f5ac1f75fa 100644--- a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java+++ b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java@@ -109,7 +109,7 @@ public class TestQueryTypes extends SolrTestCaseJ4 {// wrap in spaces sometimes if space separatedfinal String separator =f.equals("v_s") ? "" : "separator=' '"; // use space separated when field isn't v_s- String vMod = !separator.equals("") && random().nextBoolean() ? " " + v + " " : v;+ String vMod = !separator.isEmpty() && random().nextBoolean() ? " " + v + " " : v;assertQ(req("q", "{!terms " + separator + " f=" + f + "}" + vMod), "//result[@numFound='1']");// lucene rangediff --git a/solr/core/src/test/org/apache/solr/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.javaindex c2ffa24dded..a868acbdadb 100644--- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java+++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java@@ -1729,7 +1729,7 @@ public class TestRecovery extends SolrTestCaseJ4 {content);// WARNING... assumes format of .00000n where n is less than 9- long logNumber = Long.parseLong(fname.substring(fname.lastIndexOf(".") + 1));+ long logNumber = Long.parseLong(fname.substring(fname.lastIndexOf('.') + 1));String fname2 =String.format(Locale.ROOT, UpdateLog.LOG_FILENAME_PATTERN, UpdateLog.TLOG_NAME, logNumber + 1);diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.javaindex 5afaf62bfc2..8c8b8e0f056 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java@@ -1428,7 +1428,7 @@ public class TestJsonFacetRefinement extends SolrTestCaseHS {*/for (String method :new String[] {"", "dv", "dvhash", "stream", "uif", "enum", "stream", "smart"}) {- if (method.equals("")) {+ if (method.isEmpty()) {p.remove("terms");} else {p.set("terms", "method:" + method + ", ");diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.javaindex 237777ea18b..0d9859e3bb4 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java@@ -1445,7 +1445,7 @@ public class TestJsonFacets extends SolrTestCaseHS {}List<String> getAlternatives(String field) {- int idx = field.lastIndexOf("_");+ int idx = field.lastIndexOf('_');if (idx <= 0 || idx >= field.length()) return Collections.singletonList(field);String suffix = field.substring(idx);String[] alternativeSuffixes = suffixMap.get(suffix);diff --git a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.javaindex a3702453162..0d4bb489fd8 100644--- a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java+++ b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java@@ -397,7 +397,7 @@ public class TestScoreJoinQPNoScore extends SolrTestCaseJ4 {{final Map<String, String> ps = ((MapSolrParams) req.getParams()).getMap();final String q = ps.get("q");- ps.put("q", q.replaceAll("join score=none", "join"));+ ps.put("q", q.replace("join score=none", "join"));log.error("plain join: {}", h.query(req));ps.put("q", q);}@@ -405,7 +405,7 @@ public class TestScoreJoinQPNoScore extends SolrTestCaseJ4 {// re-execute the request... good for putting a breakpoint here for debuggingfinal Map<String, String> ps = ((MapSolrParams) req.getParams()).getMap();final String q = ps.get("q");- ps.put("q", q.replaceAll("\\}", " cache=false\\}"));+ ps.put("q", q.replace("}", " cache=false}"));h.query(req);}fail(err);diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.javaindex 4c69a43a489..0072eefface 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java@@ -111,7 +111,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {JettySolrRunner randomJetty = cluster.getRandomJetty(random());String baseUrl = randomJetty.getBaseUrl().toString();verifySecurityStatus(cl, baseUrl + authcPrefix, "/errorMessages", null, 20);- zkClient().setData("/security.json", STD_CONF.replaceAll("'", "\"").getBytes(UTF_8), true);+ zkClient().setData("/security.json", STD_CONF.replace("'", "\"").getBytes(UTF_8), true);verifySecurityStatus(cl, baseUrl + authcPrefix, "authentication/class", "solr.BasicAuthPlugin", 20);diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.javaindex 1a75de86725..dad37ef47b8 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java@@ -100,7 +100,7 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {// Write security.json locally. Should cause security to be initializedsecurityConfHandler.persistConf(new SecurityConfHandler.SecurityConfig()- .setData(Utils.fromJSONString(STD_CONF.replaceAll("'", "\""))));+ .setData(Utils.fromJSONString(STD_CONF.replace("'", "\""))));securityConfHandler.securityConfEdited();verifySecurityStatus(httpClient, baseUrl + authcPrefix, "authentication/class", "solr.BasicAuthPlugin", 20);@@ -175,7 +175,7 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {throws IOException {HttpPost httpPost = new HttpPost(url);httpPost.setHeader(header);- httpPost.setEntity(new ByteArrayEntity(jsonCommand.replaceAll("'", "\"").getBytes(UTF_8)));+ httpPost.setEntity(new ByteArrayEntity(jsonCommand.replace("'", "\"").getBytes(UTF_8)));httpPost.addHeader("Content-Type", "application/json; charset=UTF-8");HttpResponse r = cl.execute(httpPost);int statusCode = r.getStatusLine().getStatusCode();diff --git a/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.javaindex 4f113a8d46b..6917fc8fc32 100644--- a/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java@@ -220,11 +220,11 @@ public class CategoryRoutedAliasUpdateProcessorTest extends RoutedAliasUpdatePro}private String noDashes(String ship) {- return ship.replaceAll("-", "_");+ return ship.replace("-", "_");}private String noDollar(String ship) {- return ship.replaceAll("\\$", "_");+ return ship.replace("$", "_");}@Testdiff --git a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.javaindex 609e11c9358..ceaecb04be2 100644--- a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java+++ b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java@@ -293,8 +293,7 @@ public class ClusteringComponentTest extends SolrTestCaseJ4 {}static void compareWhitespaceNormalized(String actual, String expected) {- Function<String, String> normalize =- v -> v.replaceAll("\r", "").replaceAll("[ \t]+", " ").trim();+ Function<String, String> normalize = v -> v.replace("\r", "").replaceAll("[ \t]+", " ").trim();if (!normalize.apply(expected).equals(normalize.apply(actual))) {throw new AssertionError(diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.javaindex b1f1bc5038e..84b4e94171c 100644--- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java+++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java@@ -83,7 +83,7 @@ public class RegexRulesPasswordProvider implements PasswordProvider {String[] arr = line.split("#");if (arr.length > 0) line = arr[0].trim();if (line.length() == 0) continue;- int sep = line.indexOf("=");+ int sep = line.indexOf('=');if (sep <= 0) {log.warn("Wrong format of password line {}", linenum);continue;diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.javaindex e5a340bf3c0..8c88447bbc1 100644--- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java+++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java@@ -687,14 +687,13 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {String extraction = (String) list.get("solr-word.pdf");assertNotNull("extraction is null and it shouldn't be", extraction);- assertTrue(- extraction + " does not contain " + "solr-word", extraction.indexOf("solr-word") != -1);+ assertTrue(extraction + " does not contain " + "solr-word", extraction.contains("solr-word"));NamedList<?> nl = (NamedList<?>) list.get("solr-word.pdf_metadata");assertNotNull("nl is null and it shouldn't be", nl);Object title = nl.get("title");assertNotNull("title is null and it shouldn't be", title);- assertTrue(extraction.indexOf("<?xml") != -1);+ assertTrue(extraction.contains("<?xml"));rsp =loadLocal(@@ -708,8 +707,7 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {extraction = (String) list.get("solr-word.pdf");assertNotNull("extraction is null and it shouldn't be", extraction);- assertTrue(- extraction + " does not contain " + "solr-word", extraction.indexOf("solr-word") != -1);+ assertTrue(extraction + " does not contain " + "solr-word", extraction.contains("solr-word"));assertEquals(-1, extraction.indexOf("<?xml"));nl = (NamedList<?>) list.get("solr-word.pdf_metadata");diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.javaindex 56b89451a34..1c95280cac6 100644--- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java+++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java@@ -158,7 +158,7 @@ public class TestXLSXResponseWriter extends SolrTestCaseJ4 {String result = getStringFromSheet(resultSheet);for (String field :"id,foo_s,foo_i,foo_l,foo_b,foo_f,foo_d,foo_dt1,v_ss,v2_ss,score".split(",")) {- assertTrue(result.indexOf(field) >= 0);+ assertTrue(result.contains(field));}// test null values@@ -222,7 +222,7 @@ public class TestXLSXResponseWriter extends SolrTestCaseJ4 {rsp.setReturnFields(new SolrReturnFields("*,score", req));resultSheet = getWSResultForQuery(req, rsp);String s = getStringFromSheet(resultSheet);- assertTrue(s.indexOf("score") >= 0 && s.indexOf("2.718") > 0 && s.indexOf("89.83") > 0);+ assertTrue(s.contains("score") && s.indexOf("2.718") > 0 && s.indexOf("89.83") > 0);// Test field globsrsp.setReturnFields(new SolrReturnFields("id,foo*", req));diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.javaindex 8983dc0fec5..7844c17a5eb 100644--- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java+++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java@@ -149,11 +149,11 @@ public class DelegationTokenKerberosFilter extends DelegationTokenAuthenticationthrow new IllegalArgumentException("zkClient required");}String zkHost = zkClient.getZkServerAddress();- String zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf("/")) : "";+ String zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf('/')) : "";String zkNamespace = zkChroot + SecurityAwareZkACLProvider.SECURITY_ZNODE_PATH;zkNamespace = zkNamespace.startsWith("/") ? zkNamespace.substring(1) : zkNamespace;String zkConnectionString =- zkHost.contains("/") ? zkHost.substring(0, zkHost.indexOf("/")) : zkHost;+ zkHost.contains("/") ? zkHost.substring(0, zkHost.indexOf('/')) : zkHost;SolrZkToCuratorCredentialsACLs curatorToSolrZk = new SolrZkToCuratorCredentialsACLs(zkClient);final int connectionTimeoutMs = 30000; // this value is currently hard coded, see SOLR-7561.@@ -191,7 +191,7 @@ public class DelegationTokenKerberosFilter extends DelegationTokenAuthenticationthis.aclProvider = createACLProvider(zkClient);this.authInfos = createAuthInfo(zkClient);String zkHost = zkClient.getZkServerAddress();- this.zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf("/")) : null;+ this.zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf('/')) : null;}public ACLProvider getACLProvider() {diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.javaindex b5c74d6dec0..2c478821668 100644--- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java+++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java@@ -130,11 +130,11 @@ public class HadoopAuthFilter extends DelegationTokenAuthenticationFilter {throw new IllegalArgumentException("zkClient required");}String zkHost = zkClient.getZkServerAddress();- String zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf("/")) : "";+ String zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf('/')) : "";String zkNamespace = zkChroot + SecurityAwareZkACLProvider.SECURITY_ZNODE_PATH;zkNamespace = zkNamespace.startsWith("/") ? zkNamespace.substring(1) : zkNamespace;String zkConnectionString =- zkHost.contains("/") ? zkHost.substring(0, zkHost.indexOf("/")) : zkHost;+ zkHost.contains("/") ? zkHost.substring(0, zkHost.indexOf('/')) : zkHost;SolrZkToCuratorCredentialsACLs curatorToSolrZk = new SolrZkToCuratorCredentialsACLs(zkClient);final int connectionTimeoutMs = 30000; // this value is currently hard coded, see SOLR-7561.@@ -175,7 +175,7 @@ public class HadoopAuthFilter extends DelegationTokenAuthenticationFilter {this.aclProvider = createACLProvider(zkClient);this.authInfos = createAuthInfo(zkClient);String zkHost = zkClient.getZkServerAddress();- this.zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf("/")) : null;+ this.zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf('/')) : null;}public ACLProvider getACLProvider() {diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/KerberosPlugin.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/KerberosPlugin.javaindex 946d97320ab..1bbdd3ae524 100644--- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/KerberosPlugin.java+++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/KerberosPlugin.java@@ -139,7 +139,7 @@ public class KerberosPlugin extends AuthenticationPlugin implements HttpClientBuputParam(params, "token.validity", DELEGATION_TOKEN_VALIDITY, "36000");params.put("zk-dt-secret-manager.enable", "true");- String chrootPath = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf("/")) : "";+ String chrootPath = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf('/')) : "";String znodeWorkingPath =chrootPath + SecurityAwareZkACLProvider.SECURITY_ZNODE_PATH + "/zkdtsm";// Note - Curator complains if the znodeWorkingPath starts with /diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestZkAclsWithHadoopAuth.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestZkAclsWithHadoopAuth.javaindex aca0f7e59f5..f8b1fa029e3 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestZkAclsWithHadoopAuth.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestZkAclsWithHadoopAuth.java@@ -104,7 +104,7 @@ public class TestZkAclsWithHadoopAuth extends SolrCloudTestCase {// Now test all ZK tree.String zkHost = cluster.getSolrClient().getClusterStateProvider().getQuorumHosts();- String zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf("/")) : null;+ String zkChroot = zkHost.contains("/") ? zkHost.substring(zkHost.indexOf('/')) : null;walkZkTree(keeper, zkChroot, "/");}}diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/CustomBufferedIndexInput.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/CustomBufferedIndexInput.javaindex 70be91e7f70..b758dad0033 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/CustomBufferedIndexInput.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/CustomBufferedIndexInput.java@@ -73,8 +73,9 @@ public abstract class CustomBufferedIndexInput extends IndexInput {if (len <= (bufferLength - bufferPosition)) {// the buffer contains enough data to satisfy this request- if (len > 0) // to allow b to be null if len is 0...- System.arraycopy(buffer, bufferPosition, b, offset, len);+ if (len > 0) { // to allow b to be null if len is 0...+ System.arraycopy(buffer, bufferPosition, b, offset, len);+ }bufferPosition += len;} else {// the buffer does not have enough data. First serve all we've got.@@ -150,8 +151,9 @@ public abstract class CustomBufferedIndexInput extends IndexInput {private void refill() throws IOException {long start = bufferStart + bufferPosition;long end = start + bufferSize;- if (end > length()) // don't read past EOF- end = length();+ if (end > length()) { // don't read past EOF+ end = length();+ }int newLength = (int) (end - start);if (newLength <= 0) throw new EOFException("read past EOF: " + this);diff --git a/solr/modules/hdfs/src/test/org/apache/hadoop/fs/RawLocalFileSystem.java b/solr/modules/hdfs/src/test/org/apache/hadoop/fs/RawLocalFileSystem.javaindex c59c9079a1c..46ea42e79ac 100644--- a/solr/modules/hdfs/src/test/org/apache/hadoop/fs/RawLocalFileSystem.java+++ b/solr/modules/hdfs/src/test/org/apache/hadoop/fs/RawLocalFileSystem.java@@ -896,7 +896,7 @@ public class RawLocalFileSystem extends FileSystem {// remove domain name as follows:// DOMAIN\\user => user, DOMAIN\\group => groupprivate String removeDomain(String str) {- int index = str.indexOf("\\");+ int index = str.indexOf('\\');if (index != -1) {str = str.substring(index + 1);}diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsTestUtil.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsTestUtil.javaindex 4a5705d19a7..b943920a37f 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsTestUtil.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsTestUtil.java@@ -368,12 +368,7 @@ public class HdfsTestUtil {return null;}String dir =- "/"- + new File(dataDir)- .toString()- .replaceAll(":", "_")- .replaceAll("/", "_")- .replaceAll(" ", "_");+ "/" + new File(dataDir).toString().replace(":", "_").replace("/", "_").replace(" ", "_");return getURI(dfsCluster) + dir;}diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.javaindex 590d484a05f..be0591ef575 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java@@ -1056,7 +1056,7 @@ public class TestRecoveryHdfs extends SolrTestCaseJ4 {content);// WARNING... assumes format of .00000n where n is less than 9- long logNumber = Long.parseLong(fname.substring(fname.lastIndexOf(".") + 1));+ long logNumber = Long.parseLong(fname.substring(fname.lastIndexOf('.') + 1));String fname2 =String.format(Locale.ROOT, UpdateLog.LOG_FILENAME_PATTERN, UpdateLog.TLOG_NAME, logNumber + 1);diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.javaindex 3f8f2f7852e..a7dad973d86 100644--- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java+++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginIntegrationTest.java@@ -488,7 +488,7 @@ public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase {.replace(".localdomain", ""); // Use only 'localhost' to match our SSL certString pemCert =CryptoKeys.extractCertificateFromPem(Files.readString(pemFilePath))- .replaceAll("\n", "\\\\n"); // Use literal \n to play well with JSON+ .replace("\\n", "\\\\n"); // Use literal \n to play well with JSONreturn "{\n"+ " \"authentication\" : {\n"+ " \"class\": \"solr.JWTAuthPlugin\",\n"diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.javaindex 37aa10fb12b..1995b5fb7db 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java@@ -98,7 +98,7 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {query.setParam("debugQuery", "on");String qryResult = JQ("/query" + query.toQueryString());- qryResult = qryResult.replaceAll("\n", " ");+ qryResult = qryResult.replace("\n", " ");MatcherAssert.assertThat(qryResult, containsString("\"debug\":{"));qryResult = qryResult.substring(qryResult.indexOf("debug"));@@ -334,7 +334,7 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {query.setParam("debugQuery", "on");String qryResult = JQ("/query" + query.toQueryString());- qryResult = qryResult.replaceAll("\n", " ");+ qryResult = qryResult.replace("\n", " ");MatcherAssert.assertThat(qryResult, containsString("\"debug\":{"));qryResult = qryResult.substring(qryResult.indexOf("debug"));diff --git a/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.javaindex 666ae0e11c9..750ae4094bb 100644--- a/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java+++ b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java@@ -94,7 +94,7 @@ public class TestBadScriptingUpdateProcessorConfig extends SolrTestCaseJ4 {private static boolean matches(Exception e, String errString) {for (Throwable t = e; t != null; t = t.getCause()) {- if (t.getMessage() != null && -1 != t.getMessage().indexOf(errString)) return true;+ if (t.getMessage() != null && t.getMessage().contains(errString)) return true;}return false;}diff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.javaindex d54f704148c..77d51bc30cb 100644--- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java+++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java@@ -444,7 +444,7 @@ class SolrFilter extends Filter implements SolrRel {}private String toEqualsClause(String key, RexLiteral value) {- if ("".equals(key)) {+ if (key != null && key.isEmpty()) {// special handling for 1 = 0 kind of clausereturn "-*:*";}diff --git a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.javaindex 139390f5f12..355a5f6e2ce 100644--- a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java+++ b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java@@ -248,10 +248,10 @@ public class SolrExporter {SolrScrapeConfiguration scrapeConfiguration = null;String defaultClusterId = "";- if (!res.getString(ARG_ZK_HOST_DEST).equals("")) {+ if (!res.getString(ARG_ZK_HOST_DEST).isEmpty()) {defaultClusterId = makeShortHash(res.getString(ARG_ZK_HOST_DEST));scrapeConfiguration = SolrScrapeConfiguration.solrCloud(res.getString(ARG_ZK_HOST_DEST));- } else if (!res.getString(ARG_BASE_URL_DEST).equals("")) {+ } else if (!res.getString(ARG_BASE_URL_DEST).isEmpty()) {defaultClusterId = makeShortHash(res.getString(ARG_BASE_URL_DEST));scrapeConfiguration = SolrScrapeConfiguration.standalone(res.getString(ARG_BASE_URL_DEST));}diff --git a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.javaindex 0ab7a03ac05..b0acf4ef7a8 100644--- a/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java+++ b/solr/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java@@ -50,7 +50,7 @@ public class Helpers {// solr_exporter_duration_seconds_bucket{le="1.0",} 1.0// first="solr_exporter_duration_seconds_bucket{le="1.0",}," second=1.0public static Pair<String, Double> parseMetricsLine(String line) {- int spaceIdx = line.lastIndexOf(" ");+ int spaceIdx = line.lastIndexOf(' ');if (spaceIdx == -1) {throw new IllegalArgumentException("Failed parsing metrics line, must contain a space. Line was: " + line);diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradleindex 46588291da4..bf42b66c4a9 100644--- a/solr/solr-ref-guide/build.gradle+++ b/solr/solr-ref-guide/build.gradle@@ -110,7 +110,7 @@ task buildLocalAntoraYaml {prerelease : prerelease,]props.putAll([- solr_javadocs_link : "https://solr.apache.org/docs/${props.solr_version.replaceAll("\\.", "_")}",+ solr_javadocs_link : "https://solr.apache.org/docs/${props.solr_version.replace(".", "_")}",lucene_javadocs_link : project(':solr:documentation').luceneDocUrl,])diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TermVectorsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TermVectorsEvaluator.javaindex 9069a0fe35c..2d91573a793 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TermVectorsEvaluator.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TermVectorsEvaluator.java@@ -115,7 +115,7 @@ public class TermVectorsEvaluator extends RecursiveObjectEvaluator implements Maif (excludes != null) {for (String exclude : excludes) {- if (term.indexOf(exclude) > -1) {+ if (term.contains(exclude)) {continue OUTER;}}diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.javaindex 185d82d9789..c362257387c 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java@@ -101,7 +101,7 @@ public class Facet2DStream extends TupleStream implements Expressible {String collectionName = factory.getValueOperand(expression, 0);if (collectionName.indexOf('"') > -1) {- collectionName = collectionName.replaceAll("\"", "").replaceAll(" ", "");+ collectionName = collectionName.replace("\"", "").replace(" ", "");}List<StreamExpressionNamedParameter> namedParams = factory.getNamedOperands(expression);@@ -139,7 +139,7 @@ public class Facet2DStream extends TupleStream implements Expressible {if (bucketXExpression != null) {if (bucketXExpression.getParameter() instanceof StreamExpressionValue) {String keyX = ((StreamExpressionValue) bucketXExpression.getParameter()).getValue();- if (keyX != null && !keyX.equals("")) {+ if (keyX != null && !keyX.isEmpty()) {x = new Bucket(keyX.trim());}}@@ -148,7 +148,7 @@ public class Facet2DStream extends TupleStream implements Expressible {if (bucketYExpression != null) {if (bucketYExpression.getParameter() instanceof StreamExpressionValue) {String keyY = ((StreamExpressionValue) bucketYExpression.getParameter()).getValue();- if (keyY != null && !keyY.equals("")) {+ if (keyY != null && !keyY.isEmpty()) {y = new Bucket(keyY.trim());}}diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.javaindex 4f39a9e668b..3b0b785cbc9 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java@@ -127,7 +127,7 @@ public class FacetStream extends TupleStream implements Expressible, ParallelMetString collectionName = factory.getValueOperand(expression, 0);if (collectionName.indexOf('"') > -1) {- collectionName = collectionName.replaceAll("\"", "").replaceAll(" ", "");+ collectionName = collectionName.replace("\"", "").replace(" ", "");}List<StreamExpressionNamedParameter> namedParams = factory.getNamedOperands(expression);diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.javaindex 39931bdb021..2b8a4aea1bc 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java@@ -158,7 +158,7 @@ public class FetchStream extends TupleStream implements Expressible {this.fields = fieldList.split(",");this.fieldList = fieldList;- if (on.indexOf("=") > -1) {+ if (on.contains("=")) {String[] leftright = on.split("=");leftKey = leftright[0].trim();rightKey = leftright[1].trim();diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.javaindex 3d0faed094c..bd9ed7e44c0 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java@@ -408,7 +408,7 @@ public class JDBCStream extends TupleStream implements Expressible {}if (obj instanceof String) {String s = (String) obj;- if (s.indexOf(sep) > -1) {+ if (s.contains(sep)) {s = s.substring(1);return s.split(sep);}diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchFacadeStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchFacadeStream.javaindex f5702ed4034..b240821bc90 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchFacadeStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchFacadeStream.java@@ -49,7 +49,7 @@ public class SearchFacadeStream extends TupleStream implements Expressible {// Handle comma delimited list of collections.if (collectionName.indexOf('"') > -1) {- collectionName = collectionName.replaceAll("\"", "").replaceAll(" ", "");+ collectionName = collectionName.replace("\"", "").replace(" ", "");}List<StreamExpressionNamedParameter> namedParams = factory.getNamedOperands(expression);diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.javaindex be3d6cdf953..fb7696c8ac9 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java@@ -84,7 +84,7 @@ public class StatsStream extends TupleStream implements Expressible, ParallelMetString collectionName = factory.getValueOperand(expression, 0);if (collectionName.indexOf('"') > -1) {- collectionName = collectionName.replaceAll("\"", "").replaceAll(" ", "");+ collectionName = collectionName.replace("\"", "").replace(" ", "");}List<StreamExpressionNamedParameter> namedParams = factory.getNamedOperands(expression);diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.javaindex a7c3c79bb76..683cc35119c 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java@@ -93,7 +93,7 @@ public class TimeSeriesStream extends TupleStream implements Expressible {String collectionName = factory.getValueOperand(expression, 0);if (collectionName.indexOf('"') > -1) {- collectionName = collectionName.replaceAll("\"", "").replaceAll(" ", "");+ collectionName = collectionName.replace("\"", "").replace(" ", "");}List<StreamExpressionNamedParameter> namedParams = factory.getNamedOperands(expression);diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.javaindex b8691cac5cd..49176ee1f68 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java@@ -761,7 +761,7 @@ public class SolrZkClient implements Closeable {.append("DATA:\n").append(dent).append(" ")- .append(dataString.replaceAll("\n", "\n" + dent + " "))+ .append(dataString.replace("\n", "\n" + dent + " ")).append(NEWL);} else {string.append(dent).append("DATA: ...supressed...").append(NEWL);diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.javaindex f5fe49aed04..8fd0731b685 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java@@ -98,7 +98,7 @@ public class ZkMaintenanceUtils {VISIT_ORDER.VISIT_PRE,znode -> {if (znode.startsWith("/zookeeper")) return; // can't do anything with this node!- int iPos = znode.lastIndexOf("/");+ int iPos = znode.lastIndexOf('/');if (iPos > 0) {for (int idx = 0; idx < iPos; ++idx) sb.append(" ");sb.append(znode.substring(iPos + 1)).append(System.lineSeparator());@@ -529,7 +529,7 @@ public class ZkMaintenanceUtils {if (path.endsWith("/")) {endIndex--;}- int index = path.lastIndexOf("/", endIndex);+ int index = path.lastIndexOf('/', endIndex);if (index == -1) {return "";}@@ -542,7 +542,7 @@ public class ZkMaintenanceUtils {public static String createZkNodeName(String zkRoot, Path root, Path file) {String relativePath = root.relativize(file).toString();// Windows shenanigans- if ("\\".equals(File.separator)) relativePath = relativePath.replaceAll("\\\\", "/");+ if ("\\".equals(File.separator)) relativePath = relativePath.replace("\\", "/");// It's possible that the relative path and file are the same, in which case// adding the bare slash is A Bad Idea unless it's a non-leaf data nodeboolean isNonLeafData = file.toFile().getName().equals(ZKNODE_DATA_FILE);@@ -586,7 +586,7 @@ public class ZkMaintenanceUtils {}}}- int lastDot = filePath.lastIndexOf(".");+ int lastDot = filePath.lastIndexOf('.');return lastDot >= 0 && USE_FORBIDDEN_FILE_TYPES.contains(filePath.substring(lastDot + 1));}}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.javaindex 0af8df80a68..61ba4fb5aa7 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java@@ -1092,8 +1092,9 @@ public abstract class CloudSolrClient extends SolrClient {String node = replica.getNodeName();if (!liveNodes.contains(node) // Must be a live node to continue|| replica.getState()- != Replica.State.ACTIVE) // Must be an ACTIVE replica to continue- continue;+ != Replica.State.ACTIVE) { // Must be an ACTIVE replica to continue+ continue;+ }if (sendToLeaders && replica.equals(leader)) {sortedReplicas.add(replica); // put leaders here eagerly (if sendToLeader mode)} else {diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.javaindex c9ccad7ca03..ca2f4277a59 100644--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java@@ -39,9 +39,9 @@ public class ImplicitDocRouter extends DocRouter {DocCollection collection) {String shard = null;- if (route != null) // if a route is already passed in, try to use it- shard = route;- else if (sdoc != null) {+ if (route != null) { // if a route is already passed in, try to use it+ shard = route;+ } else if (sdoc != null) {String f = getRouteField(collection);if (f != null) {Object o = sdoc.getFieldValue(f);diff --git a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.javaindex 66386d21e52..f19fc4c335a 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java@@ -95,7 +95,7 @@ public class CommandOperation {}private Object getMapVal(String key) {- if ("".equals(key)) {+ if (key != null && key.isEmpty()) {if (commandData instanceof Map) {addError("value of the command is an object should be primitive");}diff --git a/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.javaindex a24f072eca5..9b2e7583cdf 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java@@ -429,7 +429,7 @@ public class DOMUtil {int prev = 0;int pos;// search for the next instance of $ from the 'prev' position- while ((pos = value.indexOf("$", prev)) >= 0) {+ while ((pos = value.indexOf('$', prev)) >= 0) {// if there was any text before this, add it as a fragment// TODO, this check could be modified to go if pos>prev;diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.javaindex a3229a45639..919814c8d69 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java@@ -105,7 +105,7 @@ public class JsonRecordReader {return; // the path is "/"}// deal with how split behaves when separator starts with an empty string!- if ("".equals(paths.get(0).trim())) paths.remove(0);+ if (paths.get(0).trim().isEmpty()) paths.remove(0);rootNode.build(paths, fieldName, multiValued, isRecord, path);rootNode.buildOptimize();}@@ -496,7 +496,7 @@ public class JsonRecordReader {// returns the last key of the pathprivate String getPathSuffix(String path) {- int indexOf = path.lastIndexOf("/");+ int indexOf = path.lastIndexOf('/');if (indexOf == -1) return path;return path.substring(indexOf + 1);}diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonSchemaValidator.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonSchemaValidator.javaindex 1023689b3bc..b5162019ab7 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/JsonSchemaValidator.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonSchemaValidator.java@@ -270,7 +270,7 @@ class RequiredValidator extends Validator<List<String>> {+ "). This is a bug.");return false;}- String subprop = requiredProp.substring(requiredProp.indexOf(".") + 1);+ String subprop = requiredProp.substring(requiredProp.indexOf('.') + 1);if (!validate(((Map) o).get(requiredProp), errs, Collections.singleton(subprop))) {return false;}diff --git a/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.javaindex 0f885e72262..e6a8a08d75d 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java@@ -89,7 +89,7 @@ public class PropertiesUtil {int prev = 0;int pos;// search for the next instance of $ from the 'prev' position- while ((pos = value.indexOf("$", prev)) >= 0) {+ while ((pos = value.indexOf('$', prev)) >= 0) {// if there was any text before this, add it as a fragment// TODO, this check could be modified to go if pos>prev;diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.javaindex 46c8da7d9b4..7c4a3387b01 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java@@ -771,7 +771,7 @@ public class Utils {"nodeName does not contain expected ':' separator: " + nodeName);}- final int _offset = nodeName.indexOf("_", colonAt);+ final int _offset = nodeName.indexOf('_', colonAt);if (_offset < 0) {throw new IllegalArgumentException("nodeName does not contain expected '_' separator: " + nodeName);diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestUnitTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestUnitTest.javaindex 977cffdf8d3..92fb2f608b2 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestUnitTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestUnitTest.java@@ -380,7 +380,7 @@ public class JsonQueryRequestUnitTest extends SolrTestCase {// formatting) so we do it by default. But we leave the option open in case the JSON fields// have spaces.if (trimWhitespace) {- return rawJsonString.replaceAll("\n", "").replaceAll(" ", "");+ return rawJsonString.replace("\n", "").replace(" ", "");} else {return rawJsonString;}diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.javaindex 1b498255e08..ff3b8a17c8c 100644--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java@@ -160,7 +160,7 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {}}// paranoia, we *really* don't want to ever get "//" in a path...- final String hc = hostContext.toString().replaceAll("\\/+", "/");+ final String hc = hostContext.toString().replaceAll("/+", "/");log.info("Setting hostContext system property: {}", hc);System.setProperty("hostContext", hc);@@ -190,9 +190,8 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {private static String getHostContextSuitableForServletContext() {String ctx = System.getProperty("hostContext", "/solr");- if ("".equals(ctx)) ctx = "/solr";+ if (ctx == null || ctx.isEmpty()) ctx = "/solr";if (ctx.endsWith("/")) ctx = ctx.substring(0, ctx.length() - 1);- ;if (!ctx.startsWith("/")) ctx = "/" + ctx;return ctx;}diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.javaindex cd9d35089eb..704cbfa8589 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java@@ -825,7 +825,7 @@ public class MiniSolrCloudCluster {}private static String getHostContextSuitableForServletContext(String ctx) {- if (ctx == null || "".equals(ctx)) ctx = "/solr";+ if (ctx == null || ctx.isEmpty()) ctx = "/solr";if (ctx.endsWith("/")) ctx = ctx.substring(0, ctx.length() - 1);if (!ctx.startsWith("/")) ctx = "/" + ctx;return ctx;diff --git a/solr/test-framework/src/java/org/apache/solr/core/AbstractBadConfigTestBase.java b/solr/test-framework/src/java/org/apache/solr/core/AbstractBadConfigTestBase.javaindex adeebea71c3..30b51c150a4 100644--- a/solr/test-framework/src/java/org/apache/solr/core/AbstractBadConfigTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/core/AbstractBadConfigTestBase.java@@ -71,7 +71,7 @@ public abstract class AbstractBadConfigTestBase extends SolrTestCaseJ4 {private static boolean matches(Exception e, String errString) {for (Throwable t = e; t != null; t = t.getCause()) {- if (t.getMessage() != null && -1 != t.getMessage().indexOf(errString)) return true;+ if (t.getMessage() != null && t.getMessage().contains(errString)) return true;}return false;}