You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2015/11/06 16:45:51 UTC

svn commit: r1712979 - in /lucene/dev/trunk/solr: ./ contrib/clustering/src/test-files/clustering/solr/collection1/conf/ contrib/uima/src/test-files/uima/ contrib/uima/src/test-files/uima/solr/collection1/conf/ core/src/java/org/apache/solr/schema/ cor...

Author: hossman
Date: Fri Nov  6 15:45:50 2015
New Revision: 1712979

URL: http://svn.apache.org/viewvc?rev=1712979&view=rev
Log:
SOLR-8239: Added ClassicSimilarityFactory, marked DefaultSimilarityFactory as deprecated

Added:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java
      - copied unchanged from r1712844, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java
      - copied unchanged from r1712844, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java
Removed:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestDefaultSimilarityFactory.java
Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
    lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
    lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Nov  6 15:45:50 2015
@@ -140,6 +140,12 @@ Jetty 9.2.13.v20150730
 Upgrading from Solr 5.3
 -----------------------
 
+* DefaultSimilarityFactory has been renamed to ClassicSimilarityFactory to mach the underlying rename of
+  DefaultSimilarity to ClassicSimilarity and the (eventual) move away from using it as a default.
+  If you currently have DefaultSimilarityFactory explicitly refrenced in your schema.xml, you will now get
+  a warning urging you to edit your config to use the functionally identical ClassicSimilarityFactory.
+  DefaultSimilarityFactory will be removed completely in Solr 6.  See SOLR-8239 for more details.
+
 * SOLR-7859: The following APIs are now deprecated:
   - SolrCore.getStartTime: Use SolrCore.getStartTimeStamp instead.
   - SolrIndexSearcher.getOpenTime: Use SolrIndexSearcher.getOpenTimeStamp instead.
@@ -443,6 +449,8 @@ Other Changes
 * SOLR-8147: contrib/analytics FieldFacetAccumulator now throws IOException instead of SolrException
   (Scott Stults via Christine Poerschke)
 
+* SOLR-8239: Added ClassicSimilarityFactory, marked DefaultSimilarityFactory as deprecated. (hossman)
+
 ==================  5.3.1 ==================
 
 Bug Fixes

Modified: lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml Fri Nov  6 15:45:50 2015
@@ -332,19 +332,4 @@
    <copyField source="body" dest="text"/>
   <copyField source="snippet" dest="text"/>
 
- <!-- Similarity is the scoring routine for each document vs. a query.
-      A custom similarity may be specified here, but the default is fine
-      for most applications.  -->
- <!-- <similarity class="org.apache.lucene.search.DefaultSimilarity"/> -->
- <!-- ... OR ...
-      Specify a SimilarityFactory class name implementation
-      allowing parameters to be used.
- -->
- <!--
- <similarity class="com.example.solr.CustomSimilarityFactory">
-   <str name="paramkey">param value</str>
- </similarity>
- -->
-
-
 </schema>

Modified: lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml Fri Nov  6 15:45:50 2015
@@ -607,23 +607,4 @@
   -->
   <!-- <copyField source="name" dest="alphaNameSort"/> -->
 
-
-  <!--
-    Similarity is the scoring routine for each document vs. a query. A
-    custom similarity may be specified here, but the default is fine for
-    most applications.
-  -->
-  <!--
-    <similarity class="org.apache.lucene.search.DefaultSimilarity"/>
-  -->
-  <!--
-    ... OR ... Specify a SimilarityFactory class name implementation
-    allowing parameters to be used.
-  -->
-  <!--
-    <similarity class="com.example.solr.CustomSimilarityFactory"> <str
-    name="paramkey">param value</str> </similarity>
-  -->
-
-
 </schema>

Modified: lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml Fri Nov  6 15:45:50 2015
@@ -611,22 +611,4 @@
   <!-- <copyField source="name" dest="alphaNameSort"/> -->
 
 
-  <!--
-    Similarity is the scoring routine for each document vs. a query. A
-    custom similarity may be specified here, but the default is fine for
-    most applications.
-  -->
-  <!--
-    <similarity class="org.apache.lucene.search.DefaultSimilarity"/>
-  -->
-  <!--
-    ... OR ... Specify a SimilarityFactory class name implementation
-    allowing parameters to be used.
-  -->
-  <!--
-    <similarity class="com.example.solr.CustomSimilarityFactory"> <str
-    name="paramkey">param value</str> </similarity>
-  -->
-
-
 </schema>

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Fri Nov  6 15:45:50 2015
@@ -65,7 +65,7 @@ import org.apache.solr.core.SolrResource
 import org.apache.solr.request.LocalSolrQueryRequest;
 import org.apache.solr.response.SchemaXmlWriter;
 import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.search.similarities.DefaultSimilarityFactory;
+import org.apache.solr.search.similarities.ClassicSimilarityFactory;
 import org.apache.solr.util.DOMUtil;
 import org.apache.solr.util.plugin.SolrCoreAware;
 import org.slf4j.Logger;
