You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2015/05/24 02:16:45 UTC

svn commit: r1681407 - in /uima/uimafit/trunk/uimafit-core/src: main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java

Author: rec
Date: Sun May 24 00:16:45 2015
New Revision: 1681407

URL: http://svn.apache.org/r1681407
Log:
[UIMA-4425] Nested resources not working with SharedResourceObject
- Wrongly recorded host resources instead of nested resource.

Modified:
    uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
    uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java

Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java?rev=1681407&r1=1681406&r2=1681407&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java Sun May 24 00:16:45 2015
@@ -1030,7 +1030,7 @@ public final class ExternalResourceFacto
     // For the current resource, add resource and binding
     ExternalResourceBinding extResBind = createExternalResourceBinding(aBindTo, aNestedRes);
     bindings.put(extResBind.getKey(), extResBind);
-    resources.put(aRes.getName(), aRes);
+    resources.put(aNestedRes.getName(), aNestedRes);
 
     // Handle nested resources
     bindNestedResources(aRes, bindings, resources);

Modified: uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java?rev=1681407&r1=1681406&r2=1681407&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java Sun May 24 00:16:45 2015
@@ -297,6 +297,31 @@ public class AnalysisEngineFactoryExtern
   }
 
   /**
+   * Test simple nesting.
+   */
+  @Test
+  public void sharedObject_testSimpleNestingViaBind() throws Exception {
+    ExternalResourceDescription res2 = createExternalResourceDescription(
+            TestSharedResourceObject.class, "http://dumm.my", 
+            TestSharedResourceObject.PARAM_VALUE, TestSharedResourceObject.EXPECTED_VALUE);
+
+    ExternalResourceDescription res1 = createExternalResourceDescription(
+            TestSharedResourceObject2.class, "http://dumm.my",
+            TestSharedResourceObject2.PARAM_VALUE, TestSharedResourceObject2.EXPECTED_VALUE);
+
+    bindExternalResource(res1, TestSharedResourceObject2.PARAM_RESOURCE, res2);
+    
+    AnalysisEngineDescription aeDesc =createEngineDescription(
+            TestAnalysisEngineWithSharedResourceObject.class,
+            TestAnalysisEngineWithSharedResourceObject.PARAM_RESOURCE, res1);
+
+    aeDesc = saveLoad(aeDesc);
+
+    AnalysisEngine ae = createEngine(aeDesc);
+    ae.process(ae.newCAS());
+  }
+  
+  /**
    * Test self-injection
    */
   @Test