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 2013/01/20 23:40:43 UTC
svn commit: r1435991 - in /uima/sandbox/uimafit/trunk:
uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/
uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/
uimafit-legacy-support/src/main/java/org/apache/uima/fit...
Author: rec
Date: Sun Jan 20 22:40:43 2013
New Revision: 1435991
URL: http://svn.apache.org/viewvc?rev=1435991&view=rev
Log:
[UIMA-2587] @ConfigurationParameter - name should default to name of annotated field without class name
https://issues.apache.org/jira/browse/UIMA-2587
- Default name is now only the field name
- Removed ConfigurationParameterFactory.createConfigurationParameterName() method
- Use legacy ConfigurationParameterFactory.createConfigurationParameterName() in test cases in legacy module
- Changed legacy module to generate the old default value when the legacy annotation is used
Added:
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ContextlessAnnotationConverterBase.java (with props)
Modified:
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/AnnotationConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ExternalResourceConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexCollectionConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexKeyConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/NoConversionConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/OperationalPropertiesConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/XWriter.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java
uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java Sun Jan 20 22:40:43 2013
@@ -25,7 +25,6 @@ import org.apache.uima.UimaContext;
import org.apache.uima.collection.CollectionException;
import org.apache.uima.fit.component.JCasCollectionReader_ImplBase;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.pear.util.FileUtil;
import org.apache.uima.resource.ResourceInitializationException;
@@ -43,9 +42,7 @@ import org.apache.uima.util.ProgressImpl
*/
public class LineReader extends JCasCollectionReader_ImplBase {
- public static final String PARAM_INPUT_FILE = ConfigurationParameterFactory
- .createConfigurationParameterName(LineReader.class, "inputFile");
-
+ public static final String PARAM_INPUT_FILE = "inputFile";
@ConfigurationParameter
private File inputFile;
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/AnnotationConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/AnnotationConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/AnnotationConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/AnnotationConverter.java Sun Jan 20 22:40:43 2013
@@ -19,6 +19,7 @@
package org.apache.uima.fit.legacy;
import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
/**
* Annotation converters for legacy uimaFIT annotations to Apache uimaFIT annotations.
@@ -33,8 +34,10 @@ public interface AnnotationConverter<L e
* @param aAnnotation a legacy annotation.
* @return the modern annotation.
*/
- M convert(L aAnnotation);
-
+ M convert(Class<?> aContext, L aAnnotation);
+
+ M convert(AccessibleObject aContext, L aAnnotation);
+
Class<M> getModernType();
Class<L> getLegacyType();
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java Sun Jan 20 22:40:43 2013
@@ -81,7 +81,7 @@ public class LegacySupportPluginImpl imp
L legacyAnnotation = aObject.getAnnotation(converter.getLegacyType());
if (legacyAnnotation != null) {
// If legacy annotation is present, convert it to a modern annotation
- return converter.convert(legacyAnnotation);
+ return converter.convert(aObject, legacyAnnotation);
} else {
return null;
}
@@ -95,7 +95,7 @@ public class LegacySupportPluginImpl imp
L legacyAnnotation = aObject.getAnnotation(converter.getLegacyType());
if (legacyAnnotation != null) {
// If legacy annotation is present, convert it to a modern annotation
- return converter.convert(legacyAnnotation);
+ return converter.convert(aObject, legacyAnnotation);
} else {
return null;
}
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java Sun Jan 20 22:40:43 2013
@@ -18,6 +18,9 @@
*/
package org.apache.uima.fit.legacy.converter;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.legacy.AnnotationConverter;
@@ -29,9 +32,14 @@ public class ConfigurationParameterConve
// Nothing to do
}
- public ConfigurationParameter convert(
- final org.uimafit.descriptor.ConfigurationParameter aAnnotation) {
- return new ConfigurationParameterSubstitute(aAnnotation);
+ public ConfigurationParameter convert(AccessibleObject aContext,
+ org.uimafit.descriptor.ConfigurationParameter aAnnotation) {
+ return new ConfigurationParameterSubstitute(aAnnotation, (Field) aContext);
+ }
+
+ public ConfigurationParameter convert(Class<?> aContext,
+ org.uimafit.descriptor.ConfigurationParameter aAnnotation) {
+ throw new UnsupportedOperationException("Annotation is not permitted on classes");
}
public Class<org.uimafit.descriptor.ConfigurationParameter> getLegacyType() {
@@ -48,12 +56,25 @@ public class ConfigurationParameterConve
private org.uimafit.descriptor.ConfigurationParameter legacyAnnotation;
- public ConfigurationParameterSubstitute(org.uimafit.descriptor.ConfigurationParameter aAnnotation) {
+ private Field field;
+
+ public ConfigurationParameterSubstitute(
+ org.uimafit.descriptor.ConfigurationParameter aAnnotation, Field aField) {
legacyAnnotation = aAnnotation;
+ field = aField;
}
+ /**
+ * Legacy uimaFIT used the class name + field name as default value.
+ */
public String name() {
- return legacyAnnotation.name();
+ if (org.uimafit.descriptor.ConfigurationParameter.USE_FIELD_NAME.equals(legacyAnnotation
+ .name())) {
+ return field.getDeclaringClass().getName() + "." + field.getName();
+
+ } else {
+ return legacyAnnotation.name();
+ }
}
public String description() {
Added: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ContextlessAnnotationConverterBase.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ContextlessAnnotationConverterBase.java?rev=1435991&view=auto
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ContextlessAnnotationConverterBase.java (added)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ContextlessAnnotationConverterBase.java Sun Jan 20 22:40:43 2013
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.uima.fit.legacy.converter;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+
+import org.apache.uima.fit.legacy.AnnotationConverter;
+
+/**
+ * Abstract base class for annotation converters that do not require a context.
+ */
+public abstract class ContextlessAnnotationConverterBase<L extends Annotation, M extends Annotation>
+ implements AnnotationConverter<L, M> {
+
+ abstract M convert(L aAnnotation);
+
+ public M convert(AccessibleObject aContext, L aAnnotation) {
+ return convert(aAnnotation);
+ }
+
+ public M convert(Class<?> aContext, L aAnnotation) {
+ return convert(aAnnotation);
+ }
+}
Propchange: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ContextlessAnnotationConverterBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ExternalResourceConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ExternalResourceConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ExternalResourceConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ExternalResourceConverter.java Sun Jan 20 22:40:43 2013
@@ -19,17 +19,17 @@
package org.apache.uima.fit.legacy.converter;
import org.apache.uima.fit.descriptor.ExternalResource;
-import org.apache.uima.fit.legacy.AnnotationConverter;
import org.apache.uima.resource.Resource;
public class ExternalResourceConverter
- implements
- AnnotationConverter<org.uimafit.descriptor.ExternalResource, org.apache.uima.fit.descriptor.ExternalResource> {
+ extends
+ ContextlessAnnotationConverterBase<org.uimafit.descriptor.ExternalResource, org.apache.uima.fit.descriptor.ExternalResource> {
public ExternalResourceConverter() {
// Nothing to do
}
+ @Override
public ExternalResource convert(
final org.uimafit.descriptor.ExternalResource aAnnotation) {
return new ExternalResourceSubstitute(aAnnotation);
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexCollectionConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexCollectionConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexCollectionConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexCollectionConverter.java Sun Jan 20 22:40:43 2013
@@ -20,16 +20,16 @@ package org.apache.uima.fit.legacy.conve
import org.apache.uima.fit.descriptor.FsIndex;
import org.apache.uima.fit.descriptor.FsIndexCollection;
-import org.apache.uima.fit.legacy.AnnotationConverter;
public class FsIndexCollectionConverter
- implements
- AnnotationConverter<org.uimafit.descriptor.FsIndexCollection, org.apache.uima.fit.descriptor.FsIndexCollection> {
+ extends
+ ContextlessAnnotationConverterBase<org.uimafit.descriptor.FsIndexCollection, org.apache.uima.fit.descriptor.FsIndexCollection> {
public FsIndexCollectionConverter() {
// Nothing to do
}
+ @Override
public FsIndexCollection convert(
final org.uimafit.descriptor.FsIndexCollection aAnnotation) {
return new FsIndexCollectionSubstitute(aAnnotation);
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java Sun Jan 20 22:40:43 2013
@@ -20,17 +20,17 @@ package org.apache.uima.fit.legacy.conve
import org.apache.uima.fit.descriptor.FsIndex;
import org.apache.uima.fit.descriptor.FsIndexKey;
-import org.apache.uima.fit.legacy.AnnotationConverter;
import org.apache.uima.jcas.cas.TOP;
public class FsIndexConverter
- implements
- AnnotationConverter<org.uimafit.descriptor.FsIndex, org.apache.uima.fit.descriptor.FsIndex> {
+ extends
+ ContextlessAnnotationConverterBase<org.uimafit.descriptor.FsIndex, org.apache.uima.fit.descriptor.FsIndex> {
public FsIndexConverter() {
// Nothing to do
}
+ @Override
public FsIndex convert(
final org.uimafit.descriptor.FsIndex aAnnotation) {
return new FsIndexSubstitute(aAnnotation);
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexKeyConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexKeyConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexKeyConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexKeyConverter.java Sun Jan 20 22:40:43 2013
@@ -19,16 +19,16 @@
package org.apache.uima.fit.legacy.converter;
import org.apache.uima.fit.descriptor.FsIndexKey;
-import org.apache.uima.fit.legacy.AnnotationConverter;
public class FsIndexKeyConverter
- implements
- AnnotationConverter<org.uimafit.descriptor.FsIndexKey, org.apache.uima.fit.descriptor.FsIndexKey> {
+ extends
+ ContextlessAnnotationConverterBase<org.uimafit.descriptor.FsIndexKey, org.apache.uima.fit.descriptor.FsIndexKey> {
public FsIndexKeyConverter() {
// Nothing to do
}
+ @Override
public FsIndexKey convert(
final org.uimafit.descriptor.FsIndexKey aAnnotation) {
return new FsIndexKeySubstitute(aAnnotation);
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/NoConversionConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/NoConversionConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/NoConversionConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/NoConversionConverter.java Sun Jan 20 22:40:43 2013
@@ -20,14 +20,12 @@ package org.apache.uima.fit.legacy.conve
import java.lang.annotation.Annotation;
-import org.apache.uima.fit.legacy.AnnotationConverter;
-
/**
* Fallback converter that does not convert anything.
*
* @author Richard Eckart de Castilho
*/
-public class NoConversionConverter implements AnnotationConverter<Annotation, Annotation> {
+public class NoConversionConverter extends ContextlessAnnotationConverterBase<Annotation, Annotation> {
private static NoConversionConverter instance = null;
@@ -35,6 +33,7 @@ public class NoConversionConverter imple
// Nothing to do
}
+ @Override
public Annotation convert(Annotation aAnnotation) {
return null;
}
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/OperationalPropertiesConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/OperationalPropertiesConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/OperationalPropertiesConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/OperationalPropertiesConverter.java Sun Jan 20 22:40:43 2013
@@ -19,16 +19,16 @@
package org.apache.uima.fit.legacy.converter;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.legacy.AnnotationConverter;
public class OperationalPropertiesConverter
- implements
- AnnotationConverter<org.uimafit.descriptor.OperationalProperties, org.apache.uima.fit.descriptor.OperationalProperties> {
+ extends
+ ContextlessAnnotationConverterBase<org.uimafit.descriptor.OperationalProperties, org.apache.uima.fit.descriptor.OperationalProperties> {
public OperationalPropertiesConverter() {
// Nothing to do
}
+ @Override
public OperationalProperties convert(
final org.uimafit.descriptor.OperationalProperties aAnnotation) {
return new OperationalPropertiesSubstitute(aAnnotation);
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java Sun Jan 20 22:40:43 2013
@@ -19,16 +19,16 @@
package org.apache.uima.fit.legacy.converter;
import org.apache.uima.fit.descriptor.SofaCapability;
-import org.apache.uima.fit.legacy.AnnotationConverter;
public class SofaCapabilityConverter
- implements
- AnnotationConverter<org.uimafit.descriptor.SofaCapability, org.apache.uima.fit.descriptor.SofaCapability> {
+ extends
+ ContextlessAnnotationConverterBase<org.uimafit.descriptor.SofaCapability, org.apache.uima.fit.descriptor.SofaCapability> {
public SofaCapabilityConverter() {
// Nothing to do
}
+ @Override
public SofaCapability convert(
final org.uimafit.descriptor.SofaCapability aAnnotation) {
return new SofaCapabilitySubstitute(aAnnotation);
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java Sun Jan 20 22:40:43 2013
@@ -19,16 +19,16 @@
package org.apache.uima.fit.legacy.converter;
import org.apache.uima.fit.descriptor.TypeCapability;
-import org.apache.uima.fit.legacy.AnnotationConverter;
public class TypeCapabilityConverter
- implements
- AnnotationConverter<org.uimafit.descriptor.TypeCapability, org.apache.uima.fit.descriptor.TypeCapability> {
+ extends
+ ContextlessAnnotationConverterBase<org.uimafit.descriptor.TypeCapability, org.apache.uima.fit.descriptor.TypeCapability> {
public TypeCapabilityConverter() {
// Nothing to do
}
+ @Override
public TypeCapability convert(
final org.uimafit.descriptor.TypeCapability aAnnotation) {
return new TypeCapabilitySubstitute(aAnnotation);
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java Sun Jan 20 22:40:43 2013
@@ -21,16 +21,16 @@ package org.apache.uima.fit.factory.init
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.uimafit.factory.ConfigurationParameterFactory.createConfigurationParameterName;
import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.xwriter.XWriterFileNamer;
-import org.uimafit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.fit.factory.UimaContextFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.junit.Test;
+import org.uimafit.descriptor.ConfigurationParameter;
/**
*/
@@ -75,8 +75,8 @@ public class InitializableFactoryTest {
public static class InitializableClass implements Initializable {
- public static final String PARAM_BOOLEAN_PARAMETER = ConfigurationParameterFactory
- .createConfigurationParameterName(InitializableClass.class, "booleanParameter");
+ public static final String PARAM_BOOLEAN_PARAMETER = createConfigurationParameterName(
+ InitializableClass.class, "booleanParameter");
@ConfigurationParameter
public boolean booleanParameter = false;
@@ -88,8 +88,8 @@ public class InitializableFactoryTest {
public static class NotInitializableClass {
- public static final String PARAM_BOOLEAN_PARAMETER = ConfigurationParameterFactory
- .createConfigurationParameterName(InitializableClass.class, "booleanParameter");
+ public static final String PARAM_BOOLEAN_PARAMETER = createConfigurationParameterName(
+ InitializableClass.class, "booleanParameter");
@ConfigurationParameter
public boolean booleanParameter = false;
@@ -101,8 +101,8 @@ public class InitializableFactoryTest {
public static class InitializableFileNamer implements Initializable, XWriterFileNamer {
- public static final String PARAM_STRING_PARAMETER = ConfigurationParameterFactory
- .createConfigurationParameterName(InitializableFileNamer.class, "stringParameter");
+ public static final String PARAM_STRING_PARAMETER = createConfigurationParameterName(
+ InitializableFileNamer.class, "stringParameter");
@ConfigurationParameter
public String stringParameter = "hello";
@@ -118,8 +118,8 @@ public class InitializableFactoryTest {
public static class NotInitializableFileNamer implements XWriterFileNamer {
- public static final String PARAM_STRING_PARAMETER = ConfigurationParameterFactory
- .createConfigurationParameterName(InitializableFileNamer.class, "stringParameter");
+ public static final String PARAM_STRING_PARAMETER = createConfigurationParameterName(
+ InitializableFileNamer.class, "stringParameter");
@ConfigurationParameter
public String stringParameter = "hello";
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java Sun Jan 20 22:40:43 2013
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.uimafit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.flow.FinalStep;
import org.apache.uima.flow.Flow;
import org.apache.uima.flow.FlowControllerContext;
@@ -36,6 +35,9 @@ import org.apache.uima.flow.SimpleStep;
import org.apache.uima.flow.Step;
import org.apache.uima.jcas.JCas;
+import static org.uimafit.factory.ConfigurationParameterFactory.createConfigurationParameterName;
+
+
/**
*
* NOTE: this class extends org.uimafit.component.JCasFlowController_ImplBase
@@ -44,8 +46,8 @@ import org.apache.uima.jcas.JCas;
public class ReversableTestFlowController extends
org.apache.uima.fit.component.JCasFlowController_ImplBase {
- public static final String PARAM_REVERSE_ORDER = ConfigurationParameterFactory
- .createConfigurationParameterName(ReversableTestFlowController.class, "reverseOrder");
+ public static final String PARAM_REVERSE_ORDER = createConfigurationParameterName(
+ ReversableTestFlowController.class, "reverseOrder");
@ConfigurationParameter
private boolean reverseOrder = false;
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java Sun Jan 20 22:40:43 2013
@@ -29,12 +29,14 @@ import org.apache.uima.cas.impl.XmiCasDe
import org.apache.uima.collection.CollectionException;
import org.apache.uima.fit.component.CasCollectionReader_ImplBase;
import org.uimafit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
import org.xml.sax.SAXException;
+import static org.uimafit.factory.ConfigurationParameterFactory.createConfigurationParameterName;
+
+
/**
* <br>
*
@@ -46,8 +48,8 @@ import org.xml.sax.SAXException;
public class SingleFileXReader extends CasCollectionReader_ImplBase {
- public static final String PARAM_FILE_NAME = ConfigurationParameterFactory
- .createConfigurationParameterName(SingleFileXReader.class, "fileName");
+ public static final String PARAM_FILE_NAME = createConfigurationParameterName(
+ SingleFileXReader.class, "fileName");
@ConfigurationParameter(mandatory = true, description = "takes the name of a single xmi or xcas file to be processed.")
private String fileName;
@@ -56,8 +58,8 @@ public class SingleFileXReader extends C
public static final String XCAS = "XCAS";
- public static final String PARAM_XML_SCHEME = ConfigurationParameterFactory
- .createConfigurationParameterName(SingleFileXReader.class, "xmlScheme");
+ public static final String PARAM_XML_SCHEME = createConfigurationParameterName(
+ SingleFileXReader.class, "xmlScheme");
@ConfigurationParameter(mandatory = true, description = "specifies the UIMA XML serialization scheme that should be usedValid values for this parameter are 'XMI' and 'XCAS'. See XmiCasSerializer or XCASSerializer", defaultValue = XMI)
private String xmlScheme;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java Sun Jan 20 22:40:43 2013
@@ -22,7 +22,6 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.cas.CASException;
import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.jcas.JCas;
/**
@@ -42,9 +41,7 @@ public class ViewCreatorAnnotator extend
/**
* The parameter name for the name of the viewed to be created by this annotator
*/
- public static final String PARAM_VIEW_NAME = ConfigurationParameterFactory
- .createConfigurationParameterName(ViewCreatorAnnotator.class, "viewName");
-
+ public static final String PARAM_VIEW_NAME = "viewName";
@ConfigurationParameter(mandatory = true)
private String viewName;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java Sun Jan 20 22:40:43 2013
@@ -22,7 +22,6 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.cas.CASException;
import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.jcas.JCas;
/**
@@ -42,18 +41,14 @@ public class ViewTextCopierAnnotator ext
/**
* The parameter name for the name of the source view
*/
- public static final String PARAM_SOURCE_VIEW_NAME = ConfigurationParameterFactory
- .createConfigurationParameterName(ViewTextCopierAnnotator.class, "sourceViewName");
-
+ public static final String PARAM_SOURCE_VIEW_NAME = "sourceViewName";
@ConfigurationParameter(mandatory = true)
private String sourceViewName;
/**
* The parameter name for the name of the destination view
*/
- public static final String PARAM_DESTINATION_VIEW_NAME = ConfigurationParameterFactory
- .createConfigurationParameterName(ViewTextCopierAnnotator.class, "destinationViewName");
-
+ public static final String PARAM_DESTINATION_VIEW_NAME = "destinationViewName";
@ConfigurationParameter(mandatory = true)
private String destinationViewName;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java Sun Jan 20 22:40:43 2013
@@ -21,7 +21,6 @@ package org.apache.uima.fit.component.xw
import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.fit.factory.initializable.Initializable;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
@@ -38,9 +37,7 @@ public class IntegerFileNamer implements
* The parameter name for the configuration parameter that specifies a fixed prefix for all
* returned file names.
*/
- public static final String PARAM_PREFIX = ConfigurationParameterFactory
- .createConfigurationParameterName(IntegerFileNamer.class, "prefix");
-
+ public static final String PARAM_PREFIX = "prefix";
@ConfigurationParameter(description = "specify a prefix that is prepended to all returned file names", defaultValue = "")
private String prefix;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/XWriter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/XWriter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/XWriter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/XWriter.java Sun Jan 20 22:40:43 2013
@@ -29,7 +29,6 @@ import org.apache.uima.cas.impl.XCASSeri
import org.apache.uima.cas.impl.XmiCasSerializer;
import org.apache.uima.fit.component.JCasConsumer_ImplBase;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.fit.factory.initializable.InitializableFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
@@ -48,9 +47,7 @@ public class XWriter extends JCasConsume
/**
* The parameter name for the configuration parameter that specifies the output directory
*/
- public static final String PARAM_OUTPUT_DIRECTORY_NAME = ConfigurationParameterFactory
- .createConfigurationParameterName(XWriter.class, "outputDirectoryName");
-
+ public static final String PARAM_OUTPUT_DIRECTORY_NAME = "outputDirectoryName";
@ConfigurationParameter(mandatory = true, description = "takes a path to directory into which output files will be written.")
private String outputDirectoryName;
@@ -58,9 +55,7 @@ public class XWriter extends JCasConsume
* The parameter name for the configuration parameter that provides the name of the XML scheme to
* use.
*/
- public static final String PARAM_XML_SCHEME_NAME = ConfigurationParameterFactory
- .createConfigurationParameterName(XWriter.class, "xmlSchemeName");
-
+ public static final String PARAM_XML_SCHEME_NAME = "xmlSchemeName";
@ConfigurationParameter(mandatory = true, defaultValue = "XMI", description = "specifies the UIMA XML serialization scheme that should be used. "
+ "Valid values for this parameter are 'XMI' (default) and 'XCAS'.")
private String xmlSchemeName;
@@ -69,9 +64,7 @@ public class XWriter extends JCasConsume
* The parameter name for the configuration parameter that specifies the name of the class that
* implements the file namer
*/
- public static final String PARAM_FILE_NAMER_CLASS_NAME = ConfigurationParameterFactory
- .createConfigurationParameterName(XWriter.class, "fileNamerClassName");
-
+ public static final String PARAM_FILE_NAMER_CLASS_NAME = "fileNamerClassName";
@ConfigurationParameter(mandatory = true, description = "the class name of the XWriterFileNamer implementation to use", defaultValue = "org.apache.uima.fit.component.xwriter.IntegerFileNamer")
protected String fileNamerClassName;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java Sun Jan 20 22:40:43 2013
@@ -57,7 +57,7 @@ public @interface ConfigurationParameter
/**
* the default value for name if none is given.
*/
- public static final String USE_FIELD_NAME = "org.uimafit.descriptor.ConfigurationParameter.USE_FIELD_NAME";
+ public static final String USE_FIELD_NAME = "org.apache.uima.fit.descriptor.ConfigurationParameter.USE_FIELD_NAME";
/**
* If you do not specify a name then the default name will be given by {@link #USE_FIELD_NAME}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java Sun Jan 20 22:40:43 2013
@@ -186,7 +186,7 @@ public final class ConfigurationParamete
.getAnnotation(field, org.apache.uima.fit.descriptor.ConfigurationParameter.class);
String name = annotation.name();
if (name.equals(org.apache.uima.fit.descriptor.ConfigurationParameter.USE_FIELD_NAME)) {
- name = field.getDeclaringClass().getName() + "." + field.getName();
+ name = field.getName();
}
return name;
}
@@ -194,21 +194,6 @@ public final class ConfigurationParamete
}
/**
- * This method provides a convenient way to generate a configuration parameter name for a member
- * variable that is annotated with {@link org.apache.uima.fit.descriptor.ConfigurationParameter}
- * and no name is provided in the annotation.
- */
- public static String createConfigurationParameterName(Class<?> clazz, String fieldName)
- throws IllegalArgumentException {
- try {
- return ConfigurationParameterFactory.getConfigurationParameterName(clazz
- .getDeclaredField(fieldName));
- } catch (NoSuchFieldException e) {
- throw new IllegalArgumentException(e);
- }
- }
-
- /**
* A factory method for creating a ConfigurationParameter from a given field definition
*/
public static ConfigurationParameter createPrimitiveParameter(Field field) {
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java Sun Jan 20 22:40:43 2013
@@ -7,8 +7,10 @@ public interface LegacySupportPlugin {
/**
* Checks if a legacy version of the given modern annotation is present.
*
- * @param aObject an object that might have a legacy annotation.
- * @param aAnnotationClass the modern annotation type.
+ * @param aObject
+ * an object that might have a legacy annotation.
+ * @param aAnnotationClass
+ * the modern annotation type.
* @return {@code true} if a legacy version of the annotation is present.
*/
boolean isAnnotationPresent(AccessibleObject aObject, Class<? extends Annotation> aAnnotationClass);
@@ -16,8 +18,10 @@ public interface LegacySupportPlugin {
/**
* Checks if a legacy version of the given modern annotation is present.
*
- * @param aObject an object that might have a legacy annotation.
- * @param aAnnotationClass the modern annotation type.
+ * @param aObject
+ * an object that might have a legacy annotation.
+ * @param aAnnotationClass
+ * the modern annotation type.
* @return {@code true} if a legacy version of the annotation is present.
*/
boolean isAnnotationPresent(Class<?> aObject, Class<? extends Annotation> aAnnotationClass);
@@ -27,20 +31,42 @@ public interface LegacySupportPlugin {
* this method looks for a legacy version of the annotation, converts it to a modern annotation
* and returns that.
*
- * @param aObject an object that has a legacy annotation.
- * @param aAnnotationClass the modern annotation type.
+ * @param aObject
+ * an object that has a legacy annotation.
+ * @param aAnnotationClass
+ * the modern annotation type.
* @return an instance of the modern annotation filled with the data from the legacy annotation.
*/
- <L extends Annotation, M extends Annotation> M getAnnotation(AccessibleObject aObject, Class<M> aAnnotationClass);
+ <L extends Annotation, M extends Annotation> M getAnnotation(AccessibleObject aObject,
+ Class<M> aAnnotationClass);
/**
* Gets the annotation from the given object. Instead of looking for the given modern annotation,
* this method looks for a legacy version of the annotation, converts it to a modern annotation
* and returns that.
*
- * @param aObject an object that has a legacy annotation.
- * @param aAnnotationClass the modern annotation type.
+ * @param aObject
+ * an object that has a legacy annotation.
+ * @param aAnnotationClass
+ * the modern annotation type.
* @return an instance of the modern annotation filled with the data from the legacy annotation.
*/
- <L extends Annotation, M extends Annotation> M getAnnotation(Class<?> aObject, Class<M> aAnnotationClass);
+ <L extends Annotation, M extends Annotation> M getAnnotation(Class<?> aObject,
+ Class<M> aAnnotationClass);
+//
+// /**
+// * Get the default value of a property of the annotation. This is used for example to get the
+// * default name of a configuration parameter.
+// *
+// * @param aObject
+// * an object that has a legacy annotation.
+// * @param aAnnotationClass
+// * the modern annotation type.
+// * @param aProperty
+// * a property of the annotation, e.g. {@code "name"} (see
+// * {@link ConfigurationParameter#name()})
+// * @return
+// */
+// <M extends Annotation> Object getDefaultValue(AccessibleObject aObject, Class<M> aAnnotationClass,
+// String aProperty);
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java Sun Jan 20 22:40:43 2013
@@ -110,9 +110,8 @@ public class ConfigurationParameterFacto
Field field1 = ConfigurationParameterFactoryTest.class.getDeclaredField("param1");
org.apache.uima.resource.metadata.ConfigurationParameter cp = ConfigurationParameterFactory
.createPrimitiveParameter(field1);
- assertEquals("org.apache.uima.fit.factory.ConfigurationParameterFactoryTest.param1",
- cp.getName());
- assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING, cp.getType());
+ assertEquals("param1", cp.getName());
+ assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING, cp.getType());
assertEquals("", cp.getDescription());
assertFalse(cp.isMandatory());
assertFalse(cp.isMultiValued());
@@ -150,8 +149,7 @@ public class ConfigurationParameterFacto
Field field3 = ConfigurationParameterFactoryTest.class.getDeclaredField("param3");
org.apache.uima.resource.metadata.ConfigurationParameter cp = ConfigurationParameterFactory
.createPrimitiveParameter(field3);
- assertEquals("org.apache.uima.fit.factory.ConfigurationParameterFactoryTest.param3",
- cp.getName());
+ assertEquals("param3", cp.getName());
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_INTEGER,
cp.getType());
assertEquals("", cp.getDescription());
@@ -171,8 +169,7 @@ public class ConfigurationParameterFacto
Field field4 = CPFT.class.getDeclaredField("param4");
org.apache.uima.resource.metadata.ConfigurationParameter cp = ConfigurationParameterFactory
.createPrimitiveParameter(field4);
- assertEquals("org.apache.uima.fit.factory.ConfigurationParameterFactoryTest$CPFT.param4",
- cp.getName());
+ assertEquals("param4", cp.getName());
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING, cp.getType());
assertEquals("", cp.getDescription());
assertFalse(cp.isMandatory());
@@ -190,7 +187,7 @@ public class ConfigurationParameterFacto
Field field = this.getClass().getDeclaredField("fileList");
org.apache.uima.resource.metadata.ConfigurationParameter param;
param = ConfigurationParameterFactory.createPrimitiveParameter(field);
- assertEquals(this.getClass().getName() + ".fileList", param.getName());
+ assertEquals("fileList", param.getName());
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING,
param.getType());
assertEquals("", param.getDescription());
@@ -209,7 +206,7 @@ public class ConfigurationParameterFacto
Field field = this.getClass().getDeclaredField("stringSet");
org.apache.uima.resource.metadata.ConfigurationParameter param;
param = ConfigurationParameterFactory.createPrimitiveParameter(field);
- assertEquals(this.getClass().getName() + ".stringSet", param.getName());
+ assertEquals("stringSet", param.getName());
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING,
param.getType());
assertFalse(param.isMandatory());
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java Sun Jan 20 22:40:43 2013
@@ -26,7 +26,6 @@ import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.xwriter.XWriterFileNamer;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.fit.factory.UimaContextFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
@@ -75,9 +74,7 @@ public class InitializableFactoryTest {
public static class InitializableClass implements Initializable {
- public static final String PARAM_BOOLEAN_PARAMETER = ConfigurationParameterFactory
- .createConfigurationParameterName(InitializableClass.class, "booleanParameter");
-
+ public static final String PARAM_BOOLEAN_PARAMETER = "booleanParameter";
@ConfigurationParameter
public boolean booleanParameter = false;
@@ -88,9 +85,7 @@ public class InitializableFactoryTest {
public static class NotInitializableClass {
- public static final String PARAM_BOOLEAN_PARAMETER = ConfigurationParameterFactory
- .createConfigurationParameterName(InitializableClass.class, "booleanParameter");
-
+ public static final String PARAM_BOOLEAN_PARAMETER = "booleanParameter";
@ConfigurationParameter
public boolean booleanParameter = false;
@@ -101,9 +96,7 @@ public class InitializableFactoryTest {
public static class InitializableFileNamer implements Initializable, XWriterFileNamer {
- public static final String PARAM_STRING_PARAMETER = ConfigurationParameterFactory
- .createConfigurationParameterName(InitializableFileNamer.class, "stringParameter");
-
+ public static final String PARAM_STRING_PARAMETER = "stringParameter";
@ConfigurationParameter
public String stringParameter = "hello";
@@ -118,9 +111,7 @@ public class InitializableFactoryTest {
public static class NotInitializableFileNamer implements XWriterFileNamer {
- public static final String PARAM_STRING_PARAMETER = ConfigurationParameterFactory
- .createConfigurationParameterName(InitializableFileNamer.class, "stringParameter");
-
+ public static final String PARAM_STRING_PARAMETER = "stringParameter";
@ConfigurationParameter
public String stringParameter = "hello";
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java Sun Jan 20 22:40:43 2013
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.flow.FinalStep;
import org.apache.uima.flow.Flow;
import org.apache.uima.flow.FlowControllerContext;
@@ -44,9 +43,7 @@ import org.apache.uima.jcas.JCas;
public class ReversableTestFlowController extends
org.apache.uima.fit.component.JCasFlowController_ImplBase {
- public static final String PARAM_REVERSE_ORDER = ConfigurationParameterFactory
- .createConfigurationParameterName(ReversableTestFlowController.class, "reverseOrder");
-
+ public static final String PARAM_REVERSE_ORDER = "reverseOrder";
@ConfigurationParameter
private boolean reverseOrder = false;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java Sun Jan 20 22:40:43 2013
@@ -29,7 +29,6 @@ import org.apache.uima.cas.impl.XmiCasDe
import org.apache.uima.collection.CollectionException;
import org.apache.uima.fit.component.CasCollectionReader_ImplBase;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
@@ -46,9 +45,7 @@ import org.xml.sax.SAXException;
public class SingleFileXReader extends CasCollectionReader_ImplBase {
- public static final String PARAM_FILE_NAME = ConfigurationParameterFactory
- .createConfigurationParameterName(SingleFileXReader.class, "fileName");
-
+ public static final String PARAM_FILE_NAME = "fileName";
@ConfigurationParameter(mandatory = true, description = "takes the name of a single xmi or xcas file to be processed.")
private String fileName;
@@ -56,9 +53,7 @@ public class SingleFileXReader extends C
public static final String XCAS = "XCAS";
- public static final String PARAM_XML_SCHEME = ConfigurationParameterFactory
- .createConfigurationParameterName(SingleFileXReader.class, "xmlScheme");
-
+ public static final String PARAM_XML_SCHEME = "xmlScheme";
@ConfigurationParameter(mandatory = true, description = "specifies the UIMA XML serialization scheme that should be usedValid values for this parameter are 'XMI' and 'XCAS'. See XmiCasSerializer or XCASSerializer", defaultValue = XMI)
private String xmlScheme;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml?rev=1435991&r1=1435990&r2=1435991&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml Sun Jan 20 22:40:43 2013
@@ -27,13 +27,13 @@
<vendor/>
<configurationParameters>
<configurationParameter>
- <name>org.apache.uima.fit.factory.testCrs.SingleFileXReader.fileName</name>
+ <name>fileName</name>
<type>String</type>
<multiValued>false</multiValued>
<mandatory>true</mandatory>
</configurationParameter>
<configurationParameter>
- <name>org.apache.uima.fit.factory.testCrs.SingleFileXReader.xmlScheme</name>
+ <name>xmlScheme</name>
<type>String</type>
<multiValued>false</multiValued>
<mandatory>false</mandatory>