@@ -497,7 +497,7 @@ public class IndexSchema {
       Node node = (Node) xpath.evaluate(expression, document, XPathConstants.NODE);
       similarityFactory = readSimilarity(loader, node);
       if (similarityFactory == null) {
-        similarityFactory = new DefaultSimilarityFactory();
+        similarityFactory = new ClassicSimilarityFactory();
         final NamedList similarityParams = new NamedList();
         Version luceneVersion = getDefaultLuceneMatchVersion();
         similarityFactory.init(SolrParams.toSolrParams(similarityParams));

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java Fri Nov  6 15:45:50 2015
@@ -16,50 +16,29 @@ package org.apache.solr.search.similarit
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import org.apache.lucene.search.similarities.ClassicSimilarity;
 import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.search.similarities.TFIDFSimilarity; // javadoc
+
 import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.schema.SimilarityFactory;
 
-/**
- * Factory for {@link ClassicSimilarity}
- * <p>
- * ClassicSimilarity is Lucene's original scoring implementation, based
- * upon the Vector Space Model.
- * <p>
- * Optional settings:
- * <ul>
- *   <li>discountOverlaps (bool): Sets
- *       {@link ClassicSimilarity#setDiscountOverlaps(boolean)}</li>
- * </ul>
- * @see TFIDFSimilarity
- * @lucene.experimental
- */
-public class DefaultSimilarityFactory extends SimilarityFactory {
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-  /** Init param name for specifying the value to use in 
-   * {@link ClassicSimilarity#setDiscountOverlaps(boolean)} 
-   */
-  public static final String DISCOUNT_OVERLAPS = "discountOverlaps";
 
-  /** 
-   * Controls the value of {@link ClassicSimilarity#setDiscountOverlaps(boolean)} 
-   * on newly constructed instances of {@link ClassicSimilarity}
-   */
-  protected boolean discountOverlaps = true;
+/**
+ * @deprecated This class has been renamed to <code>ClassicSimilarityFactory</code> to reflect the renaming of the underlying Similarity returned.
+ *
+ * @see ClassicSimilarityFactory
+ */
+@Deprecated
+public class DefaultSimilarityFactory extends ClassicSimilarityFactory {
+  
+  public static final Logger log = LoggerFactory.getLogger(DefaultSimilarityFactory.class);
 
   @Override
   public void init(SolrParams params) {
     super.init(params);
-    discountOverlaps = params.getBool(DISCOUNT_OVERLAPS, true);
-  }
-
-  @Override
-  public Similarity getSimilarity() {
-    ClassicSimilarity sim = new ClassicSimilarity();
-    sim.setDiscountOverlaps(discountOverlaps);
-    return sim;
+    log.warn("DefaultSimilarityFactory has been renamed and deprecated.  " +
+             "Please update your configuration file to refer to ClassicSimilarityFactory instead");
   }
+  
 }

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java Fri Nov  6 15:45:50 2015
@@ -35,9 +35,9 @@ import org.apache.solr.util.plugin.SolrC
  * <b>NOTE:</b> Users should be aware that in addition to supporting 
  * <code>Similarity</code> configurations specified on individual 
  * field types, this factory also differs in behavior from 
- * {@link DefaultSimilarityFactory} because of other differences in the 
+ * {@link ClassicSimilarityFactory} because of other differences in the 
  * implementations of <code>PerFieldSimilarityWrapper</code> and 
- * <code>DefaultSimilarity</code> - notably in methods such as 
+ * {@link ClassicSimilarity} - notably in methods such as 
  * {@link Similarity#coord} and {@link Similarity#queryNorm}.  
  * </p>
  *

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java Fri Nov  6 15:45:50 2015
@@ -34,7 +34,7 @@ import static org.apache.solr.common.Sol
  * </p>
  * <p>
  * In addition to the <code>discountOverlaps</code> init param supported by 
- * {@link DefaultSimilarityFactory} The following sets of init params are 
+ * {@link ClassicSimilarityFactory} The following sets of init params are 
  * supported by this factory:
  * </p>
  * <ul>
@@ -106,7 +106,7 @@ import static org.apache.solr.common.Sol
  *      <code>SweetSpotSimilarity</code> for SVG diagrams showing how the 
  *      each function behaves with various settings/inputs.
  */
-public class SweetSpotSimilarityFactory extends DefaultSimilarityFactory {
+public class SweetSpotSimilarityFactory extends ClassicSimilarityFactory {
   private SweetSpotSimilarity sim = null;
 
   @Override

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml Fri Nov  6 15:45:50 2015
@@ -459,10 +459,4 @@
   
    <copyField source="*" dest="catchall_t"/>
 
- <!-- Similarity is the scoring routine for each document vs a query.
-      A custom similarity may be specified here, but the default is fine
-      for most applications.
- -->
- <!-- <similarity class="org.apache.lucene.search.similarities.DefaultSimilarity"/> -->
-
 </schema>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml Fri Nov  6 15:45:50 2015
@@ -413,10 +413,4 @@
  
    <copyField source="*_t" dest="text"/>
    
- <!-- Similarity is the scoring routine for each document vs a query.
-      A custom similarity may be specified here, but the default is fine
-      for most applications.
- -->
- <!-- <similarity class="org.apache.lucene.search.similarities.DefaultSimilarity"/> -->
-
 </schema>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml Fri Nov  6 15:45:50 2015
@@ -16,34 +16,46 @@
  limitations under the License.
 -->
 
-<!-- Test schema file for DefaultSimilarityFactory -->
+<!-- Test schema file for ClassicSimilarityFactory specified on a per-fieldtype basis
+     See TestClassicSimilarityFactory
+-->
 
 <schema name="test" version="1.0">
-  <types>
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
-    <!-- TF/IDF -->
-    <fieldType name="text" class="solr.TextField">
-      <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
-      <similarity class="solr.DefaultSimilarityFactory"/>
-    </fieldType>
-
-    <!-- TF/IDF -->
-    <fieldType name="text_overlap" class="solr.TextField">
-      <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
-      <similarity class="solr.DefaultSimilarityFactory">
-        <bool name="discountOverlaps">false</bool>
-      </similarity>
-    </fieldType>
-   
-  </types>
 
-  <fields>
-    <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
-    <field name="text" type="text" indexed="true" stored="false"/>
-    <field name="text_overlap" type="text_overlap" indexed="true" stored="false"/>
-  </fields>
+  <!-- testDefaults -->
+  <field name="text" type="text" indexed="true" stored="false"/>
+  <fieldType name="text" class="solr.TextField">
+    <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+    <similarity class="solr.ClassicSimilarityFactory"/>
+  </fieldType>
+  
+  <!-- testParams -->
+  <field name="text_overlap" type="text_overlap" indexed="true" stored="false"/>
+  <fieldType name="text_overlap" class="solr.TextField">
+    <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+    <similarity class="solr.ClassicSimilarityFactory">
+      <bool name="discountOverlaps">false</bool>
+    </similarity>
+  </fieldType>
+
+  <!-- testDefaultWithDefaults -->
+  <field name="text__default" type="text__default" indexed="true" stored="false"/>
+  <fieldType name="text__default" class="solr.TextField">
+    <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+    <similarity class="solr.DefaultSimilarityFactory"/>
+  </fieldType>
+  
+  <!-- testDefaultWithParams -->
+  <field name="text_overlap__default" type="text_overlap__default" indexed="true" stored="false"/>
+  <fieldType name="text_overlap__default" class="solr.TextField">
+    <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+    <similarity class="solr.DefaultSimilarityFactory">
+      <bool name="discountOverlaps">false</bool>
+    </similarity>
+  </fieldType>
 
+  <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+  <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
   <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
   <similarity class="solr.SchemaSimilarityFactory"/>

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java Fri Nov  6 15:45:50 2015
@@ -24,7 +24,7 @@ public class TestSchemaSimilarityResourc
   public void testGetSchemaSimilarity() throws Exception {
     assertQ("/schema/similarity?indent=on&wt=xml",
             "count(/response/lst[@name='similarity']) = 1",
-            "/response/lst[@name='similarity']/str[@name='class'][.='org.apache.solr.search.similarities.DefaultSimilarityFactory']");
+            "/response/lst[@name='similarity']/str[@name='class'][.='org.apache.solr.search.similarities.ClassicSimilarityFactory']");
   }
 }
 

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java Fri Nov  6 15:45:50 2015
@@ -22,7 +22,7 @@ import org.apache.lucene.util.Version;
 import org.junit.After;
 
 /**
- * Verifies that the default behavior of the implicit {@link DefaultSimilarityFactory} 
+ * Verifies that the default behavior of the implicit {@link ClassicSimilarityFactory} 
  * (ie: no similarity configured in schema.xml at all) is consistnent with 
  * expectations based on the luceneMatchVersion
  * @see <a href="https://issues.apache.org/jira/browse/SOLR-5561">SOLR-5561</a>

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java?rev=1712979&r1=1712978&r2=1712979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java Fri Nov  6 15:45:50 2015
@@ -240,7 +240,7 @@ public class SchemaTest extends RestTest
         new SchemaRequest.GlobalSimilarity();
     SchemaResponse.GlobalSimilarityResponse globalSimilarityResponse = globalSimilarityRequest.process(getSolrClient());
     assertValidSchemaResponse(globalSimilarityResponse);
-    assertEquals("org.apache.solr.search.similarities.DefaultSimilarityFactory",
+    assertEquals("org.apache.solr.search.similarities.ClassicSimilarityFactory",
         globalSimilarityResponse.getSimilarity().get("class"));
   }