SOLR-16318: Use up to JDK 11 features (avoid type declaration when <>…

… can be used) (apache#916)

Co-authored-by: Kevin Risden <[email protected]>

buildSrc/src/main/java/org/apache/lucene/gradle/ProfileResults.java

@@ -185,7 +185,7 @@ public static void printReport(List<String> files, String mode, int stacksize, i
               stack.append(frameToString(trace.getFrames().get(i), lineNumbers));
             }
             String line = stack.toString();
-            SimpleEntry<String,Long> entry = histogram.computeIfAbsent(line, u -> new SimpleEntry<String, Long>(line, 0L));
+            SimpleEntry<String,Long> entry = histogram.computeIfAbsent(line, u -> new SimpleEntry<>(line, 0L));
             long value = getValue(event);
             entry.setValue(entry.getValue() + value);
             totalEvents++;

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

@@ -86,7 +86,7 @@ private static Map<String, Object> getNewProperties(ZkNodeProps message) {
     for (Map.Entry<String, Object> entry : message.getProperties().entrySet()) {
       if (entry.getKey().startsWith(CONFIG_SET_PROPERTY_PREFIX)) {
         if (properties == null) {
-          properties = new HashMap<String, Object>();
+          properties = new HashMap<>();
         }
         properties.put(
             entry.getKey().substring((CONFIG_SET_PROPERTY_PREFIX).length()), entry.getValue());

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

@@ -759,7 +759,7 @@ public synchronized void start(String id) {
     ccThread.start();
 
     systemCollectionCompatCheck(
-        new BiConsumer<String, Object>() {
+        new BiConsumer<>() {
           boolean firstPair = true;
 
           @Override

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

@@ -70,7 +70,7 @@ private void shrinkIfNeeded() throws KeeperException, InterruptedException {
       int cleanupSize = maxSize / 10;
 
       final PriorityQueue<Long> priorityQueue =
-          new PriorityQueue<Long>(cleanupSize) {
+          new PriorityQueue<>(cleanupSize) {
             @Override
             protected boolean lessThan(Long a, Long b) {
               return (a > b);

solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java

@@ -456,7 +456,7 @@ public void call(ClusterState clusterState, ZkNodeProps message, NamedList<Objec
         // Let's cleanup as we hit an exception
         // We shouldn't be passing 'results' here for the cleanup as the response would then contain
         // 'success' element, which may be interpreted by the user as a positive ack
-        CollectionHandlingUtils.cleanupCollection(collectionName, new NamedList<Object>(), ccc);
+        CollectionHandlingUtils.cleanupCollection(collectionName, new NamedList<>(), ccc);
         log.info("Cleaned up artifacts for failed create collection for [{}]", collectionName);
         throw new SolrException(
             ErrorCode.BAD_REQUEST,

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

@@ -144,7 +144,7 @@ public List<CoreDescriptor> discover(final CoreContainer cc) {
           this.rootDirectory,
           options,
           maxDepth,
-          new SimpleFileVisitor<Path>() {
+          new SimpleFileVisitor<>() {
             @Override
             public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
                 throws IOException {

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

@@ -36,7 +36,7 @@ public class NodeRoles {
   private Map<Role, String> nodeRoles;
 
   public NodeRoles(String rolesString) {
-    Map<Role, String> roles = new EnumMap<Role, String>(Role.class);
+    Map<Role, String> roles = new EnumMap<>(Role.class);
     if (StringUtils.isEmpty(rolesString)) {
       rolesString = DEFAULT_ROLES_STRING;
     }

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

@@ -137,7 +137,7 @@ public PluginHolder<T> createPlugin(PluginInfo info) {
       if (log.isDebugEnabled()) {
         log.debug("{} : '{}' created with startup=lazy ", meta.getCleanTag(), info.name);
       }
-      return new LazyPluginHolder<T>(meta, info, core, core.getResourceLoader());
+      return new LazyPluginHolder<>(meta, info, core, core.getResourceLoader());
     } else {
       if (info.pkgName != null) {
         PackagePluginHolder<T> holder = new PackagePluginHolder<>(info, core, meta);
@@ -329,7 +329,7 @@ void init(Map<String, T> defaults, SolrCore solrCore, List<PluginInfo> infos) {
     }
     for (Map.Entry<String, T> e : defaults.entrySet()) {
       if (!contains(e.getKey())) {
-        put(e.getKey(), new PluginHolder<T>(null, e.getValue()));
+        put(e.getKey(), new PluginHolder<>(null, e.getValue()));
       }
     }
   }

solr/core/src/java/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.java

@@ -91,7 +91,7 @@ public boolean isLeader() {
 
     @Override
     public void write(JSONWriter arg0) {
-      LinkedHashMap<String, Object> info = new LinkedHashMap<String, Object>();
+      LinkedHashMap<String, Object> info = new LinkedHashMap<>();
       info.put(CoreAdminParams.CORE, getCoreName());
       info.put(SolrSnapshotManager.INDEX_DIR_PATH, getIndexDirPath());
       info.put(SolrSnapshotManager.GENERATION_NUM, getGenerationNumber());
@@ -244,7 +244,7 @@ public NamedList<Object> toNamedList() {
     result.add(SolrSnapshotManager.SNAPSHOT_STATUS, this.status.toString());
     result.add(SolrSnapshotManager.CREATION_DATE, this.getCreationDate().getTime());
 
-    NamedList<NamedList<Object>> replicas = new NamedList<NamedList<Object>>();
+    NamedList<NamedList<Object>> replicas = new NamedList<>();
     for (CoreSnapshotMetaData x : replicaSnapshots) {
       replicas.add(x.getCoreName(), x.toNamedList());
     }

solr/core/src/java/org/apache/solr/handler/ClusterAPI.java

@@ -135,7 +135,7 @@ public void nodesWithRole(SolrQueryRequest req, SolrQueryResponse rsp) throws Ex
   @SuppressWarnings("unchecked")
   public void rolesForNode(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
     String node = req.getPathTemplateValues().get("node");
-    Map<String, String> ret = new HashMap<String, String>();
+    Map<String, String> ret = new HashMap<>();
     Map<String, Map<String, Set<String>>> roles =
         (Map<String, Map<String, Set<String>>>)
             readRecursive(

solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java

@@ -54,7 +54,7 @@ public static boolean handleCommit(
       SolrQueryRequest req, UpdateRequestProcessor processor, SolrParams params, boolean force)
       throws IOException {
     if (params == null) {
-      params = new MapSolrParams(new HashMap<String, String>());
+      params = new MapSolrParams(new HashMap<>());
     }
 
     boolean optimize = params.getBool(UpdateParams.OPTIMIZE, false);
@@ -115,7 +115,7 @@ public static boolean handleRollback(
       SolrQueryRequest req, UpdateRequestProcessor processor, SolrParams params, boolean force)
       throws IOException {
     if (params == null) {
-      params = new MapSolrParams(new HashMap<String, String>());
+      params = new MapSolrParams(new HashMap<>());
     }
 
     boolean rollback = params.getBool(UpdateParams.ROLLBACK, false);

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

@@ -110,9 +110,9 @@ public CoreAdminHandler() {
     // should happen in the constructor...
     this.coreContainer = null;
     HashMap<String, Map<String, TaskObject>> map = new HashMap<>(3, 1.0f);
-    map.put(RUNNING, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
-    map.put(COMPLETED, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
-    map.put(FAILED, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
+    map.put(RUNNING, Collections.synchronizedMap(new LinkedHashMap<>()));
+    map.put(COMPLETED, Collections.synchronizedMap(new LinkedHashMap<>()));
+    map.put(FAILED, Collections.synchronizedMap(new LinkedHashMap<>()));
     requestStatusMap = Collections.unmodifiableMap(map);
   }
 
@@ -124,9 +124,9 @@ public CoreAdminHandler() {
   public CoreAdminHandler(final CoreContainer coreContainer) {
     this.coreContainer = coreContainer;
     HashMap<String, Map<String, TaskObject>> map = new HashMap<>(3, 1.0f);
-    map.put(RUNNING, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
-    map.put(COMPLETED, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
-    map.put(FAILED, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
+    map.put(RUNNING, Collections.synchronizedMap(new LinkedHashMap<>()));
+    map.put(COMPLETED, Collections.synchronizedMap(new LinkedHashMap<>()));
+    map.put(FAILED, Collections.synchronizedMap(new LinkedHashMap<>()));
     requestStatusMap = Collections.unmodifiableMap(map);
   }
 

solr/core/src/java/org/apache/solr/handler/component/PivotFacet.java

@@ -66,7 +66,7 @@ public PivotFacet(ResponseBuilder rb, String facetStr) {
   public void addRefinement(int shardNumber, PivotFacetValue value) {
 
     if (!queuedRefinements.containsKey(shardNumber)) {
-      queuedRefinements.put(shardNumber, new ArrayList<PivotFacetValue>());
+      queuedRefinements.put(shardNumber, new ArrayList<>());
     }
 
     queuedRefinements.get(shardNumber).add(value);

solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java

@@ -574,8 +574,8 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
     if (!rb.isDistrib
         && req.getParams().getBool(ShardParams.SHARDS_INFO, false)
         && rb.shortCircuitedURL != null) {
-      NamedList<Object> shardInfo = new SimpleOrderedMap<Object>();
-      SimpleOrderedMap<Object> nl = new SimpleOrderedMap<Object>();
+      NamedList<Object> shardInfo = new SimpleOrderedMap<>();
+      SimpleOrderedMap<Object> nl = new SimpleOrderedMap<>();
       if (rsp.getException() != null) {
         Throwable cause = rsp.getException();
         if (cause instanceof SolrServerException) {

solr/core/src/java/org/apache/solr/handler/component/StatsField.java

@@ -90,7 +90,7 @@ public static enum Stat {
       boolean parseParams(StatsField sf) {
         String percentileParas = sf.localParams.get(this.name());
         if (percentileParas != null) {
-          List<Double> percentiles = new ArrayList<Double>();
+          List<Double> percentiles = new ArrayList<>();
           try {
             for (String percentile : StrUtils.splitSmart(percentileParas, ',')) {
               percentiles.add(Double.parseDouble(percentile));
@@ -149,7 +149,7 @@ boolean parseParams(StatsField sf) {
      * @see #getDistribDeps
      */
     Stat(boolean selfDep, Stat... deps) {
-      distribDeps = new ArrayList<Stat>(deps.length + 1);
+      distribDeps = new ArrayList<>(deps.length + 1);
       distribDeps.addAll(Arrays.asList(deps));
       if (selfDep) {
         distribDeps.add(this);
@@ -220,7 +220,7 @@ boolean parseParams(StatsField sf) {
   private final List<String> excludeTagList;
   private final EnumSet<Stat> statsToCalculate = EnumSet.noneOf(Stat.class);
   private final EnumSet<Stat> statsInResponse = EnumSet.noneOf(Stat.class);
-  private final List<Double> percentilesList = new ArrayList<Double>();
+  private final List<Double> percentilesList = new ArrayList<>();
   private final boolean isShard;
 
   private double tdigestCompression = 100.0D;
@@ -397,7 +397,7 @@ public DocSet computeBaseDocSet() throws IOException {
       return docs;
     }
 
-    IdentityHashMap<Query, Boolean> excludeSet = new IdentityHashMap<Query, Boolean>();
+    IdentityHashMap<Query, Boolean> excludeSet = new IdentityHashMap<>();
     for (String excludeTag : excludeTagList) {
       Object olst = tagMap.get(excludeTag);
       // tagMap has entries of List<String,List<QParser>>, but subject to change in the future
@@ -419,7 +419,7 @@ public DocSet computeBaseDocSet() throws IOException {
     }
     if (excludeSet.size() == 0) return docs;
 
-    List<Query> qlist = new ArrayList<Query>();
+    List<Query> qlist = new ArrayList<>();
 
     // add the base query
     if (!excludeSet.containsKey(rb.getQuery())) {

solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java

@@ -324,7 +324,7 @@ private Bits computeDocCorpus(SolrQueryRequest req) throws SyntaxError, IOExcept
     final SolrIndexSearcher searcher = req.getSearcher();
     final Bits docBits;
     if (corpusFilterQueries != null && corpusFilterQueries.length > 0) {
-      List<Query> filterQueries = new ArrayList<Query>(corpusFilterQueries.length);
+      List<Query> filterQueries = new ArrayList<>(corpusFilterQueries.length);
       for (String corpusFilterQuery : corpusFilterQueries) {
         QParser qParser = QParser.getParser(corpusFilterQuery, null, req);
         try {

solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java

@@ -90,7 +90,7 @@ protected boolean emptyArray(String[] arr) {
 
   protected static String[] expandWildcardsInFields(
       Supplier<Collection<String>> availableFieldNamesSupplier, String... inFields) {
-    Set<String> expandedFields = new LinkedHashSet<String>();
+    Set<String> expandedFields = new LinkedHashSet<>();
     Collection<String> availableFieldNames = null;
     for (String inField : inFields) {
       for (String field : SolrPluginUtils.split(inField)) {

solr/core/src/java/org/apache/solr/logging/CircularList.java

@@ -126,7 +126,7 @@ public String toString() {
 
   @Override
   public Iterator<T> iterator() {
-    return new Iterator<T>() {
+    return new Iterator<>() {
       int idx = 0;
 
       @Override

solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java

@@ -252,7 +252,7 @@ private List<Path> downloadPackageArtifacts(String packageName, String version)
       throws SolrException {
     try {
       SolrPackageRelease release = getPackageRelease(packageName, version);
-      List<Path> downloadedPaths = new ArrayList<Path>(release.artifacts.size());
+      List<Path> downloadedPaths = new ArrayList<>(release.artifacts.size());
 
       for (PackageRepository repo : getRepositories()) {
         if (repo.hasPackage(packageName)) {

solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java

@@ -627,7 +627,7 @@ protected Query newGraphSynonymQuery(Iterator<Query> sidePathQueriesIterator) {
   protected Query newSynonymQuery(TermAndBoost[] terms) {
     switch (synonymQueryStyle) {
       case PICK_BEST:
-        List<Query> currPosnClauses = new ArrayList<Query>(terms.length);
+        List<Query> currPosnClauses = new ArrayList<>(terms.length);
         for (TermAndBoost term : terms) {
           currPosnClauses.add(newTermQuery(term.term, term.boost));
         }

solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java

@@ -79,15 +79,15 @@ public static <T> PluginBag.PluginHolder<T> createHolder(T inst, Class<T> type)
     SolrConfig.SolrPluginInfo plugin = SolrConfig.classVsSolrPluginInfo.get(type.getName());
     PluginInfo info =
         new PluginInfo(plugin.tag, Collections.singletonMap("class", inst.getClass().getName()));
-    return new PluginBag.PluginHolder<T>(info, inst);
+    return new PluginBag.PluginHolder<>(info, inst);
   }
 
   public static <T> PluginBag.PluginHolder<T> createHolder(
       PluginInfo info, SolrCore core, Class<T> type, String msg) {
     if (info.cName.pkg == null) {
-      return new PluginBag.PluginHolder<T>(info, core.createInitInstance(info, type, msg, null));
+      return new PluginBag.PluginHolder<>(info, core.createInitInstance(info, type, msg, null));
     } else {
-      return new PackagePluginHolder<T>(
+      return new PackagePluginHolder<>(
           info, core, SolrConfig.classVsSolrPluginInfo.get(type.getName()));
     }
   }

solr/core/src/java/org/apache/solr/request/NumericFacets.java

@@ -272,7 +272,7 @@ public long longValue() throws IOException {
     if (FacetParams.FACET_SORT_COUNT.equals(sort)
         || FacetParams.FACET_SORT_COUNT_LEGACY.equals(sort)) {
       pq =
-          new PriorityQueue<Entry>(pqSize) {
+          new PriorityQueue<>(pqSize) {
             @Override
             protected boolean lessThan(Entry a, Entry b) {
               if (a.count < b.count || (a.count == b.count && a.bits > b.bits)) {
@@ -284,7 +284,7 @@ protected boolean lessThan(Entry a, Entry b) {
           };
     } else {
       pq =
-          new PriorityQueue<Entry>(pqSize) {
+          new PriorityQueue<>(pqSize) {
             @Override
             protected boolean lessThan(Entry a, Entry b) {
               return a.bits > b.bits;
@@ -518,7 +518,7 @@ private static NamedList<Integer> getCountsMultiValued(
     if (FacetParams.FACET_SORT_COUNT.equals(sort)
         || FacetParams.FACET_SORT_COUNT_LEGACY.equals(sort)) {
       pq =
-          new PriorityQueue<Entry>(pqSize) {
+          new PriorityQueue<>(pqSize) {
             @Override
             protected boolean lessThan(Entry a, Entry b) {
               if (a.count < b.count || (a.count == b.count && a.bits > b.bits)) {
@@ -531,7 +531,7 @@ protected boolean lessThan(Entry a, Entry b) {
     } else {
       // sort=index
       pq =
-          new PriorityQueue<Entry>(pqSize) {
+          new PriorityQueue<>(pqSize) {
             @Override
             protected boolean lessThan(Entry a, Entry b) {
               return a.bits > b.bits;

solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java

@@ -146,7 +146,7 @@ NamedList<Integer> getFacetCounts(Executor executor) throws IOException {
 
     // now merge the per-segment results
     PriorityQueue<SegFacet> queue =
-        new PriorityQueue<SegFacet>(leaves.size()) {
+        new PriorityQueue<>(leaves.size()) {
           @Override
           protected boolean lessThan(SegFacet a, SegFacet b) {
             return a.tempBR.compareTo(b.tempBR) < 0;

solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java

@@ -104,7 +104,7 @@ public static void mergeObjects(
       @SuppressWarnings({"unchecked"})
       Map<String, Object> sub = (Map<String, Object>) outer.get(path.get(i));
       if (sub == null) {
-        sub = new LinkedHashMap<String, Object>();
+        sub = new LinkedHashMap<>();
         outer.put(path.get(i), sub);
       }
       outer = sub;

solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java

@@ -251,7 +251,7 @@ public Collection<Object> getRawFieldValues(String name) {
     @Override
     public Iterator<Entry<String, Object>> iterator() {
       Iterator<Entry<String, Object>> it = _fields.entrySet().iterator();
-      return new Iterator<Entry<String, Object>>() {
+      return new Iterator<>() {
         @Override
         public boolean hasNext() {
           return it.hasNext();

solr/core/src/java/org/apache/solr/response/transform/SubQueryAugmenterFactory.java

@@ -281,7 +281,7 @@ protected String convertFieldValue(Object val) {
     @Override
     public Iterator<String> getParameterNamesIterator() {
       final Iterator<String> fieldNames = doc.getFieldNames().iterator();
-      return new Iterator<String>() {
+      return new Iterator<>() {
 
         @Override
         public boolean hasNext() {

solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java

@@ -239,7 +239,7 @@ private Analyzer readAnalyzer(ConfigNode node) {
 
     final ArrayList<CharFilterFactory> charFilters = new ArrayList<>();
     AbstractPluginLoader<CharFilterFactory> charFilterLoader =
-        new AbstractPluginLoader<CharFilterFactory>(
+        new AbstractPluginLoader<>(
             "[schema.xml] analyzer/charFilter", CharFilterFactory.class, false, false) {
 
           @Override
@@ -303,7 +303,7 @@ protected CharFilterFactory register(String name, CharFilterFactory plugin) {
 
     final ArrayList<TokenizerFactory> tokenizers = new ArrayList<>(1);
     AbstractPluginLoader<TokenizerFactory> tokenizerLoader =
-        new AbstractPluginLoader<TokenizerFactory>(
+        new AbstractPluginLoader<>(
             "[schema.xml] analyzer/tokenizer", TokenizerFactory.class, false, false) {
 
           @Override
@@ -375,7 +375,7 @@ protected TokenizerFactory register(String name, TokenizerFactory plugin) {
     final ArrayList<TokenFilterFactory> filters = new ArrayList<>();
 
     AbstractPluginLoader<TokenFilterFactory> filterLoader =
-        new AbstractPluginLoader<TokenFilterFactory>(
+        new AbstractPluginLoader<>(
             "[schema.xml] analyzer/filter", TokenFilterFactory.class, false, false) {
           @Override
           protected TokenFilterFactory create(

solr/core/src/java/org/apache/solr/search/QueryContext.java

@@ -77,7 +77,7 @@ public Object put(Object key, Object val) {
 
   public void addCloseHook(Closeable closeable) {
     if (closeHooks == null) {
-      closeHooks = new IdentityHashMap<Closeable, String>();
+      closeHooks = new IdentityHashMap<>();
       // for now, defer closing until the end of the request
       SolrRequestInfo.getRequestInfo().addCloseHook(this);
     }