You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/03/15 10:05:23 UTC
lucene-solr:jira/solr-9959: SOLR-9959 Remove SolrInfoMBean getDocs,
getSource, getVersion.
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-9959 [created] 8d913328f
SOLR-9959 Remove SolrInfoMBean getDocs, getSource, getVersion.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8d913328
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8d913328
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8d913328
Branch: refs/heads/jira/solr-9959
Commit: 8d913328ffa2d04f1d21c52041e9ba6eb5289fad
Parents: 124b505
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Mar 15 11:04:09 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Mar 15 11:04:09 2017 +0100
----------------------------------------------------------------------
.../solr/handler/component/AnalyticsComponent.java | 5 -----
.../src/java/org/apache/solr/core/SolrCore.java | 15 ---------------
.../java/org/apache/solr/core/SolrInfoMBean.java | 15 ---------------
.../org/apache/solr/core/SolrInfoMBeanWrapper.java | 12 ------------
.../apache/solr/handler/MoreLikeThisHandler.java | 8 --------
.../org/apache/solr/handler/RealTimeGetHandler.java | 5 -----
.../org/apache/solr/handler/RequestHandlerBase.java | 15 +--------------
.../org/apache/solr/handler/SolrConfigHandler.java | 6 ------
.../apache/solr/handler/StandardRequestHandler.java | 8 --------
.../solr/handler/admin/LukeRequestHandler.java | 8 --------
.../solr/handler/admin/PluginInfoHandler.java | 13 -------------
.../solr/handler/admin/SolrInfoMBeanHandler.java | 12 ------------
.../solr/handler/component/DebugComponent.java | 5 -----
.../solr/handler/component/ExpandComponent.java | 11 -----------
.../solr/handler/component/FacetComponent.java | 5 -----
.../solr/handler/component/HighlightComponent.java | 5 -----
.../handler/component/MoreLikeThisComponent.java | 5 -----
.../solr/handler/component/QueryComponent.java | 5 -----
.../handler/component/QueryElevationComponent.java | 10 ----------
.../handler/component/RealTimeGetComponent.java | 7 -------
.../solr/handler/component/SearchComponent.java | 14 +-------------
.../solr/highlight/HighlightingPluginBase.java | 14 +-------------
.../java/org/apache/solr/search/FastLRUCache.java | 6 ------
.../src/java/org/apache/solr/search/LFUCache.java | 15 ---------------
.../src/java/org/apache/solr/search/LRUCache.java | 5 -----
.../java/org/apache/solr/search/QParserPlugin.java | 15 ---------------
.../org/apache/solr/search/SolrFieldCacheMBean.java | 8 --------
.../org/apache/solr/search/SolrIndexSearcher.java | 15 ---------------
.../org/apache/solr/search/facet/FacetModule.java | 6 ------
.../org/apache/solr/store/blockcache/Metrics.java | 10 ----------
.../solr/store/hdfs/HdfsLocalityReporter.java | 15 ---------------
.../apache/solr/update/DirectUpdateHandler2.java | 15 ---------------
.../org/apache/solr/update/UpdateShardHandler.java | 15 ---------------
.../org/apache/solr/BasicFunctionalityTest.java | 2 --
.../src/test/org/apache/solr/SolrInfoMBeanTest.java | 1 -
.../test/org/apache/solr/core/MockInfoMBean.java | 16 ----------------
.../component/ResourceSharingTestComponent.java | 5 -----
.../org/apache/solr/search/MockSearchComponent.java | 6 ------
38 files changed, 3 insertions(+), 355 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java b/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
index f33b6c7..a83f7b5 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
@@ -80,11 +80,6 @@ public class AnalyticsComponent extends SearchComponent {
}
@Override
- public String getVersion() {
- return getClass().getPackage().getSpecificationVersion();
- }
-
- @Override
public NamedList getStatistics() {
return analyticsCollector.getStatistics();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 6e25280..0c303ba 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2778,11 +2778,6 @@ public final class SolrCore implements SolrInfoMBean, SolrMetricProducer, Closea
/////////////////////////////////////////////////////////////////////
@Override
- public String getVersion() {
- return SolrCore.version;
- }
-
- @Override
public String getDescription() {
return "SolrCore";
}
@@ -2793,16 +2788,6 @@ public final class SolrCore implements SolrInfoMBean, SolrMetricProducer, Closea
}
@Override
- public String getSource() {
- return null;
- }
-
- @Override
- public URL[] getDocs() {
- return null;
- }
-
- @Override
public NamedList getStatistics() {
NamedList<Object> lst = new SimpleOrderedMap<>(8);
lst.add("coreName", name==null ? "(null)" : name);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
index 63bdef0..41bd8bf 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
@@ -16,8 +16,6 @@
*/
package org.apache.solr.core;
-import java.net.URL;
-
import org.apache.solr.common.util.NamedList;
/**
@@ -45,23 +43,10 @@ public interface SolrInfoMBean {
* or fully qualified clas name.
*/
public String getName();
- /** Simple common usage version, e.g. 2.0 */
- public String getVersion();
/** Simple one or two line description */
public String getDescription();
/** Purpose of this Class */
public Category getCategory();
- /** CVS Source, SVN Source, etc */
- public String getSource();
- /**
- * Documentation URL list.
- *
- * <p>
- * Suggested documentation URLs: Homepage for sponsoring project,
- * FAQ on class usage, Design doc for class, Wiki, bug reporting URL, etc...
- * </p>
- */
- public URL[] getDocs();
/**
* Any statistics this instance would like to be publicly available via
* the Solr Administration interface.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/core/SolrInfoMBeanWrapper.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrInfoMBeanWrapper.java b/solr/core/src/java/org/apache/solr/core/SolrInfoMBeanWrapper.java
index 534b884..3b79372 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrInfoMBeanWrapper.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrInfoMBeanWrapper.java
@@ -37,10 +37,6 @@ public class SolrInfoMBeanWrapper implements SolrInfoMBean {
/** {@inheritDoc} */
@Override
- public String getVersion() { return mbean.getVersion(); }
-
- /** {@inheritDoc} */
- @Override
public String getDescription() { return mbean.getDescription(); }
/** {@inheritDoc} */
@@ -49,14 +45,6 @@ public class SolrInfoMBeanWrapper implements SolrInfoMBean {
/** {@inheritDoc} */
@Override
- public String getSource() { return mbean.getSource(); }
-
- /** {@inheritDoc} */
- @Override
- public URL[] getDocs() { return mbean.getDocs(); }
-
- /** {@inheritDoc} */
- @Override
public NamedList getStatistics() { return mbean.getStatistics(); }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
index 9c86350..ad60b20 100644
--- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
@@ -481,12 +481,4 @@ public class MoreLikeThisHandler extends RequestHandlerBase
public String getDescription() {
return "Solr MoreLikeThis";
}
-
- @Override
- public URL[] getDocs() {
- try {
- return new URL[] { new URL("http://wiki.apache.org/solr/MoreLikeThis") };
- }
- catch( MalformedURLException ex ) { return null; }
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
index 9049318..bee7947 100644
--- a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
@@ -43,11 +43,6 @@ public class RealTimeGetHandler extends SearchHandler {
}
@Override
- public URL[] getDocs() {
- return null;
- }
-
- @Override
public Collection<Api> getApis() {
return ApiBag.wrapRequestHandlers(this, "core.RealtimeGet");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
index 1958e11..fd089c7 100644
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@ -225,26 +225,13 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
@Override
public abstract String getDescription();
- @Override
- public String getSource() { return null; }
-
- @Override
- public String getVersion() {
- return getClass().getPackage().getSpecificationVersion();
- }
-
+
@Override
public Category getCategory() {
return Category.QUERY;
}
@Override
- public URL[] getDocs() {
- return null; // this can be overridden, but not required
- }
-
-
- @Override
public SolrRequestHandler getSubHandler(String subPath) {
return null;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
index 2660cba..04fd4c8 100644
--- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
@@ -702,12 +702,6 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
return "Edit solrconfig.xml";
}
-
- @Override
- public String getVersion() {
- return getClass().getPackage().getSpecificationVersion();
- }
-
@Override
public Category getCategory() {
return Category.ADMIN;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
index d5eae08..73c497c 100644
--- a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
@@ -47,14 +47,6 @@ public class StandardRequestHandler extends SearchHandler
public String getDescription() {
return "The standard Solr request handler";
}
-
- @Override
- public URL[] getDocs() {
- try {
- return new URL[] { new URL("http://wiki.apache.org/solr/StandardRequestHandler") };
- }
- catch( MalformedURLException ex ) { return null; }
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
index 62a50e6..81c8400 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
@@ -707,14 +707,6 @@ public class LukeRequestHandler extends RequestHandlerBase
return Category.ADMIN;
}
- @Override
- public URL[] getDocs() {
- try {
- return new URL[] { new URL("http://wiki.apache.org/solr/LukeRequestHandler") };
- }
- catch( MalformedURLException ex ) { return null; }
- }
-
///////////////////////////////////////////////////////////////////////////////////////
static class TermHistogram
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
index a096e79..e2ec165 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.admin;
-import java.net.URL;
-import java.util.ArrayList;
import java.util.Map;
import org.apache.solr.common.params.SolrParams;
@@ -62,18 +60,7 @@ public class PluginInfoHandler extends RequestHandlerBase
category.add( entry.getKey(), info );
info.add( NAME, (m.getName() !=null ? m.getName() : na) );
- info.add( "version", (m.getVersion() !=null ? m.getVersion() : na) );
info.add( "description", (m.getDescription()!=null ? m.getDescription() : na) );
- info.add( "source", (m.getSource() !=null ? m.getSource() : na) );
-
- URL[] urls = m.getDocs();
- if ((urls != null) && (urls.length > 0)) {
- ArrayList<String> docs = new ArrayList<>(urls.length);
- for( URL u : urls ) {
- docs.add( u.toExternalForm() );
- }
- info.add( "docs", docs );
- }
if( stats ) {
info.add( "stats", m.getStatistics() );
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
index f5f28c5..52502ab 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
@@ -145,19 +145,7 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {
if ( null == catInfo ) return;
NamedList<Object> mBeanInfo = new SimpleOrderedMap<>();
mBeanInfo.add("class", m.getName());
- mBeanInfo.add("version", m.getVersion());
mBeanInfo.add("description", m.getDescription());
- mBeanInfo.add("src", m.getSource());
-
- // Use an external form
- URL[] urls = m.getDocs();
- if(urls!=null) {
- List<String> docs = new ArrayList<>(urls.length);
- for(URL url : urls) {
- docs.add(url.toExternalForm());
- }
- mBeanInfo.add("docs", docs);
- }
if (req.getParams().getFieldBool(key, "stats", false))
mBeanInfo.add("stats", m.getStatistics());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
index be21733..9ff4952 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
@@ -392,9 +392,4 @@ public class DebugComponent extends SearchComponent
public Category getCategory() {
return Category.OTHER;
}
-
- @Override
- public URL[] getDocs() {
- return null;
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
index 8078bdc..0db2395 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
@@ -750,17 +750,6 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia
return Category.QUERY;
}
- @Override
- public URL[] getDocs() {
- try {
- return new URL[]{
- new URL("http://wiki.apache.org/solr/ExpandComponent")
- };
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
- }
-
// this reader alters the content of the given reader so it should not
// delegate the caching stuff
private class ReaderWrapper extends FilterLeafReader {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
index 66b9ab8..8a1b8ed 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
@@ -1225,11 +1225,6 @@ public class FacetComponent extends SearchComponent {
return Category.QUERY;
}
- @Override
- public URL[] getDocs() {
- return null;
- }
-
/**
* This class is used exclusively for merging results from each shard
* in a distributed facet request. It plays no role in the computation
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
index d147be2..b45be5c 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
@@ -278,9 +278,4 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni
public Category getCategory() {
return Category.HIGHLIGHTER;
}
-
- @Override
- public URL[] getDocs() {
- return null;
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
index 55edc63..eb0cc4d 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
@@ -424,9 +424,4 @@ public class MoreLikeThisComponent extends SearchComponent {
public Category getCategory() {
return Category.QUERY;
}
-
- @Override
- public URL[] getDocs() {
- return null;
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index deff25b..c1e42a5 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -1388,11 +1388,6 @@ public class QueryComponent extends SearchComponent
return Category.QUERY;
}
- @Override
- public URL[] getDocs() {
- return null;
- }
-
/**
* Fake scorer for a single document
*
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
index 8482d65..815eba9 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
@@ -603,16 +603,6 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
return "Query Boosting -- boost particular documents for a given query";
}
- @Override
- public URL[] getDocs() {
- try {
- return new URL[]{
- new URL("http://wiki.apache.org/solr/QueryElevationComponent")
- };
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
- }
class ElevationComparatorSource extends FieldComparatorSource {
private QueryElevationComponent.ElevationObj elevations;
private SentinelIntSet ordSet; //the key half of the map
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
----------------------------------------------------------------------
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.java
index 123abea..3b6dbaf 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
@@ -905,13 +905,6 @@ public class RealTimeGetComponent extends SearchComponent
return Category.QUERY;
}
- @Override
- public URL[] getDocs() {
- return null;
- }
-
-
-
public void processGetFingeprint(ResponseBuilder rb) throws IOException {
SolrQueryRequest req = rb.req;
SolrParams params = req.getParams();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
index 6ef0ee4..5e551da 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
@@ -103,25 +103,13 @@ public abstract class SearchComponent implements SolrInfoMBean, NamedListInitial
@Override
public abstract String getDescription();
- @Override
- public String getSource() { return null; }
-
- @Override
- public String getVersion() {
- return getClass().getPackage().getSpecificationVersion();
- }
-
+
@Override
public Category getCategory() {
return Category.OTHER;
}
@Override
- public URL[] getDocs() {
- return null; // this can be overridden, but not required
- }
-
- @Override
public NamedList getStatistics() {
return null;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java
index f60ada8..a459216 100644
--- a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java
+++ b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java
@@ -50,14 +50,7 @@ public abstract class HighlightingPluginBase implements SolrInfoMBean
@Override
public abstract String getDescription();
- @Override
- public String getSource() { return null; }
-
- @Override
- public String getVersion() {
- return getClass().getPackage().getSpecificationVersion();
- }
-
+
@Override
public Category getCategory()
{
@@ -65,11 +58,6 @@ public abstract class HighlightingPluginBase implements SolrInfoMBean
}
@Override
- public URL[] getDocs() {
- return null; // this can be overridden, but not required
- }
-
- @Override
public NamedList getStatistics() {
NamedList<Long> lst = new SimpleOrderedMap<>();
lst.add("requests", numRequests);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
index 9c4b892..39082ad 100644
--- a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
@@ -215,12 +215,6 @@ public class FastLRUCache<K, V> extends SolrCacheBase implements SolrCache<K,V>
}
@Override
- public String getSource() {
- return null;
- }
-
-
- @Override
public NamedList getStatistics() {
NamedList<Serializable> lst = new SimpleOrderedMap<>();
if (cache == null) return lst;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/search/LFUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/LFUCache.java b/solr/core/src/java/org/apache/solr/search/LFUCache.java
index 2b593c6..193134a 100644
--- a/solr/core/src/java/org/apache/solr/search/LFUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/LFUCache.java
@@ -212,11 +212,6 @@ public class LFUCache<K, V> implements SolrCache<K, V> {
}
@Override
- public String getVersion() {
- return SolrCore.version;
- }
-
- @Override
public String getDescription() {
return description;
}
@@ -226,16 +221,6 @@ public class LFUCache<K, V> implements SolrCache<K, V> {
return Category.CACHE;
}
- @Override
- public String getSource() {
- return null;
- }
-
- @Override
- public URL[] getDocs() {
- return null;
- }
-
// returns a ratio, not a percent.
private static String calcHitRatio(long lookups, long hits) {
if (lookups == 0) return "0.00";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/search/LRUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/LRUCache.java b/solr/core/src/java/org/apache/solr/search/LRUCache.java
index b178fb2..db07659 100644
--- a/solr/core/src/java/org/apache/solr/search/LRUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/LRUCache.java
@@ -319,11 +319,6 @@ public class LRUCache<K,V> extends SolrCacheBase implements SolrCache<K,V>, Acco
}
@Override
- public String getSource() {
- return null;
- }
-
- @Override
public NamedList getStatistics() {
NamedList lst = new SimpleOrderedMap();
synchronized (map) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
index 34089d2..b5f3662 100644
--- a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
@@ -99,11 +99,6 @@ public abstract class QParserPlugin implements NamedListInitializedPlugin, SolrI
}
@Override
- public String getVersion() {
- return null;
- }
-
- @Override
public String getDescription() {
return ""; // UI required non-null to work
}
@@ -114,16 +109,6 @@ public abstract class QParserPlugin implements NamedListInitializedPlugin, SolrI
}
@Override
- public String getSource() {
- return null;
- }
-
- @Override
- public URL[] getDocs() {
- return new URL[0];
- }
-
- @Override
public NamedList getStatistics() {
return null;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
index 642b708..45f408c 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
@@ -36,20 +36,12 @@ public class SolrFieldCacheMBean implements JmxAugmentedSolrInfoMBean {
@Override
public String getName() { return this.getClass().getName(); }
@Override
- public String getVersion() { return SolrCore.version; }
- @Override
public String getDescription() {
return "Provides introspection of the Solr FieldCache ";
}
@Override
public Category getCategory() { return Category.CACHE; }
@Override
- public String getSource() { return null; }
- @Override
- public URL[] getDocs() {
- return null;
- }
- @Override
public NamedList getStatistics() {
return getStats(!disableEntryList);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index a7ee433..f357f07 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -2596,11 +2596,6 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
}
@Override
- public String getVersion() {
- return SolrCore.version;
- }
-
- @Override
public String getDescription() {
return "index searcher";
}
@@ -2611,16 +2606,6 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
}
@Override
- public String getSource() {
- return null;
- }
-
- @Override
- public URL[] getDocs() {
- return null;
- }
-
- @Override
public NamedList<Object> getStatistics() {
final NamedList<Object> lst = new SimpleOrderedMap<>();
lst.add("searcherName", name);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
index 87aaa8f..5cda4cb 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
@@ -295,12 +295,6 @@ public class FacetModule extends SearchComponent {
public Category getCategory() {
return Category.QUERY;
}
-
- @Override
- public String getSource() {
- return null;
- }
-
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java b/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java
index d3e3497..abea550 100644
--- a/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java
+++ b/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java
@@ -116,14 +116,4 @@ public class Metrics extends SolrCacheBase implements SolrInfoMBean {
public String getDescription() {
return "Provides metrics for the HdfsDirectoryFactory BlockCache.";
}
-
- @Override
- public String getSource() {
- return null;
- }
-
- @Override
- public URL[] getDocs() {
- return null;
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java
index ba7c7fd..dd98a17 100644
--- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java
+++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java
@@ -67,11 +67,6 @@ public class HdfsLocalityReporter implements SolrInfoMBean {
}
@Override
- public String getVersion() {
- return getClass().getPackage().getSpecificationVersion();
- }
-
- @Override
public String getDescription() {
return "Provides metrics for HDFS data locality.";
}
@@ -81,16 +76,6 @@ public class HdfsLocalityReporter implements SolrInfoMBean {
return Category.OTHER;
}
- @Override
- public String getSource() {
- return null;
- }
-
- @Override
- public URL[] getDocs() {
- return null;
- }
-
/**
* Provide statistics on HDFS block locality, both in terms of bytes and block counts.
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
index fdc9d22..7c78fcf 100644
--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
@@ -960,26 +960,11 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState
}
@Override
- public String getVersion() {
- return SolrCore.version;
- }
-
- @Override
public String getDescription() {
return "Update handler that efficiently directly updates the on-disk main lucene index";
}
@Override
- public String getSource() {
- return null;
- }
-
- @Override
- public URL[] getDocs() {
- return null;
- }
-
- @Override
public NamedList getStatistics() {
NamedList lst = new SimpleOrderedMap();
lst.add("commits", commitCommands.getCount());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index 9d4eb7d..ce0aeff 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -104,11 +104,6 @@ public class UpdateShardHandler implements SolrMetricProducer, SolrInfoMBean {
}
@Override
- public String getVersion() {
- return getClass().getPackage().getSpecificationVersion();
- }
-
- @Override
public void initializeMetrics(SolrMetricManager manager, String registry, String scope) {
String expandedScope = SolrMetricManager.mkName(scope, getCategory().name());
clientConnectionManager.initializeMetrics(manager, registry, expandedScope);
@@ -132,16 +127,6 @@ public class UpdateShardHandler implements SolrMetricProducer, SolrInfoMBean {
}
@Override
- public String getSource() {
- return null;
- }
-
- @Override
- public URL[] getDocs() {
- return new URL[0];
- }
-
- @Override
public NamedList getStatistics() {
return null;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index f4a14db..2bd93cd 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -378,8 +378,6 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
@Override
public String getDescription() { return tmp; }
@Override
- public String getSource() { return tmp; }
- @Override
public void handleRequestBody
( SolrQueryRequest req, SolrQueryResponse rsp ) {
throw new RuntimeException(tmp);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
index bfe2316..d1fec0f 100644
--- a/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
+++ b/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
@@ -70,7 +70,6 @@ public class SolrInfoMBeanTest extends SolrTestCaseJ4
assertNotNull( info.toString() );
// increase code coverage...
- assertNotNull( info.getDocs() + "" );
assertNotNull( info.getStatistics()+"" );
checked++;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java b/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java
index e0d566c..66a91dd 100644
--- a/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java
+++ b/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java
@@ -37,22 +37,6 @@ class MockInfoMBean implements SolrInfoMBean {
}
@Override
- public URL[] getDocs() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String getVersion() {
- return "mock";
- }
-
- @Override
- public String getSource() {
- return "mock";
- }
-
- @Override
@SuppressWarnings("unchecked")
public NamedList getStatistics() {
NamedList myList = new NamedList<Integer>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java b/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java
index 7c4e663..d268a4e 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java
@@ -63,11 +63,6 @@ public class ResourceSharingTestComponent extends SearchComponent implements Sol
return "ResourceSharingTestComponent";
}
- @Override
- public String getSource() {
- return null;
- }
-
@SuppressWarnings("unchecked")
TestObject getTestObj() {
return this.blob.get();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d913328/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java b/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java
index 1539dfd..874b21a 100644
--- a/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java
+++ b/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java
@@ -46,10 +46,4 @@ public class MockSearchComponent extends SearchComponent {
public String getDescription() {
return "Mock search component for tests";
}
-
- @Override
- public String getSource() {
- return "";
- }
-
}