svn commit: r1723013 - /lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java

[us...@apache.org]

Author: uschindler
Date: Tue Jan  5 08:12:21 2016
New Revision: 1723013

URL: http://svn.apache.org/viewvc?rev=1723013&view=rev
Log:
LUCENE-6961: Add exception message; make method private

Modified:
    lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java

Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java?rev=1723013&r1=1723012&r2=1723013&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java Tue Jan  5 08:12:21 2016
@@ -112,7 +112,7 @@ final class AnalysisSPILoader<S extends
   
   public S newInstance(String name, Map<String,String> args) {
     final Class<? extends S> service = lookupClass(name);
-    return newFactoryInstance(service, args);
+    return newFactoryClassInstance(service, args);
   }
   
   public Class<? extends S> lookupClass(String name) {
@@ -130,7 +130,7 @@ final class AnalysisSPILoader<S extends
     return services.keySet();
   }  
   
-  public static <T extends AbstractAnalysisFactory> T newFactoryInstance(Class<T> clazz, Map<String,String> args) {
+  private static <T extends AbstractAnalysisFactory> T newFactoryClassInstance(Class<T> clazz, Map<String,String> args) {
     try {
       return clazz.getConstructor(Map.class).newInstance(args);
     } catch (InvocationTargetException ite) {
@@ -141,7 +141,7 @@ final class AnalysisSPILoader<S extends
       if (cause instanceof Error) {
         throw (Error) cause;
       }
-      throw new RuntimeException(cause);
+      throw new RuntimeException("Unexpected checked exception while calling constructor of "+clazz.getName(), cause);
     } catch (ReflectiveOperationException e) {
       throw new UnsupportedOperationException("Factory "+clazz.getName()+" cannot be instantiated. This is likely due to missing Map<String,String> constructor.", e);
     }