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 2020/10/15 17:11:34 UTC
[uima-uimafit] branch UIMA-6275-Fix-JavaDoc-v2 updated: [UIMA-6275]
InitializableFactory is not smart enough to find a suitable classloader
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch UIMA-6275-Fix-JavaDoc-v2
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
The following commit(s) were added to refs/heads/UIMA-6275-Fix-JavaDoc-v2 by this push:
new 4edd4c8 [UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader
4edd4c8 is described below
commit 4edd4c8c63ff72c3356fc1be5db0f8d9f25240e4
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Oct 15 19:11:25 2020 +0200
[UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader
- Fix capitalization in class name
---
.../src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java | 6 +++---
.../java/org/apache/uima/fit/factory/TypePrioritiesFactory.java | 6 +++---
.../org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java | 6 +++---
.../apache/uima/fit/factory/initializable/InitializableFactory.java | 6 +++---
.../fit/internal/{ClassloaderUtils.java => ClassLoaderUtils.java} | 6 +++---
.../java/org/apache/uima/fit/internal/ResourceManagerFactory.java | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java b/uimafit-core/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java
index a210ef7..33c717b 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java
@@ -31,7 +31,7 @@ import java.util.WeakHashMap;
import org.apache.commons.logging.LogFactory;
import org.apache.uima.fit.descriptor.FsIndex;
import org.apache.uima.fit.descriptor.FsIndexKey;
-import org.apache.uima.fit.internal.ClassloaderUtils;
+import org.apache.uima.fit.internal.ClassLoaderUtils;
import org.apache.uima.fit.internal.MetaDataType;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.FsIndexCollection;
@@ -259,7 +259,7 @@ public final class FsIndexFactory {
* if the index collection could not be assembled
*/
public static FsIndexCollection createFsIndexCollection() throws ResourceInitializationException {
- ClassLoader cl = ClassloaderUtils.findClassloader();
+ ClassLoader cl = ClassLoaderUtils.findClassloader();
FsIndexCollection aggFsIdxCol = fsIndexCollectionsByClassloader.get(cl);
if (aggFsIdxCol == null) {
synchronized (CREATE_LOCK) {
@@ -299,7 +299,7 @@ public final class FsIndexFactory {
*/
public static String[] scanIndexDescriptors() throws ResourceInitializationException {
synchronized (SCAN_LOCK) {
- ClassLoader cl = ClassloaderUtils.findClassloader();
+ ClassLoader cl = ClassLoaderUtils.findClassloader();
String[] indexLocations = fsIndexLocationsByClassloader.get(cl);
if (indexLocations == null) {
indexLocations = scanDescriptors(MetaDataType.FS_INDEX);
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java b/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java
index c79abaa..e01eb3d 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.WeakHashMap;
import org.apache.commons.logging.LogFactory;
-import org.apache.uima.fit.internal.ClassloaderUtils;
+import org.apache.uima.fit.internal.ClassLoaderUtils;
import org.apache.uima.fit.internal.MetaDataType;
import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.resource.ResourceInitializationException;
@@ -105,7 +105,7 @@ public final class TypePrioritiesFactory {
* if the collected type priorities cannot be merged.
*/
public static TypePriorities createTypePriorities() throws ResourceInitializationException {
- ClassLoader cl = ClassloaderUtils.findClassloader();
+ ClassLoader cl = ClassLoaderUtils.findClassloader();
TypePriorities aggTypePriorities = typePrioritiesByClassloader.get(cl);
if (aggTypePriorities == null) {
synchronized (CREATE_LOCK) {
@@ -146,7 +146,7 @@ public final class TypePrioritiesFactory {
*/
public static String[] scanTypePrioritiesDescriptors() throws ResourceInitializationException {
synchronized (SCAN_LOCK) {
- ClassLoader cl = ClassloaderUtils.findClassloader();
+ ClassLoader cl = ClassLoaderUtils.findClassloader();
String[] typePrioritesLocations = typePrioritesLocationsByClassloader.get(cl);
if (typePrioritesLocations == null) {
typePrioritesLocations = scanDescriptors(MetaDataType.TYPE_PRIORITIES);
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java b/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
index dd2a246..e3b2d99 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.WeakHashMap;
import org.apache.commons.logging.LogFactory;
-import org.apache.uima.fit.internal.ClassloaderUtils;
+import org.apache.uima.fit.internal.ClassLoaderUtils;
import org.apache.uima.fit.internal.MetaDataType;
import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.resource.ResourceInitializationException;
@@ -110,7 +110,7 @@ public final class TypeSystemDescriptionFactory {
*/
public static TypeSystemDescription createTypeSystemDescription()
throws ResourceInitializationException {
- ClassLoader cl = ClassloaderUtils.findClassloader();
+ ClassLoader cl = ClassLoaderUtils.findClassloader();
TypeSystemDescription tsd = typeDescriptorByClassloader.get(cl);
if (tsd == null) {
synchronized (CREATE_LOCK) {
@@ -148,7 +148,7 @@ public final class TypeSystemDescriptionFactory {
*/
public static String[] scanTypeDescriptors() throws ResourceInitializationException {
synchronized (SCAN_LOCK) {
- ClassLoader cl = ClassloaderUtils.findClassloader();
+ ClassLoader cl = ClassLoaderUtils.findClassloader();
String[] typeDescriptorLocations = typeDescriptorLocationsByClassloader.get(cl);
if (typeDescriptorLocations == null) {
typeDescriptorLocations = scanDescriptors(MetaDataType.TYPE_SYSTEM);
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/factory/initializable/InitializableFactory.java b/uimafit-core/src/main/java/org/apache/uima/fit/factory/initializable/InitializableFactory.java
index 906538a..535782d 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/factory/initializable/InitializableFactory.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/factory/initializable/InitializableFactory.java
@@ -19,7 +19,7 @@
package org.apache.uima.fit.factory.initializable;
import org.apache.uima.UimaContext;
-import org.apache.uima.fit.internal.ClassloaderUtils;
+import org.apache.uima.fit.internal.ClassLoaderUtils;
import org.apache.uima.resource.ResourceInitializationException;
/**
@@ -53,7 +53,7 @@ public final class InitializableFactory {
throws ResourceInitializationException {
Class<? extends T> cls;
try {
- ClassLoader cl = ClassloaderUtils.findClassloader(context);
+ ClassLoader cl = ClassLoaderUtils.findClassloader(context);
cls = Class.forName(className, true, cl).asSubclass(superClass);
} catch (Exception e) {
throw new ResourceInitializationException(new IllegalStateException("classname = "
@@ -76,7 +76,7 @@ public final class InitializableFactory {
public static <T> Class<? extends T> getClass(String className, Class<T> superClass)
throws ResourceInitializationException {
try {
- ClassLoader cl = ClassloaderUtils.findClassloader();
+ ClassLoader cl = ClassLoaderUtils.findClassloader();
return Class.forName(className, true, cl).asSubclass(superClass);
} catch (Exception e) {
throw new ResourceInitializationException(new IllegalStateException("classname = "
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/internal/ClassloaderUtils.java b/uimafit-core/src/main/java/org/apache/uima/fit/internal/ClassLoaderUtils.java
similarity index 96%
rename from uimafit-core/src/main/java/org/apache/uima/fit/internal/ClassloaderUtils.java
rename to uimafit-core/src/main/java/org/apache/uima/fit/internal/ClassLoaderUtils.java
index f8afae2..f498264 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/internal/ClassloaderUtils.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/internal/ClassLoaderUtils.java
@@ -27,8 +27,8 @@ import org.springframework.util.ClassUtils;
/**
* INTERNAL API - Helper functions to obtain a suitable classloader.
*/
-public final class ClassloaderUtils {
- private ClassloaderUtils() {
+public final class ClassLoaderUtils {
+ private ClassLoaderUtils() {
// No instances
}
@@ -55,7 +55,7 @@ public final class ClassloaderUtils {
return contextClassLoader;
}
- ClassLoader uimaFITClassLoader = ClassloaderUtils.class.getClassLoader();
+ ClassLoader uimaFITClassLoader = ClassLoaderUtils.class.getClassLoader();
if (uimaFITClassLoader != null) {
return uimaFITClassLoader;
}
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/internal/ResourceManagerFactory.java b/uimafit-core/src/main/java/org/apache/uima/fit/internal/ResourceManagerFactory.java
index e3e40b1..b62dc86 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/internal/ResourceManagerFactory.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/internal/ResourceManagerFactory.java
@@ -102,7 +102,7 @@ public class ResourceManagerFactory {
(maj == 2 && (min < 10 || (min == 10 && rev < 3))) || // version < 2.10.3
(maj == 3 && ((min == 0 && rev < 1))); // version < 3.0.1
if (uimaCoreIgnoresContextClassloader) {
- resMgr.setExtensionClassPath(ClassloaderUtils.findClassloader(), "", true);
+ resMgr.setExtensionClassPath(ClassLoaderUtils.findClassloader(), "", true);
}
return resMgr;