svn commit: r1663701 - in /lucene/dev/trunk/solr/core/src: java/org/apache/solr/core/SolrResourceLoader.java test/org/apache/solr/core/ResourceLoaderTest.java

[no...@apache.org]

Author: noble
Date: Tue Mar  3 13:24:49 2015
New Revision: 1663701

URL: http://svn.apache.org/r1663701
Log:
SolrResourceLoader.assertAwareCompatibility() could be static

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1663701&r1=1663700&r2=1663701&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Tue Mar  3 13:24:49 2015
@@ -763,7 +763,7 @@ public class SolrResourceLoader implemen
   /**
    * Utility function to throw an exception if the class is invalid
    */
-  void assertAwareCompatibility( Class aware, Object obj )
+  static void assertAwareCompatibility( Class aware, Object obj )
   {
     Class[] valid = awareCompatibility.get( aware );
     if( valid == null ) {

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java?rev=1663701&r1=1663700&r2=1663701&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java Tue Mar  3 13:24:49 2015
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.TokenS
 import org.apache.lucene.analysis.core.KeywordTokenizerFactory;
 import org.apache.lucene.analysis.ngram.NGramFilterFactory;
 import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.handler.admin.LukeRequestHandler;
@@ -46,6 +45,8 @@ import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
+import static org.apache.solr.core.SolrResourceLoader.assertAwareCompatibility;
+
 public class ResourceLoaderTest extends SolrTestCaseJ4 
 {
   public void testInstanceDir() throws Exception {
@@ -87,8 +88,8 @@ public class ResourceLoaderTest extends
     
     Class<?> clazz = ResourceLoaderAware.class;
     // Check ResourceLoaderAware valid objects
-    loader.assertAwareCompatibility( clazz, new NGramFilterFactory(new HashMap<String,String>()) );
-    loader.assertAwareCompatibility( clazz, new KeywordTokenizerFactory(new HashMap<String,String>()) );
+    assertAwareCompatibility(clazz, new NGramFilterFactory(new HashMap<>()));
+    assertAwareCompatibility(clazz, new KeywordTokenizerFactory(new HashMap<>()));
     
     // Make sure it throws an error for invalid objects
     Object[] invalid = new Object[] {
@@ -99,7 +100,7 @@ public class ResourceLoaderTest extends
     };
     for( Object obj : invalid ) {
       try {
-        loader.assertAwareCompatibility( clazz, obj );
+        assertAwareCompatibility(clazz, obj);
         Assert.fail( "Should be invalid class: "+obj + " FOR " + clazz );
       }
       catch( SolrException ex ) { } // OK
@@ -108,19 +109,19 @@ public class ResourceLoaderTest extends
 
     clazz = SolrCoreAware.class;
     // Check ResourceLoaderAware valid objects
-    loader.assertAwareCompatibility( clazz, new LukeRequestHandler() );
-    loader.assertAwareCompatibility( clazz, new FacetComponent() );
-    loader.assertAwareCompatibility( clazz, new JSONResponseWriter() );
+    assertAwareCompatibility(clazz, new LukeRequestHandler());
+    assertAwareCompatibility(clazz, new FacetComponent());
+    assertAwareCompatibility(clazz, new JSONResponseWriter());
     
     // Make sure it throws an error for invalid objects
     invalid = new Object[] {
-        new NGramFilterFactory(new HashMap<String,String>()),
+        new NGramFilterFactory(new HashMap<>()),
         "hello",  new Float( 12.3f ),
-        new KeywordTokenizerFactory(new HashMap<String,String>())
+        new KeywordTokenizerFactory(new HashMap<>())
     };
     for( Object obj : invalid ) {
       try {
-        loader.assertAwareCompatibility( clazz, obj );
+        assertAwareCompatibility(clazz, obj);
         Assert.fail( "Should be invalid class: "+obj + " FOR " + clazz );
       }
       catch( SolrException ex ) { } // OK