svn commit: r1766257 - /uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java

[re...@apache.org]

Author: rec
Date: Sun Oct 23 09:24:21 2016
New Revision: 1766257

URL: http://svn.apache.org/viewvc?rev=1766257&view=rev
Log:
[UIMA-2903] List resources in a ResourceManager / remove hack in uimaFIT
- Switch from looking up external resources through reflection to using the new getExternalResources()

Modified:
    uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java

Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java?rev=1766257&r1=1766256&r2=1766257&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java Sun Oct 23 09:24:21 2016
@@ -43,7 +43,6 @@ import org.springframework.beans.SimpleT
 
 /**
  * Configurator class for {@link ExternalResource} annotations.
- * 
  */
 public final class ExternalResourceInitializer {
 
@@ -226,28 +225,7 @@ public final class ExternalResourceIniti
       throw new IllegalStateException("Unsupported resource manager implementation ["
               + resMgr.getClass() + "]");
     }
-
-    Field resourceMapField = null;
-    try {
-      // Fetch the list of resources
-      resourceMapField = ReflectionUtil.getField(resMgr, "mResourceMap");
-      resourceMapField.setAccessible(true);
-      @SuppressWarnings("unchecked")
-      Map<String, Object> resources = (Map<String, Object>) resourceMapField.get(resMgr);
-
-      return resources.values();
-    } catch (SecurityException e) {
-      throw new ResourceInitializationException(e);
-    } catch (NoSuchFieldException e) {
-      throw new ResourceInitializationException(e);
-    } catch (IllegalArgumentException e) {
-      throw new ResourceInitializationException(e);
-    } catch (IllegalAccessException e) {
-      throw new ResourceInitializationException(e);
-    } finally {
-      if (resourceMapField != null) {
-        resourceMapField.setAccessible(false);
-      }
-    }
+    
+    return resMgr.getExternalResources();
   }
 }