From 8f00bcb1a0d88a6898e3ae6b8749610b2bd47d3c Mon Sep 17 00:00:00 2001 From: Joel Bernstein Date: Thu, 29 Sep 2016 18:03:03 -0400 Subject: [PATCH] SOLR-9258: Fix precommit --- .../apache/solr/handler/ClassifyStream.java | 1 - .../solr/client/solrj/io/ModelCache.java | 19 ++++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java b/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java index 6b0a02a3fad..1c266856f15 100644 --- a/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java +++ b/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java @@ -19,7 +19,6 @@ package org.apache.solr.handler; import java.io.IOException; import java.util.HashMap; import java.util.List; -import java.util.Set; import java.util.ArrayList; import java.util.Map; import java.util.Locale; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java index 4fe3d8af790..521ffec7dac 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java @@ -17,32 +17,21 @@ package org.apache.solr.client.solrj.io; import java.io.IOException; -import java.io.Serializable; -import java.lang.invoke.MethodHandles; -import java.util.Collections; import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; -import java.util.HashMap; - -import org.apache.solr.client.solrj.SolrClient; -import org.apache.solr.client.solrj.impl.CloudSolrClient; -import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.io.stream.CloudSolrStream; import org.apache.solr.client.solrj.io.stream.StreamContext; -import org.apache.solr.client.solrj.io.stream.TopicStream; import org.apache.solr.common.params.ModifiableSolrParams; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The Model cache keeps a local in-memory copy of models */ -public class ModelCache implements Serializable { +public class ModelCache { - private final LRU models; + private LRU models; private String defaultZkHost; private SolrClientCache solrClientCache; @@ -117,7 +106,7 @@ public class ModelCache implements Serializable { } } - private static class Model { + private class Model { private Tuple tuple; private long lastChecked; @@ -135,7 +124,7 @@ public class ModelCache implements Serializable { } } - private static class LRU extends LinkedHashMap { + private class LRU extends LinkedHashMap { private int maxSize;