[uima-uimafit] 02/02: Merge branch 'master-v2' into sync-v2-to-master

[rec]

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch sync-v2-to-master
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git

commit f071cc480da1f8be8d8eb6f332882c1488fb88ac
Merge: 1b317de 36de13c
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Fri Feb 7 14:51:31 2020 +0100

    Merge branch 'master-v2' into sync-v2-to-master
    
    * master-v2:
      [UIMA-6186] Factory methods for resource instances
      [UIMA-6186] Factory methods for resource instances

 .../java/org/apache/uima/fit/factory/ExternalResourceFactory.java   | 6 +++---
 .../org/apache/uima/fit/factory/ResourceManagerFactoryTest.java     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --cc 
uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
index 6a1dc2b,86869ad..e55aedb
--- 
a/uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
+++ 
b/uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
@@@ -1292,9 -1295,9 +1292,9 @@@ public final class ExternalResourceFact
     *           if there was a problem instantiating the resource.
     */
    @SuppressWarnings("unchecked")
-   public static <R> R createExternalResource(Class<? extends Resource> 
resourceClass,
+   public static <R extends Resource> R createResource(Class<R> resourceClass,
            ResourceManager resMgr, Object... params) throws 
ResourceInitializationException {
 -    ExternalResourceDescription res = 
createExternalResourceDescription(resourceClass, params);
 +    ExternalResourceDescription res = 
createResourceDescription(resourceClass, params);
      return (R) produceResource(resourceClass, res.getResourceSpecifier(), 
resMgr, emptyMap());
    }