lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cpoersc...@apache.org
Subject lucene-solr:master: SOLR-12395: Remove SignificantTermsQParserPlugin's deprecated old name ('sigificantTerms') in favour of new 'significantTerms' name
Date Wed, 04 Jul 2018 13:14:57 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 799d2acd8 -> 7b2a2d989


SOLR-12395: Remove SignificantTermsQParserPlugin's deprecated old name ('sigificantTerms')
in favour of new 'significantTerms' name


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7b2a2d98
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7b2a2d98
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7b2a2d98

Branch: refs/heads/master
Commit: 7b2a2d989c544a9a08fcd522b026fc85fc02b789
Parents: 799d2ac
Author: Christine Poerschke <cpoerschke@apache.org>
Authored: Wed Jul 4 12:02:01 2018 +0100
Committer: Christine Poerschke <cpoerschke@apache.org>
Committed: Wed Jul 4 14:13:56 2018 +0100

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/search/QParserPlugin.java    | 1 -
 .../org/apache/solr/search/SignificantTermsQParserPlugin.java   | 3 ---
 .../core/src/test/org/apache/solr/search/QueryEqualityTest.java | 4 ----
 .../apache/solr/search/SignificantTermsQParserPluginTest.java   | 5 -----
 .../src/test/org/apache/solr/search/TestStandardQParsers.java   | 5 -----
 5 files changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7b2a2d98/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 e9aa255..b20c3c8 100644
--- a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
@@ -80,7 +80,6 @@ public abstract class QParserPlugin implements NamedListInitializedPlugin,
SolrI
     map.put(GraphTermsQParserPlugin.NAME, new GraphTermsQParserPlugin());
     map.put(IGainTermsQParserPlugin.NAME, new IGainTermsQParserPlugin());
     map.put(TextLogisticRegressionQParserPlugin.NAME, new TextLogisticRegressionQParserPlugin());
-    map.put(SignificantTermsQParserPlugin.OLD_NAME, new SignificantTermsQParserPlugin());
// for Solr 7.x backcompat only
     map.put(SignificantTermsQParserPlugin.NAME, new SignificantTermsQParserPlugin());
     map.put(PayloadScoreQParserPlugin.NAME, new PayloadScoreQParserPlugin());
     map.put(PayloadCheckQParserPlugin.NAME, new PayloadCheckQParserPlugin());

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7b2a2d98/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
index 7be5dad..93500a0 100644
--- a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
@@ -39,9 +39,6 @@ import org.apache.solr.request.SolrQueryRequest;
 
 public class SignificantTermsQParserPlugin extends QParserPlugin {
 
-  @Deprecated
-  public static final String OLD_NAME = "sigificantTerms";
-
   public static final String NAME = "significantTerms";
 
   @Override

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7b2a2d98/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
index d27695f..d39a42f 100644
--- a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
+++ b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
@@ -190,10 +190,6 @@ public class QueryEqualityTest extends SolrTestCaseJ4 {
   public void testSignificantTermsQuery() throws Exception {
     SolrQueryRequest req = req("q", "*:*");
     try {
-      // for Solr 7.x backcompat only
-      assertQueryEquals(SignificantTermsQParserPlugin.OLD_NAME,
-          req, "{!"+SignificantTermsQParserPlugin.OLD_NAME+"}");
-
       assertQueryEquals(SignificantTermsQParserPlugin.NAME,
           req, "{!"+SignificantTermsQParserPlugin.NAME+"}");
     } finally {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7b2a2d98/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
index a951c05..4a68dc5 100644
--- a/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
+++ b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java
@@ -28,11 +28,6 @@ public class SignificantTermsQParserPluginTest extends LuceneTestCase {
    */
   @Test
   public void testQParserBackwardsCompatibility() {
-    // for Solr 7.x backcompat only
-    assertEquals("sigificantTerms", SignificantTermsQParserPlugin.OLD_NAME);
-    assertEquals(SignificantTermsQParserPlugin.class,
-        QParserPlugin.standardPlugins.get(SignificantTermsQParserPlugin.OLD_NAME).getClass());
-
     assertEquals("significantTerms", SignificantTermsQParserPlugin.NAME);
     assertEquals(SignificantTermsQParserPlugin.class,
         QParserPlugin.standardPlugins.get(SignificantTermsQParserPlugin.NAME).getClass());

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7b2a2d98/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java b/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
index 4b79dd9..cab9026 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
@@ -66,11 +66,6 @@ public class TestStandardQParsers extends LuceneTestCase {
       }
     }
 
-    // for Solr 7.x backcompat only
-    mismatch.remove(SignificantTermsQParserPlugin.OLD_NAME
-        + " != " + SignificantTermsQParserPlugin.NAME
-        + "(" + SignificantTermsQParserPlugin.class.getName() + ")");
-
     assertTrue("All standard QParsers must have final NAME, broken: " + notFinal, 
                notFinal.isEmpty());
     assertTrue("All standard QParsers must have static NAME, broken: " + notStatic, 


Mime
View raw message