You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/09/27 15:48:27 UTC
svn commit: r1526900 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ uima-d...
Author: burn
Date: Fri Sep 27 13:48:26 2013
New Revision: 1526900
URL: http://svn.apache.org/r1526900
Log:
UIMA-3311 Log the name of invalid overrides & include the cause in the exception
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasGenerator.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ExceptionHelper.java
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasSource.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasGenerator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasGenerator.java?rev=1526900&r1=1526899&r2=1526900&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasGenerator.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasGenerator.java Fri Sep 27 13:48:26 2013
@@ -98,6 +98,10 @@ public class CasGenerator {
String message = "config param name:"+name+" "+"value:"+value;
mh.frameworkDebug(cid, mid, message);
ConfigurationParameter configurationParameter = UimaUtils.findConfigurationParameter(configurationParameterDeclarations, name);
+ if (configurationParameter == null) {
+ throw new ResourceConfigurationException(
+ ResourceConfigurationException.NONEXISTENT_PARAMETER, new Object[] { name, "CollectionReader" });
+ }
Object object = UimaUtils.getOverrideValueObject(configurationParameter, value);
cps.setParameterValue(name, object);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java?rev=1526900&r1=1526899&r2=1526900&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java Fri Sep 27 13:48:26 2013
@@ -374,27 +374,19 @@ public class UimaUtils {
}
public static Object getOverrideValueObject(ConfigurationParameter configurationParameter, String value) throws ResourceConfigurationException {
- Object retVal = value;
- if (configurationParameter != null) {
- try {
- if (configurationParameter.getType().equals("Integer")) {
- retVal = Integer.parseInt(value);
- }
- else if (configurationParameter.getType().equals("Boolean")) {
- retVal = Boolean.parseBoolean(value);
- }
- else if (configurationParameter.getType().equals("Float")) {
- retVal = Float.parseFloat(value);
- }
- }
- catch(Throwable t) {
- throw new ResourceConfigurationException(t);
- }
- }
- else {
- throw new ResourceConfigurationException();
- }
- return retVal;
+ Object retVal = value;
+ try {
+ if (configurationParameter.getType().equals("Integer")) {
+ retVal = Integer.parseInt(value);
+ } else if (configurationParameter.getType().equals("Boolean")) {
+ retVal = Boolean.parseBoolean(value);
+ } else if (configurationParameter.getType().equals("Float")) {
+ retVal = Float.parseFloat(value);
+ }
+ } catch (Throwable t) {
+ throw new ResourceConfigurationException(t);
+ }
+ return retVal;
}
private static void addOverrides(List<List<String>> overrides,
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ExceptionHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ExceptionHelper.java?rev=1526900&r1=1526899&r2=1526900&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ExceptionHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ExceptionHelper.java Fri Sep 27 13:48:26 2013
@@ -37,6 +37,10 @@ public class ExceptionHelper {
sb.append(":");
sb.append(ste.getLineNumber());
sb.append(")");
+ if (e.getCause() != null) {
+ sb.append(" cause: ");
+ sb.append(e.getCause());
+ }
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasSource.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasSource.java?rev=1526900&r1=1526899&r2=1526900&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasSource.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasSource.java Fri Sep 27 13:48:26 2013
@@ -114,6 +114,10 @@ public class CasSource {
String value = ent.getValue();
duccOut.debug(location, job.getDuccId(), "config param name:"+name+" "+"value:"+value);
ConfigurationParameter configurationParameter = UimaUtils.findConfigurationParameter(configurationParameterDeclarations, name);
+ if (configurationParameter == null) {
+ throw new ResourceConfigurationException(
+ ResourceConfigurationException.NONEXISTENT_PARAMETER, new Object[] { name, "CollectionReader" });
+ }
Object object = UimaUtils.getOverrideValueObject(configurationParameter, value);
cps.setParameterValue(name, object);
}