Apache Solr open-source search software
SOLR-16427: Evaluate and fix errorprone rules - JavaLangClash
Kevin Risden38560583110c
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradleindex 98bfe25613b..aa614c30c4e 100644--- a/gradle/validation/error-prone.gradle+++ b/gradle/validation/error-prone.gradle@@ -99,7 +99,6 @@ allprojects { prj ->'-Xep:InputStreamSlowMultibyteRead:OFF','-Xep:IntLongMath:OFF','-Xep:InvalidBlockTag:OFF', // this is needed for tags like lucene.internal- '-Xep:JavaLangClash:OFF','-Xep:JavaUtilDate:OFF','-Xep:JdkObsolete:OFF','-Xep:LogicalAssignment:OFF',diff --git a/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java b/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.javaindex c8e80fc8263..2dd56ecc702 100644--- a/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java+++ b/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java@@ -55,7 +55,7 @@ import org.apache.solr.common.util.Utils;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.PluginInfo;import org.apache.solr.handler.admin.ContainerPluginsApi;-import org.apache.solr.pkg.PackageLoader;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.util.SolrJacksonAnnotationInspector;@@ -299,7 +299,7 @@ public class ContainerPluginsRegistry implements ClusterPropertiesListener, MapW@JsonProperty(value = "package")public final String pkg;- private PackageLoader.Package.Version pkgVersion;+ private SolrPackageLoader.SolrPackage.Version pkgVersion;private Class<?> klas;Object instance;@@ -328,7 +328,7 @@ public class ContainerPluginsRegistry implements ClusterPropertiesListener, MapWPluginInfo.ClassName klassInfo = new PluginInfo.ClassName(info.klass);pkg = klassInfo.pkg;if (pkg != null) {- Optional<PackageLoader.Package.Version> ver =+ Optional<SolrPackageLoader.SolrPackage.Version> ver =coreContainer.getPackageLoader().getPackageVersion(pkg, info.version);if (ver.isEmpty()) {// may be we are a bit early. Do a refresh and try again@@ -336,7 +336,7 @@ public class ContainerPluginsRegistry implements ClusterPropertiesListener, MapWver = coreContainer.getPackageLoader().getPackageVersion(pkg, info.version);}if (ver.isEmpty()) {- PackageLoader.Package p = coreContainer.getPackageLoader().getPackage(pkg);+ SolrPackageLoader.SolrPackage p = coreContainer.getPackageLoader().getPackage(pkg);if (p == null) {errs.add("Invalid package " + klassInfo.pkg);return;diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.javaindex 8a51afb9371..7fa16410e93 100644--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java@@ -135,7 +135,7 @@ import org.apache.solr.metrics.SolrCoreMetricManager;import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.metrics.SolrMetricProducer;import org.apache.solr.metrics.SolrMetricsContext;-import org.apache.solr.pkg.PackageLoader;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.request.SolrRequestInfo;import org.apache.solr.search.SolrFieldCacheBean;@@ -283,7 +283,7 @@ public class CoreContainer {new DelegatingPlacementPluginFactory();private PackageStoreAPI packageStoreAPI;- private PackageLoader packageLoader;+ private SolrPackageLoader packageLoader;private final Set<Path> allowPaths;@@ -696,7 +696,7 @@ public class CoreContainer {return replayUpdatesExecutor;}- public PackageLoader getPackageLoader() {+ public SolrPackageLoader getPackageLoader() {return packageLoader;}@@ -780,7 +780,7 @@ public class CoreContainer {containerHandlers.getApiBag().registerObject(packageStoreAPI.readAPI);containerHandlers.getApiBag().registerObject(packageStoreAPI.writeAPI);- packageLoader = new PackageLoader(this);+ packageLoader = new SolrPackageLoader(this);containerHandlers.getApiBag().registerObject(packageLoader.getPackageAPI().editAPI);containerHandlers.getApiBag().registerObject(packageLoader.getPackageAPI().readAPI);ZookeeperReadAPI zookeeperReadAPI = new ZookeeperReadAPI(this);diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.javaindex af3d994a5c3..eb1f82e401a 100644--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java@@ -70,7 +70,7 @@ import org.apache.solr.common.util.IOUtils;import org.apache.solr.common.util.Utils;import org.apache.solr.handler.component.SearchComponent;import org.apache.solr.pkg.PackageListeners;-import org.apache.solr.pkg.PackageLoader;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.response.QueryResponseWriter;import org.apache.solr.response.transform.TransformerFactory;@@ -1119,7 +1119,7 @@ public class SolrConfig implements MapSerializable {return null;}Object o = p.get().get(pkg);- if (o == null || PackageLoader.LATEST.equals(o)) return null;+ if (o == null || SolrPackageLoader.LATEST.equals(o)) return null;return o.toString();}diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex 8423b192b7f..fd94f300368 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -114,8 +114,8 @@ import org.apache.solr.metrics.SolrCoreMetricManager;import org.apache.solr.metrics.SolrMetricProducer;import org.apache.solr.metrics.SolrMetricsContext;import org.apache.solr.pkg.PackageListeners;-import org.apache.solr.pkg.PackageLoader;import org.apache.solr.pkg.PackagePluginHolder;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.request.SolrRequestInfo;@@ -313,8 +313,8 @@ public class SolrCore implements SolrInfoBean, Closeable {if (pkg == null) {return resourceLoader;}- PackageLoader.Package aPackage = coreContainer.getPackageLoader().getPackage(pkg);- PackageLoader.Package.Version latest = aPackage.getLatest();+ SolrPackageLoader.SolrPackage aSolrPackage = coreContainer.getPackageLoader().getPackage(pkg);+ SolrPackageLoader.SolrPackage.Version latest = aSolrPackage.getLatest();return latest.getLoader();}diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.javaindex 3ff0c28bcc4..dfe64f47a41 100644--- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java+++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java@@ -62,7 +62,7 @@ import org.apache.solr.handler.component.SearchComponent;import org.apache.solr.handler.component.ShardHandlerFactory;import org.apache.solr.logging.DeprecationLog;import org.apache.solr.pkg.PackageListeningClassLoader;-import org.apache.solr.pkg.PackageLoader;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.response.QueryResponseWriter;import org.apache.solr.rest.RestManager;@@ -894,14 +894,14 @@ public class SolrResourceLoaderif (info.cName.pkg == null) return findClass(info.className, type);return _classLookup(info,- (Function<PackageLoader.Package.Version, Class<? extends T>>)+ (Function<SolrPackageLoader.SolrPackage.Version, Class<? extends T>>)ver -> ver.getLoader().findClass(info.cName.className, type),registerCoreReloadListener);}private <T> T _classLookup(PluginInfo info,- Function<PackageLoader.Package.Version, T> fun,+ Function<SolrPackageLoader.SolrPackage.Version, T> fun,boolean registerCoreReloadListener) {PluginInfo.ClassName cName = info.cName;if (registerCoreReloadListener) {diff --git a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java b/solr/core/src/java/org/apache/solr/handler/StreamHandler.javaindex ff190ab0b40..ef957f9e42f 100644--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java@@ -59,8 +59,8 @@ import org.apache.solr.core.CoreContainer;import org.apache.solr.core.PluginInfo;import org.apache.solr.core.SolrConfig;import org.apache.solr.core.SolrCore;-import org.apache.solr.pkg.PackageLoader;import org.apache.solr.pkg.PackagePluginHolder;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.security.AuthorizationContext;@@ -161,7 +161,7 @@ public class StreamHandler extends RequestHandlerBase}@Override- protected Object initNewInstance(PackageLoader.Package.Version newest, SolrCore core) {+ protected Object initNewInstance(SolrPackageLoader.SolrPackage.Version newest, SolrCore core) {// This is called from super constructor, so be careful that pluginInfo.className is done// initializing.return clazz = newest.getLoader().findClass(pluginInfo.className, Expressible.class);diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.javaindex 9bec8533335..015c19dba60 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java@@ -56,7 +56,7 @@ import org.apache.solr.metrics.MetricsMap;import org.apache.solr.metrics.SolrMetricsContext;import org.apache.solr.pkg.PackageAPI;import org.apache.solr.pkg.PackageListeners;-import org.apache.solr.pkg.PackageLoader;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.search.CursorMark;@@ -201,7 +201,7 @@ public class SearchHandler extends RequestHandlerBase}@Override- public void changed(PackageLoader.Package pkg, Ctx ctx) {+ public void changed(SolrPackageLoader.SolrPackage pkg, Ctx ctx) {// we could optimize this by listening to only relevant packages,// but it is not worth optimizing as these are lightweight objectscomponents = null;diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.javaindex 8909da5fc1d..53aef653b88 100644--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java@@ -43,7 +43,7 @@ import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.V2Request;-import org.apache.solr.client.solrj.request.beans.Package;+import org.apache.solr.client.solrj.request.beans.PackagePayload;import org.apache.solr.client.solrj.request.beans.PluginMeta;import org.apache.solr.client.solrj.response.V2Response;import org.apache.solr.common.NavigableObject;@@ -58,7 +58,7 @@ import org.apache.solr.handler.admin.ContainerPluginsApi;import org.apache.solr.packagemanager.SolrPackage.Command;import org.apache.solr.packagemanager.SolrPackage.Manifest;import org.apache.solr.packagemanager.SolrPackage.Plugin;-import org.apache.solr.pkg.PackageLoader;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.util.SolrCLI;import org.apache.solr.util.SolrVersion;import org.apache.zookeeper.KeeperException;@@ -136,7 +136,7 @@ public class PackageManager implements Closeable {// Delete the package by calling the Package API and remove the JarPackageUtils.printGreen("Executing Package API to remove this package...");- Package.DelVersion del = new Package.DelVersion();+ PackagePayload.DelVersion del = new PackagePayload.DelVersion();del.version = version;del.pkg = packageName;@@ -449,7 +449,7 @@ public class PackageManager implements Closeable {"{set:{PKG_VERSIONS:{"+ packageInstance.name+ ": '"- + (pegToLatest ? PackageLoader.LATEST : packageInstance.version)+ + (pegToLatest ? SolrPackageLoader.LATEST : packageInstance.version)+ "'}}}");} catch (Exception ex) {throw new SolrException(ErrorCode.SERVER_ERROR, ex);@@ -526,7 +526,7 @@ public class PackageManager implements Closeable {"{update:{PKG_VERSIONS:{'"+ packageInstance.name+ "' : '"- + (pegToLatest ? PackageLoader.LATEST : packageInstance.version)+ + (pegToLatest ? SolrPackageLoader.LATEST : packageInstance.version)+ "'}}}");} catch (Exception ex) {throw new SolrException(ErrorCode.SERVER_ERROR, ex);@@ -897,7 +897,7 @@ public class PackageManager implements Closeable {}if (version == null|| version.equalsIgnoreCase(PackageUtils.LATEST)- || version.equalsIgnoreCase(PackageLoader.LATEST)) {+ || version.equalsIgnoreCase(SolrPackageLoader.LATEST)) {return latest;} else return null;}@@ -1101,7 +1101,7 @@ public class PackageManager implements Closeable {/*** Given a package, return a map of collections where this package is installed to the installed- * version (which can be {@link PackageLoader#LATEST})+ * version (which can be {@link SolrPackageLoader#LATEST})*/public Map<String, String> getDeployedCollections(String packageName) {List<String> allCollections;diff --git a/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java b/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.javaindex 3affac550f9..d81415433ca 100644--- a/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java+++ b/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java@@ -40,7 +40,7 @@ import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.V2Request;-import org.apache.solr.client.solrj.request.beans.Package;+import org.apache.solr.client.solrj.request.beans.PackagePayload;import org.apache.solr.client.solrj.response.V2Response;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;@@ -50,7 +50,7 @@ import org.apache.solr.filestore.PackageStoreAPI;import org.apache.solr.packagemanager.SolrPackage.Artifact;import org.apache.solr.packagemanager.SolrPackage.SolrPackageRelease;import org.apache.solr.pkg.PackageAPI;-import org.apache.solr.pkg.PackageLoader;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.util.SolrCLI;import org.apache.zookeeper.CreateMode;import org.apache.zookeeper.KeeperException;@@ -211,7 +211,7 @@ public class RepositoryManager {// Call Package API to add this version of the packagePackageUtils.printGreen("Executing Package API to register this package...");- Package.AddVersion add = new Package.AddVersion();+ PackagePayload.AddVersion add = new PackagePayload.AddVersion();add.version = version;add.pkg = packageName;add.files =@@ -330,7 +330,7 @@ public class RepositoryManager {/*** Install a version of the package. Also, run verify commands in case some collection was using- * {@link PackageLoader#LATEST} version of this package and got auto-updated.+ * {@link SolrPackageLoader#LATEST} version of this package and got auto-updated.*/public boolean install(String packageName, String version) throws SolrException {SolrPackageRelease pkg = getLastPackageRelease(packageName);@@ -347,7 +347,8 @@ public class RepositoryManager {List<String> collectionsPeggedToLatest =collectionsDeployedIn.keySet().stream().filter(- collection -> collectionsDeployedIn.get(collection).equals(PackageLoader.LATEST))+ collection ->+ collectionsDeployedIn.get(collection).equals(SolrPackageLoader.LATEST)).collect(Collectors.toList());if (!collectionsPeggedToLatest.isEmpty()) {PackageUtils.printGreen(diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.javaindex 985550ce530..0f9a8d50845 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java@@ -35,7 +35,7 @@ import org.apache.solr.api.Command;import org.apache.solr.api.EndPoint;import org.apache.solr.api.PayloadObj;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.request.beans.Package;+import org.apache.solr.client.solrj.request.beans.PackagePayload;import org.apache.solr.common.SolrException;import org.apache.solr.common.annotation.JsonProperty;import org.apache.solr.common.cloud.SolrZkClient;@@ -66,13 +66,13 @@ public class PackageAPI {final CoreContainer coreContainer;private final ObjectMapper mapper = SolrJacksonAnnotationInspector.createObjectMapper();- private final PackageLoader packageLoader;+ private final SolrPackageLoader packageLoader;Packages pkgs;public final Edit editAPI = new Edit();public final Read readAPI = new Read();- public PackageAPI(CoreContainer coreContainer, PackageLoader loader) {+ public PackageAPI(CoreContainer coreContainer, SolrPackageLoader loader) {if (coreContainer.getPackageStoreAPI() == null) {throw new IllegalStateException("Must successfully load PackageStoreAPI first");}@@ -192,7 +192,7 @@ public class PackageAPI {public PkgVersion() {}- public PkgVersion(Package.AddVersion addVersion) {+ public PkgVersion(PackagePayload.AddVersion addVersion) {this.pkg = addVersion.pkg;this.version = addVersion.version;this.files = addVersion.files == null ? null : Collections.unmodifiableList(addVersion.files);@@ -247,7 +247,7 @@ public class PackageAPI {payload.addError("Package null");return;}- PackageLoader.Package pkg = coreContainer.getPackageLoader().getPackage(p);+ SolrPackageLoader.SolrPackage pkg = coreContainer.getPackageLoader().getPackage(p);if (pkg == null) {payload.addError("No such package: " + p);return;@@ -269,9 +269,9 @@ public class PackageAPI {}@Command(name = "add")- public void add(PayloadObj<Package.AddVersion> payload) {+ public void add(PayloadObj<PackagePayload.AddVersion> payload) {if (!checkEnabled(payload)) return;- Package.AddVersion add = payload.get();+ PackagePayload.AddVersion add = payload.get();if (add.files.isEmpty()) {payload.addError("No files specified");return;@@ -322,9 +322,9 @@ public class PackageAPI {}@Command(name = "delete")- public void del(PayloadObj<Package.DelVersion> payload) {+ public void del(PayloadObj<PackagePayload.DelVersion> payload) {if (!checkEnabled(payload)) return;- Package.DelVersion delVersion = payload.get();+ PackagePayload.DelVersion delVersion = payload.get();try {coreContainer.getZkController()diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java b/solr/core/src/java/org/apache/solr/pkg/PackageListeners.javaindex 43e778d46a2..326a9c96118 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java@@ -71,11 +71,11 @@ public class PackageListeners {}}- synchronized void packagesUpdated(List<PackageLoader.Package> pkgs) {+ synchronized void packagesUpdated(List<SolrPackageLoader.SolrPackage> pkgs) {MDCLoggingContext.setCore(core);Listener.Ctx ctx = new Listener.Ctx();try {- for (PackageLoader.Package pkgInfo : pkgs) {+ for (SolrPackageLoader.SolrPackage pkgInfo : pkgs) {invokeListeners(pkgInfo, ctx);}} finally {@@ -84,7 +84,7 @@ public class PackageListeners {}}- private synchronized void invokeListeners(PackageLoader.Package pkg, Listener.Ctx ctx) {+ private synchronized void invokeListeners(SolrPackageLoader.SolrPackage pkg, Listener.Ctx ctx) {for (Reference<Listener> ref : listeners) {Listener listener = ref.get();if (listener == null) continue;@@ -113,7 +113,7 @@ public class PackageListeners {Map<String, PackageAPI.PkgVersion> packageDetails();/** A callback when the package is updated */- void changed(PackageLoader.Package pkg, Ctx ctx);+ void changed(SolrPackageLoader.SolrPackage pkg, Ctx ctx);default MapWriter getPackageVersion(PluginInfo.ClassName cName) {return null;@@ -124,9 +124,9 @@ public class PackageListeners {/*** If there are multiple packages to be updated and there are multiple listeners, This is- * executed after all of the {@link Listener#changed(PackageLoader.Package, Ctx)} calls are- * invoked. The name is a unique identifier that can be used by consumers to avoid duplicate- * If no deduplication is required, use null as the name+ * executed after all of the {@link Listener#changed(SolrPackageLoader.SolrPackage, Ctx)}+ * calls are invoked. The name is a unique identifier that can be used by consumers to avoid+ * duplicate If no deduplication is required, use null as the name*/public void runLater(String name, Runnable runnable) {if (runLater == null) runLater = new LinkedHashMap<>();diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java b/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.javaindex c346e07eda1..3958d337cc6 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java@@ -73,7 +73,7 @@ public class PackageListeningClassLoader implements SolrClassLoader, PackageListif (cName.pkg == null) {return fallbackClassLoader.newInstance(cname, expectedType, subpackages);} else {- PackageLoader.Package.Version version = findPackageVersion(cName, true);+ SolrPackageLoader.SolrPackage.Version version = findPackageVersion(cName, true);T obj = version.getLoader().newInstance(cName.className, expectedType, subpackages);classNameVsPackageName.put(cName.original, cName.pkg);return applyResourceLoaderAware(version, obj);@@ -85,9 +85,9 @@ public class PackageListeningClassLoader implements SolrClassLoader, PackageList** @param cName The class name*/- public PackageLoader.Package.Version findPackageVersion(+ public SolrPackageLoader.SolrPackage.Version findPackageVersion(PluginInfo.ClassName cName, boolean registerListener) {- PackageLoader.Package.Version theVersion =+ SolrPackageLoader.SolrPackage.Version theVersion =coreContainer.getPackageLoader().getPackage(cName.pkg)@@ -107,7 +107,7 @@ public class PackageListeningClassLoader implements SolrClassLoader, PackageListreturn p == null ? null : p::writeMap;}- private <T> T applyResourceLoaderAware(PackageLoader.Package.Version version, T obj) {+ private <T> T applyResourceLoaderAware(SolrPackageLoader.SolrPackage.Version version, T obj) {if (obj instanceof ResourceLoaderAware) {SolrResourceLoader.assertAwareCompatibility(ResourceLoaderAware.class, obj);try {@@ -127,7 +127,7 @@ public class PackageListeningClassLoader implements SolrClassLoader, PackageListif (cName.pkg == null) {return fallbackClassLoader.newInstance(cname, expectedType, subPackages, params, args);} else {- PackageLoader.Package.Version version = findPackageVersion(cName, true);+ SolrPackageLoader.SolrPackage.Version version = findPackageVersion(cName, true);T obj =version.getLoader().newInstance(cName.className, expectedType, subPackages, params, args);classNameVsPackageName.put(cName.original, cName.pkg);@@ -141,7 +141,7 @@ public class PackageListeningClassLoader implements SolrClassLoader, PackageListif (cName.pkg == null) {return fallbackClassLoader.findClass(cname, expectedType);} else {- PackageLoader.Package.Version version = findPackageVersion(cName, true);+ SolrPackageLoader.SolrPackage.Version version = findPackageVersion(cName, true);Class<? extends T> klas = version.getLoader().findClass(cName.className, expectedType);classNameVsPackageName.put(cName.original, cName.pkg);return klas;@@ -161,7 +161,7 @@ public class PackageListeningClassLoader implements SolrClassLoader, PackageList}@Override- public void changed(PackageLoader.Package pkg, Ctx ctx) {+ public void changed(SolrPackageLoader.SolrPackage pkg, Ctx ctx) {PackageAPI.PkgVersion currVer = packageVersions.get(pkg.name);if (currVer == null) {// not watching thisdiff --git a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.javaindex ac5ed94d63c..1f1d2459818 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java@@ -40,7 +40,7 @@ public class PackagePluginHolder<T> extends PluginBag.PluginHolder<T> {private final SolrCore.Provider coreProvider;private final SolrConfig.SolrPluginInfo pluginMeta;- private PackageLoader.Package.Version pkgVersion;+ private SolrPackageLoader.SolrPackage.Version pkgVersion;private PluginInfo info;public PackagePluginHolder(PluginInfo info, SolrCore core, SolrConfig.SolrPluginInfo pluginMeta) {@@ -64,7 +64,7 @@ public class PackagePluginHolder<T> extends PluginBag.PluginHolder<T> {}@Override- public void changed(PackageLoader.Package pkg, Ctx ctx) {+ public void changed(SolrPackageLoader.SolrPackage pkg, Ctx ctx) {coreProvider.withCore(c -> reload(pkg, c));}@@ -92,15 +92,15 @@ public class PackagePluginHolder<T> extends PluginBag.PluginHolder<T> {}}- private synchronized void reload(PackageLoader.Package pkg, SolrCore core) {+ private synchronized void reload(SolrPackageLoader.SolrPackage pkg, SolrCore core) {String lessThan = core.getSolrConfig().maxPackageVersion(info.pkgName);- PackageLoader.Package.Version newest = pkg.getLatest(lessThan);+ SolrPackageLoader.SolrPackage.Version newest = pkg.getLatest(lessThan);if (newest == null) {log.error("No latest version available for package : {}", pkg.name());return;}if (lessThan != null) {- PackageLoader.Package.Version pkgLatest = pkg.getLatest();+ SolrPackageLoader.SolrPackage.Version pkgLatest = pkg.getLatest();if (pkgLatest != newest) {if (log.isInfoEnabled()) {log.info(@@ -134,7 +134,7 @@ public class PackagePluginHolder<T> extends PluginBag.PluginHolder<T> {}@SuppressWarnings({"unchecked"})- protected Object initNewInstance(PackageLoader.Package.Version newest, SolrCore core) {+ protected Object initNewInstance(SolrPackageLoader.SolrPackage.Version newest, SolrCore core) {Object instance =SolrCore.createInstance(pluginInfo.className,diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java b/solr/core/src/java/org/apache/solr/pkg/SolrPackageLoader.javasimilarity index 90%rename from solr/core/src/java/org/apache/solr/pkg/PackageLoader.javarename to solr/core/src/java/org/apache/solr/pkg/SolrPackageLoader.javaindex 0946d7c3e48..2243d70441b 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java+++ b/solr/core/src/java/org/apache/solr/pkg/SolrPackageLoader.java@@ -46,24 +46,24 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;/** The class that holds a mapping of various packages and classloaders */-public class PackageLoader implements Closeable {+public class SolrPackageLoader implements Closeable {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());public static final String LATEST = "$LATEST";private final CoreContainer coreContainer;- private final Map<String, Package> packageClassLoaders = new ConcurrentHashMap<>();+ private final Map<String, SolrPackage> packageClassLoaders = new ConcurrentHashMap<>();private PackageAPI.Packages myCopy = new PackageAPI.Packages();private PackageAPI packageAPI;- public Optional<Package.Version> getPackageVersion(String pkg, String version) {- Package p = packageClassLoaders.get(pkg);+ public Optional<SolrPackage.Version> getPackageVersion(String pkg, String version) {+ SolrPackage p = packageClassLoaders.get(pkg);if (p == null) return Optional.empty();return Optional.ofNullable(p.getVersion(version));}- public PackageLoader(CoreContainer coreContainer) {+ public SolrPackageLoader(CoreContainer coreContainer) {this.coreContainer = coreContainer;packageAPI = new PackageAPI(coreContainer, this);refreshPackageConf();@@ -73,11 +73,11 @@ public class PackageLoader implements Closeable {return packageAPI;}- public Package getPackage(String key) {+ public SolrPackage getPackage(String key) {return packageClassLoaders.get(key);}- public Map<String, Package> getPackages() {+ public Map<String, SolrPackage> getPackages() {return Collections.emptyMap();}@@ -85,19 +85,19 @@ public class PackageLoader implements Closeable {log.debug("{} updated to version {}", ZkStateReader.SOLR_PKGS_PATH, packageAPI.pkgs.znodeVersion);- List<Package> updated = new ArrayList<>();+ List<SolrPackage> updated = new ArrayList<>();Map<String, List<PackageAPI.PkgVersion>> modified = getModified(myCopy, packageAPI.pkgs);for (Map.Entry<String, List<PackageAPI.PkgVersion>> e : modified.entrySet()) {if (e.getValue() != null) {- Package p = packageClassLoaders.get(e.getKey());+ SolrPackage p = packageClassLoaders.get(e.getKey());if (e.getValue() != null && p == null) {- packageClassLoaders.put(e.getKey(), p = new Package(e.getKey()));+ packageClassLoaders.put(e.getKey(), p = new SolrPackage(e.getKey()));}p.updateVersions(e.getValue());updated.add(p);} else {- Package p = packageClassLoaders.remove(e.getKey());+ SolrPackage p = packageClassLoaders.remove(e.getKey());if (p != null) {// other classes are holding to a reference to this object// they should know that this is removed@@ -143,9 +143,9 @@ public class PackageLoader implements Closeable {}public void notifyListeners(String pkg) {- Package p = packageClassLoaders.get(pkg);+ SolrPackage p = packageClassLoaders.get(pkg);if (p != null) {- List<Package> l = Collections.singletonList(p);+ List<SolrPackage> l = Collections.singletonList(p);for (SolrCore core : coreContainer.getCores()) {core.getPackageListeners().packagesUpdated(l);}@@ -153,14 +153,14 @@ public class PackageLoader implements Closeable {}/** represents a package definition in the packages.json */- public class Package implements Closeable {+ public class SolrPackage implements Closeable {final String name;final Map<String, Version> myVersions = new ConcurrentHashMap<>();private List<String> sortedVersions = new CopyOnWriteArrayList<>();String latest;private boolean deleted;- Package(String name) {+ SolrPackage(String name) {this.name = name;}@@ -255,7 +255,7 @@ public class PackageLoader implements Closeable {}public class Version implements MapWriter, Closeable {- private final Package parent;+ private final SolrPackage parent;private SolrResourceLoader loader;private final PackageAPI.PkgVersion version;@@ -266,7 +266,7 @@ public class PackageLoader implements Closeable {version.writeMap(ew);}- Version(Package parent, PackageAPI.PkgVersion v) {+ Version(SolrPackage parent, PackageAPI.PkgVersion v) {this.parent = parent;this.version = v;List<Path> paths = new ArrayList<>();@@ -367,6 +367,6 @@ public class PackageLoader implements Closeable {@Overridepublic void close() {- for (Package p : packageClassLoaders.values()) closeWhileHandlingException(p);+ for (SolrPackage p : packageClassLoaders.values()) closeWhileHandlingException(p);}}diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.javaindex 7b5ddc2dce7..17cbda302e1 100644--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java@@ -64,8 +64,8 @@ public class SolrCmdDistributor implements Closeable {private int retryPause = 500;- private final List<Error> allErrors = new ArrayList<>();- private final List<Error> errors = Collections.synchronizedList(new ArrayList<>());+ private final List<SolrError> allErrors = new ArrayList<>();+ private final List<SolrError> errors = Collections.synchronizedList(new ArrayList<>());private final CompletionService<Object> completionService;private final Set<Future<Object>> pending = new HashSet<>();@@ -103,9 +103,9 @@ public class SolrCmdDistributor implements Closeable {private void doRetriesIfNeeded() throws IOException {// NOTE: retries will be forwards to a single url- List<Error> errors = new ArrayList<>(this.errors);+ List<SolrError> errors = new ArrayList<>(this.errors);errors.addAll(clients.getErrors());- List<Error> resubmitList = new ArrayList<>();+ List<SolrError> resubmitList = new ArrayList<>();if (log.isInfoEnabled() && errors.size() > 0) {log.info("SolrCmdDistributor found {} errors", errors.size());@@ -114,7 +114,7 @@ public class SolrCmdDistributor implements Closeable {if (log.isDebugEnabled() && errors.size() > 0) {StringBuilder builder = new StringBuilder("SolrCmdDistributor found:");int maxErrorsToShow = 10;- for (Error e : errors) {+ for (SolrError e : errors) {if (maxErrorsToShow-- <= 0) break;builder.append("\n").append(e);}@@ -126,7 +126,7 @@ public class SolrCmdDistributor implements Closeable {log.debug("{}", builder);}- for (Error err : errors) {+ for (SolrError err : errors) {try {/** if this is a retryable request we may want to retry, depending on the error we received and@@ -166,7 +166,7 @@ public class SolrCmdDistributor implements Closeable {clients.clearErrors();this.errors.clear();- for (Error err : resubmitList) {+ for (SolrError err : resubmitList) {if (err.req.node instanceof ForwardNode) {SolrException.log(SolrCmdDistributor.log,@@ -340,7 +340,7 @@ public class SolrCmdDistributor implements Closeable {clients.getHttpClient().request(req.uReq);} catch (Exception e) {SolrException.log(log, e);- Error error = new Error();+ SolrError error = new SolrError();error.e = e;error.req = req;if (e instanceof SolrException) {@@ -382,7 +382,7 @@ public class SolrCmdDistributor implements Closeable {solrClient.request(req.uReq);} catch (Exception e) {SolrException.log(log, e);- Error error = new Error();+ SolrError error = new SolrError();error.e = e;error.req = req;if (e instanceof SolrException) {@@ -424,7 +424,7 @@ public class SolrCmdDistributor implements Closeable {* @return true if this request should be retried after receiving a particular error false* otherwise*/- public boolean shouldRetry(Error err) {+ public boolean shouldRetry(SolrError err) {boolean isRetry = node.checkRetry(err);isRetry &=uReq.getDeleteQuery() == null || uReq.getDeleteQuery().isEmpty(); // Don't retry DBQs@@ -492,10 +492,10 @@ public class SolrCmdDistributor implements Closeable {testing_errorHook; // called on error when forwarding request. Currently data=[this, Request]public static class Response {- public List<Error> errors = new ArrayList<>();+ public List<SolrError> errors = new ArrayList<>();}- public static class Error {+ public static class SolrError {public Exception e;public int statusCode = -1;@@ -519,7 +519,7 @@ public class SolrCmdDistributor implements Closeable {public abstract static class Node {public abstract String getUrl();- public abstract boolean checkRetry(Error e);+ public abstract boolean checkRetry(SolrError e);public abstract String getCoreName();@@ -576,7 +576,7 @@ public class SolrCmdDistributor implements Closeable {}@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {if (!retry) return false;if (err.statusCode == 404 || err.statusCode == 403 || err.statusCode == 503) {@@ -683,7 +683,7 @@ public class SolrCmdDistributor implements Closeable {}@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {boolean doRetry = false;if (err.statusCode == 404 || err.statusCode == 403 || err.statusCode == 503) {doRetry = true;@@ -737,7 +737,7 @@ public class SolrCmdDistributor implements Closeable {}}- public List<Error> getErrors() {+ public List<SolrError> getErrors() {return allErrors;}}diff --git a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.javaindex 2d29e32dd00..d19fda8c488 100644--- a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java+++ b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java@@ -29,7 +29,7 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.ConcurrentUpdateHttp2SolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.common.SolrException;-import org.apache.solr.update.SolrCmdDistributor.Error;+import org.apache.solr.update.SolrCmdDistributor.SolrError;import org.eclipse.jetty.client.api.Response;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -44,7 +44,7 @@ public class StreamingSolrClients {private Http2SolrClient httpClient;private Map<String, ConcurrentUpdateHttp2SolrClient> solrClients = new HashMap<>();- private List<Error> errors = Collections.synchronizedList(new ArrayList<>());+ private List<SolrError> errors = Collections.synchronizedList(new ArrayList<>());private ExecutorService updateExecutor;@@ -53,7 +53,7 @@ public class StreamingSolrClients {this.httpClient = updateShardHandler.getUpdateOnlyHttpClient();}- public List<Error> getErrors() {+ public List<SolrError> getErrors() {return errors;}@@ -116,7 +116,7 @@ public class StreamingSolrClients {class ErrorReportingConcurrentUpdateSolrClient extends ConcurrentUpdateHttp2SolrClient {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());private final SolrCmdDistributor.Req req;- private final List<Error> errors;+ private final List<SolrError> errors;public ErrorReportingConcurrentUpdateSolrClient(Builder builder) {super(builder);@@ -127,7 +127,7 @@ class ErrorReportingConcurrentUpdateSolrClient extends ConcurrentUpdateHttp2Solr@Overridepublic void handleError(Throwable ex) {log.error("Error when calling {} to {}", req, req.node.getUrl(), ex);- Error error = new Error();+ SolrError error = new SolrError();error.e = (Exception) ex;if (ex instanceof SolrException) {error.statusCode = ((SolrException) ex).code();@@ -147,13 +147,13 @@ class ErrorReportingConcurrentUpdateSolrClient extends ConcurrentUpdateHttp2Solrstatic class Builder extends ConcurrentUpdateHttp2SolrClient.Builder {protected SolrCmdDistributor.Req req;- protected List<Error> errors;+ protected List<SolrError> errors;public Builder(String baseSolrUrl,Http2SolrClient client,SolrCmdDistributor.Req req,- List<Error> errors) {+ List<SolrError> errors) {super(baseSolrUrl, client);this.req = req;this.errors = errors;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 6c75f8307f5..d3ee6b0a999 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@@ -54,8 +54,8 @@ import org.apache.solr.update.AddUpdateCommand;import org.apache.solr.update.CommitUpdateCommand;import org.apache.solr.update.DeleteUpdateCommand;import org.apache.solr.update.SolrCmdDistributor;-import org.apache.solr.update.SolrCmdDistributor.Error;import org.apache.solr.update.SolrCmdDistributor.Node;+import org.apache.solr.update.SolrCmdDistributor.SolrError;import org.apache.solr.update.UpdateCommand;import org.apache.solr.update.UpdateLog;import org.apache.solr.update.UpdateShardHandler;@@ -1273,15 +1273,15 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {}public static final class DistributedUpdatesAsyncException extends SolrException {- public final List<Error> errors;+ public final List<SolrError> errors;- public DistributedUpdatesAsyncException(List<Error> errors) {+ public DistributedUpdatesAsyncException(List<SolrError> errors) {super(buildCode(errors), buildMsg(errors), null);this.errors = errors;// create a merged copy of the metadata from all wrapped exceptionsNamedList<String> metadata = new NamedList<>();- for (Error error : errors) {+ for (SolrError error : errors) {if (error.e instanceof SolrException) {SolrException e = (SolrException) error.e;NamedList<String> eMeta = e.getMetadata();@@ -1296,13 +1296,13 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {}/** Helper method for constructor */- private static int buildCode(List<Error> errors) {+ private static int buildCode(List<SolrError> errors) {assert null != errors;assert 0 < errors.size();int minCode = Integer.MAX_VALUE;int maxCode = Integer.MIN_VALUE;- for (Error error : errors) {+ for (SolrError error : errors) {log.trace("REMOTE ERROR: {}", error);minCode = Math.min(error.statusCode, minCode);maxCode = Math.max(error.statusCode, maxCode);@@ -1319,7 +1319,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {}/** Helper method for constructor */- private static String buildMsg(List<Error> errors) {+ private static String buildMsg(List<SolrError> errors) {assert null != errors;assert 0 < errors.size();@@ -1328,7 +1328,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {} else {StringBuilder buf =new StringBuilder(errors.size() + " Async exceptions during distributed update: ");- for (Error error : errors) {+ for (SolrError error : errors) {buf.append("\n");buf.append(error.e.getMessage());}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 88e3884412e..b2777988c6d 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@@ -1261,12 +1261,12 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {// send in a background threadcmdDistrib.finish();- List<SolrCmdDistributor.Error> errors = cmdDistrib.getErrors();+ List<SolrCmdDistributor.SolrError> errors = cmdDistrib.getErrors();// TODO - we may need to tell about more than one error...- List<SolrCmdDistributor.Error> errorsForClient = new ArrayList<>(errors.size());+ List<SolrCmdDistributor.SolrError> errorsForClient = new ArrayList<>(errors.size());Set<String> replicasShouldBeInLowerTerms = new HashSet<>();- for (final SolrCmdDistributor.Error error : errors) {+ for (final SolrCmdDistributor.SolrError error : errors) {if (error.req.node instanceof SolrCmdDistributor.ForwardNode) {// if it's a forward, any fail is a problem -diff --git a/solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.javaindex 388243247b1..db642f96582 100644--- a/solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.java@@ -226,7 +226,7 @@ public class RoutedAliasUpdateProcessor extends UpdateRequestProcessor {public void finish() throws IOException {try {cmdDistrib.finish();- final List<SolrCmdDistributor.Error> errors = cmdDistrib.getErrors();+ final List<SolrCmdDistributor.SolrError> errors = cmdDistrib.getErrors();if (!errors.isEmpty()) {throw new DistributedUpdateProcessor.DistributedUpdatesAsyncException(errors);}diff --git a/solr/core/src/java/org/apache/solr/update/processor/TolerantUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/TolerantUpdateProcessor.javaindex 73d4fd97faa..0e2e1a6ca8a 100644--- a/solr/core/src/java/org/apache/solr/update/processor/TolerantUpdateProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/TolerantUpdateProcessor.java@@ -38,7 +38,7 @@ import org.apache.solr.update.CommitUpdateCommand;import org.apache.solr.update.DeleteUpdateCommand;import org.apache.solr.update.MergeIndexesCommand;import org.apache.solr.update.RollbackUpdateCommand;-import org.apache.solr.update.SolrCmdDistributor.Error;+import org.apache.solr.update.SolrCmdDistributor.SolrError;import org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -232,7 +232,7 @@ public class TolerantUpdateProcessor extends UpdateRequestProcessor {firstErrTracker.caught(duae);// adjust our stats based on each of the distributed errors- for (Error error : duae.errors) {+ for (SolrError error : duae.errors) {// we can't trust the req info from the Error, because multiple original requests might have// been lumped together//diff --git a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.javaindex a170cefb37a..c6dbe5173a7 100644--- a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java+++ b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java@@ -44,7 +44,7 @@ import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteExecutionException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.V2Request;-import org.apache.solr.client.solrj.request.beans.Package;+import org.apache.solr.client.solrj.request.beans.PackagePayload;import org.apache.solr.client.solrj.request.beans.PluginMeta;import org.apache.solr.client.solrj.response.V2Response;import org.apache.solr.cloud.ClusterSingleton;@@ -58,7 +58,7 @@ import org.apache.solr.filestore.TestDistribPackageStore;import org.apache.solr.filestore.TestDistribPackageStore.Fetcher;import org.apache.solr.pkg.PackageAPI;import org.apache.solr.pkg.PackageListeners;-import org.apache.solr.pkg.PackageLoader;+import org.apache.solr.pkg.SolrPackageLoader;import org.apache.solr.pkg.TestPackages;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;@@ -97,7 +97,7 @@ public class TestContainerPlugin extends SolrCloudTestCase {}@Override- public void changed(PackageLoader.Package pkg, Ctx ctx) {+ public void changed(SolrPackageLoader.SolrPackage pkg, Ctx ctx) {changeCalled.release();}@@ -297,7 +297,7 @@ public class TestContainerPlugin extends SolrCloudTestCase {// We have two versions of the plugin in 2 different jar files. they are already uploaded to// the package storelistener.reset();- Package.AddVersion add = new Package.AddVersion();+ PackagePayload.AddVersion add = new PackagePayload.AddVersion();add.version = "1.0";add.pkg = "mypkg";add.files = singletonList(FILE1);diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex 6830e456d30..e9d0a8b67a5 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -53,7 +53,7 @@ import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.V2Request;-import org.apache.solr.client.solrj.request.beans.Package;+import org.apache.solr.client.solrj.request.beans.PackagePayload;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.cloud.MiniSolrCloudCluster;@@ -129,7 +129,7 @@ public class TestPackages extends SolrCloudTestCase {FILE1,"L3q/qIGs4NaF6JiO0ZkMUFa88j0OmYc+I6O7BOdNuMct/xoZ4h73aZHZGc0+nmI1f/U3bOlMPINlSOM6LK3JpQ==");- Package.AddVersion add = new Package.AddVersion();+ PackagePayload.AddVersion add = new PackagePayload.AddVersion();add.version = "1.0";add.pkg = "mypkg";add.files = Arrays.asList(new String[] {FILE1});@@ -210,7 +210,7 @@ public class TestPackages extends SolrCloudTestCase {EXPR1,"ZOT11arAiPmPZYOHzqodiNnxO9pRyRozWZEBX8XGjU1/HJptFnZK+DI7eXnUtbNaMcbXE2Ze8hh4M/eGyhY8BQ==");- Package.AddVersion add = new Package.AddVersion();+ PackagePayload.AddVersion add = new PackagePayload.AddVersion();add.version = "1.0";add.pkg = "mypkg";add.files = Arrays.asList(new String[] {FILE1, URP1, EXPR1});@@ -399,7 +399,7 @@ public class TestPackages extends SolrCloudTestCase {assertEquals("Version 2", result.getResults().get(0).getFieldValue("TestVersionedURP.Ver_s"));- Package.DelVersion delVersion = new Package.DelVersion();+ PackagePayload.DelVersion delVersion = new PackagePayload.DelVersion();delVersion.pkg = "mypkg";delVersion.version = "1.0";V2Request delete =@@ -577,7 +577,7 @@ public class TestPackages extends SolrCloudTestCase {String FILE2 = "/mypkg/v.0.12/jar_b.jar";String FILE3 = "/mypkg/v.0.13/jar_a.jar";- Package.AddVersion add = new Package.AddVersion();+ PackagePayload.AddVersion add = new PackagePayload.AddVersion();add.version = "0.12";add.pkg = "test_pkg";add.files = List.of(FILE1, FILE2);@@ -652,7 +652,7 @@ public class TestPackages extends SolrCloudTestCase {Map.of(":packages:test_pkg[1]:version", "0.13", ":packages:test_pkg[1]:files[0]", FILE3));// Now we will just delete one version- Package.DelVersion delVersion = new Package.DelVersion();+ PackagePayload.DelVersion delVersion = new PackagePayload.DelVersion();delVersion.version = "0.1"; // this version does not existdelVersion.pkg = "test_pkg";req =@@ -759,7 +759,7 @@ public class TestPackages extends SolrCloudTestCase {FILE2,"gI6vYUDmSXSXmpNEeK1cwqrp4qTeVQgizGQkd8A4Prx2K8k7c5QlXbcs4lxFAAbbdXz9F4esBqTCiLMjVDHJ5Q==");- Package.AddVersion add = new Package.AddVersion();+ PackagePayload.AddVersion add = new PackagePayload.AddVersion();add.version = "1.0";add.pkg = "schemapkg";add.files = Arrays.asList(FILE1, FILE2);@@ -800,7 +800,7 @@ public class TestPackages extends SolrCloudTestCase {":fieldType:_packageinfo_:version","1.0"));- add = new Package.AddVersion();+ add = new PackagePayload.AddVersion();add.version = "2.0";add.pkg = "schemapkg";add.files = Arrays.asList(FILE1);diff --git a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.javaindex 81905a81f33..43bc7203277 100644--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java@@ -49,9 +49,9 @@ import org.apache.solr.core.SolrEventListener;import org.apache.solr.index.LogDocMergePolicyFactory;import org.apache.solr.search.SolrIndexSearcher;import org.apache.solr.update.MockStreamingSolrClients.Exp;-import org.apache.solr.update.SolrCmdDistributor.Error;import org.apache.solr.update.SolrCmdDistributor.ForwardNode;import org.apache.solr.update.SolrCmdDistributor.Node;+import org.apache.solr.update.SolrCmdDistributor.SolrError;import org.apache.solr.update.SolrCmdDistributor.StdNode;import org.apache.solr.update.processor.DistributedUpdateProcessor;import org.apache.solr.update.processor.DistributedUpdateProcessor.LeaderRequestReplicationTracker;@@ -158,7 +158,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {ModifiableSolrParams params = new ModifiableSolrParams();List<Node> nodes = new ArrayList<>();AddUpdateCommand cmd = new AddUpdateCommand(null);- List<Error> errors;+ List<SolrError> errors;CommitUpdateCommand ccmd = new CommitUpdateCommand(null, false);long numFound;HttpSolrClient client;@@ -397,7 +397,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {Node retryNode =new StdNode(new ZkCoreNodeProps(nodeProps), "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {streamingClients.setExp(null);retries.incrementAndGet();return super.checkRetry(err);@@ -462,7 +462,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {nodes.add(new ForwardNode(new ZkCoreNodeProps(nodeProps), null, "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {if (retries.incrementAndGet() >= 3) {streamingClients.setExp(null);}@@ -473,7 +473,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {nodes.add(new StdNode(new ZkCoreNodeProps(nodeProps), "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {if (retries.incrementAndGet() >= 3) {streamingClients.setExp(null);}@@ -520,7 +520,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {retryNode =new ForwardNode(new ZkCoreNodeProps(nodeProps), null, "collection1", "shard1", 6) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {retries.incrementAndGet();return super.checkRetry(err);}@@ -529,7 +529,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {retryNode =new StdNode(new ZkCoreNodeProps(nodeProps), "collection1", "shard1", 6) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {retries.incrementAndGet();return super.checkRetry(err);}@@ -552,7 +552,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {}private void testReqShouldRetryNoRetries() {- Error err = getError(new SocketException());+ SolrError err = getError(new SocketException());SolrCmdDistributor.Req req =new SolrCmdDistributor.Req(null, new StdNode(null, "collection1", "shard1", 0), new UpdateRequest(), true);@@ -560,7 +560,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {}private void testReqShouldRetryDBQ() {- Error err = getError(new SocketException());+ SolrError err = getError(new SocketException());UpdateRequest dbqReq = new UpdateRequest();dbqReq.deleteByQuery("*:*");SolrCmdDistributor.Req req =@@ -589,7 +589,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {}private void testReqShouldRetryMaxRetries() {- Error err = getError(new SocketException());+ SolrError err = getError(new SocketException());SolrCmdDistributor.Req req =new SolrCmdDistributor.Req(null, new StdNode(null, "collection1", "shard1", 1), new UpdateRequest(), true);@@ -599,7 +599,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {}private void testReqShouldRetryBadRequest() {- Error err = getError(new SolrException(SolrException.ErrorCode.BAD_REQUEST, "bad request"));+ SolrError err = getError(new SolrException(SolrException.ErrorCode.BAD_REQUEST, "bad request"));SolrCmdDistributor.Req req =new SolrCmdDistributor.Req(null, new StdNode(null, "collection1", "shard1", 1), new UpdateRequest(), true);@@ -607,15 +607,15 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {}private void testReqShouldRetryNotFound() {- Error err = getError(new SolrException(SolrException.ErrorCode.NOT_FOUND, "not found"));+ SolrError err = getError(new SolrException(SolrException.ErrorCode.NOT_FOUND, "not found"));SolrCmdDistributor.Req req =new SolrCmdDistributor.Req(null, new StdNode(null, "collection1", "shard1", 1), new UpdateRequest(), true);assertTrue(req.shouldRetry(err));}- private Error getError(Exception e) {- Error err = new Error();+ private SolrError getError(Exception e) {+ SolrError err = new SolrError();err.e = e;if (e instanceof SolrException) {err.statusCode = ((SolrException) e).code();@@ -644,7 +644,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {retryNode =new ForwardNode(new ZkCoreNodeProps(nodeProps), null, "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {streamingClients.setExp(null);retries.incrementAndGet();return super.checkRetry(err);@@ -654,7 +654,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {retryNode =new StdNode(new ZkCoreNodeProps(nodeProps), "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {streamingClients.setExp(null);retries.incrementAndGet();return super.checkRetry(err);@@ -705,7 +705,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {retryNode =new ForwardNode(new ZkCoreNodeProps(nodeProps), null, "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {retries.incrementAndGet();return super.checkRetry(err);}@@ -714,7 +714,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {retryNode =new StdNode(new ZkCoreNodeProps(nodeProps), "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {retries.incrementAndGet();return super.checkRetry(err);}@@ -764,7 +764,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {ForwardNode retryNode =new ForwardNode(new ZkCoreNodeProps(nodeProps), null, "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {retries.incrementAndGet();return super.checkRetry(err);}@@ -812,7 +812,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {Node retryNode =new StdNode(new ZkCoreNodeProps(nodeProps), "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {retries.incrementAndGet();return super.checkRetry(err);}@@ -846,7 +846,7 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {ForwardNode retryNode =new ForwardNode(new ZkCoreNodeProps(nodeProps), null, "collection1", "shard1", 5) {@Override- public boolean checkRetry(Error err) {+ public boolean checkRetry(SolrError err) {ZkNodeProps leaderProps =new ZkNodeProps(ZkStateReader.BASE_URL_PROP,diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/Package.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/PackagePayload.javasimilarity index 98%rename from solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/Package.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/PackagePayload.javaindex b19996f76d3..831d87d809f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/Package.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/PackagePayload.java@@ -22,7 +22,7 @@ import org.apache.solr.common.annotation.JsonProperty;import org.apache.solr.common.util.ReflectMapWriter;/** Just a container class for POJOs used in Package APIs */-public class Package {+public class PackagePayload {public static class AddVersion implements ReflectMapWriter {@JsonProperty(value = "package", required = true)public String pkg;