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/04/27 00:25:03 UTC
svn commit: r1476422 - in /uima/sandbox/uimafit/trunk/uimafit/src:
main/java/org/apache/uima/fit/factory/ main/java/org/apache/uima/fit/util/
test/java/org/apache/uima/fit/util/
Author: rec
Date: Fri Apr 26 22:25:02 2013
New Revision: 1476422
URL: http://svn.apache.org/r1476422
Log:
[UIMA-2786] Remove deprecated API
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/JCasFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/CasUtil.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasUtil.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java?rev=1476422&r1=1476421&r2=1476422&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java Fri Apr 26 22:25:02 2013
@@ -345,20 +345,6 @@ public final class AnalysisEngineFactory
return desc;
}
- /**
- * Provides a way to override configuration parameter settings with new values in an
- * AnalysisEngineDescription
- *
- * @deprecated use {@link ResourceCreationSpecifierFactory#setConfigurationParameters}
- */
- @Deprecated
- public static void setConfigurationParameters(
- AnalysisEngineDescription analysisEngineDescription, Object... configurationData)
- throws ResourceInitializationException {
- ResourceCreationSpecifierFactory.setConfigurationParameters(analysisEngineDescription,
- configurationData);
- }
-
public static AnalysisEngine createPrimitive(Class<? extends AnalysisComponent> componentClass,
TypeSystemDescription typeSystem, TypePriorities typePriorities,
Object... configurationParameters) throws ResourceInitializationException {
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java?rev=1476422&r1=1476421&r2=1476422&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java Fri Apr 26 22:25:02 2013
@@ -301,19 +301,4 @@ public final class CollectionReaderFacto
return desc;
}
-
- /**
- * Since the configuration parameters of a CollectionReader with the given configuration parameter
- * data
- *
- * @deprecated use {@link ResourceCreationSpecifierFactory#setConfigurationParameters}
- */
- @Deprecated
- public static void setConfigurationParameters(
- CollectionReaderDescription collectionReaderDescription, Object... configurationData)
- throws ResourceInitializationException {
- ResourceCreationSpecifierFactory.setConfigurationParameters(collectionReaderDescription,
- configurationData);
- }
-
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/JCasFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/JCasFactory.java?rev=1476422&r1=1476421&r2=1476422&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/JCasFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/JCasFactory.java Fri Apr 26 22:25:02 2013
@@ -70,23 +70,6 @@ public final class JCasFactory {
}
/**
- * Create a new JCas with a new type system defined by the classes provided
- *
- * @param typeSystemClasses
- * should be classes generated by JCasGen
- *
- * @deprecated This is not the method you want to use. If you declare only one type per XML type
- * descriptor, you'll end up with LOTS of these. Use
- * {@link TypeSystemDescriptionFactory#createTypeSystemDescription(String...)} or
- * automatic type system detection with
- * {@link TypeSystemDescriptionFactory#createTypeSystemDescription()}.
- */
- @Deprecated
- public static JCas createJCas(Class<?>... typeSystemClasses) throws UIMAException {
- return createJCas(createTypeSystemDescription(typeSystemClasses));
- }
-
- /**
* Create a new JCas for the given type system description
*/
public static JCas createJCas(TypeSystemDescription typeSystemDescription) throws UIMAException {
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java?rev=1476422&r1=1476421&r2=1476422&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java Fri Apr 26 22:25:02 2013
@@ -48,35 +48,6 @@ public final class TypeSystemDescription
}
/**
- * Creates a TypeSystemDescription from a list of classes belonging to a type system - i.e.
- * classes generated by JCasGen. It is expected that for each of the classes passed to this
- * method, an XML type description exists with the same name as the class and in the same package.
- * It is further expected, that each of these type system descriptors declares a single type, for
- * which a JCas wrapper class has been generated, which has been passed to this method.
- *
- * @param typeSystemClasses
- * The type system class objects. Should be classes generated by JCasGen.
- * @return A TypeSystemDescription that includes all of the specified Annotation types.
- * @deprecated This is not the method you want to use. If you declare only one type per XML type
- * descriptor, you'll end up with LOTS of these. Use
- * {@link #createTypeSystemDescription(String...)} or automatic type system detection
- * with {@link #createTypeSystemDescription()}.
- */
- @Deprecated
- public static TypeSystemDescription createTypeSystemDescription(Class<?>... typeSystemClasses) {
- TypeSystemDescription typeSystem = new TypeSystemDescription_impl();
- List<Import> imports = new ArrayList<Import>();
- for (Class<?> typeSystemClass : typeSystemClasses) {
- Import imprt = new Import_impl();
- imprt.setName(typeSystemClass.getName());
- imports.add(imprt);
- }
- Import[] importArray = new Import[imports.size()];
- typeSystem.setImports(imports.toArray(importArray));
- return typeSystem;
- }
-
- /**
* Creates a TypeSystemDescription from descriptor names.
*
* @param descriptorNames
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/CasUtil.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/CasUtil.java?rev=1476422&r1=1476421&r2=1476422&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/CasUtil.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/CasUtil.java Fri Apr 26 22:25:02 2013
@@ -62,38 +62,6 @@ public final class CasUtil {
}
/**
- * Convenience method to iterator over all feature structures of a given type.
- *
- * @param cas
- * a CAS.
- * @param type
- * the type.
- * @return An iterable.
- * @see AnnotationIndex#iterator()
- * @deprecated use {@link #selectFS}
- */
- @Deprecated
- public static Iterable<FeatureStructure> iterateFS(final CAS cas, final Type type) {
- return selectFS(cas, type);
- }
-
- /**
- * Convenience method to iterator over all annotations of a given type.
- *
- * @param cas
- * a CAS.
- * @param type
- * the type.
- * @return An iterable.
- * @see AnnotationIndex#iterator()
- * @deprecated use {@link #select}
- */
- @Deprecated
- public static Iterable<AnnotationFS> iterate(final CAS cas, final Type type) {
- return select(cas, type);
- }
-
- /**
* Get an iterator over the given feature structures type.
*
* @param <T>
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasUtil.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasUtil.java?rev=1476422&r1=1476421&r2=1476422&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasUtil.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasUtil.java Fri Apr 26 22:25:02 2013
@@ -46,65 +46,6 @@ public final class JCasUtil {
}
/**
- * Convenience method to iterator over all features structures of a given type.
- *
- * @param <T>
- * the iteration type.
- * @param jCas
- * a JCas.
- * @param type
- * the type.
- * @return An iterable.
- * @see AnnotationIndex#iterator()
- * @deprecated use {@link #select}
- */
- @Deprecated
- public static <T extends TOP> Iterable<T> iterate(final JCas jCas, final Class<T> type) {
- return select(jCas, type);
- }
-
- /**
- * Convenience method to iterator over all annotations of a given type occurring within the scope
- * of a provided annotation.
- *
- * @param <T>
- * the iteration type.
- * @param container
- * the containing annotation.
- * @param type
- * the type.
- * @return A iterable.
- * @see #selectCovered(Class, AnnotationFS)
- * @deprecated use {@link #selectCovered}
- */
- @Deprecated
- public static <T extends Annotation> Iterable<T> iterate(final Class<T> type,
- final AnnotationFS container) {
- return selectCovered(type, container);
- }
-
- /**
- * Convenience method to iterator over all annotations of a given type occurring within the scope
- * of a provided annotation.
- *
- * @param <T>
- * the iteration type.
- * @param jCas
- * a JCas.
- * @param container
- * the containing annotation.
- * @param type
- * the type.
- * @return A iterable.
- * @deprecated use {@link #selectCovered}
- */
- @Deprecated
- public static <T extends Annotation> Iterable<T> iterate(final JCas jCas, final Class<T> type,
- final AnnotationFS container) {
- return selectCovered(jCas, type, container);
- }
-
- /**
* Convenience method to iterator over all annotations of a given type occurring within the scope
* of a provided annotation (sub-iteration).
*
@@ -495,24 +436,6 @@ public final class JCasUtil {
* @param type
* a UIMA type.
* @return if an annotation of the given type is present.
- * @deprecated use {@link #contains}
- */
- @Deprecated
- public static boolean isCovered(JCas jCas, AnnotationFS coveringAnnotation,
- Class<? extends Annotation> type) {
- return contains(jCas, coveringAnnotation, type);
- }
-
- /**
- * Check if the given annotation contains any annotation of the given type.
- *
- * @param jCas
- * a JCas containing the annotation.
- * @param coveringAnnotation
- * the covering annotation.
- * @param type
- * a UIMA type.
- * @return if an annotation of the given type is present.
*/
public static boolean contains(JCas jCas, AnnotationFS coveringAnnotation,
Class<? extends Annotation> type) {
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java?rev=1476422&r1=1476421&r2=1476422&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java Fri Apr 26 22:25:02 2013
@@ -29,7 +29,7 @@ import static org.apache.uima.fit.util.J
import static org.apache.uima.fit.util.JCasUtil.getView;
import static org.apache.uima.fit.util.JCasUtil.indexCovered;
import static org.apache.uima.fit.util.JCasUtil.indexCovering;
-import static org.apache.uima.fit.util.JCasUtil.isCovered;
+import static org.apache.uima.fit.util.JCasUtil.contains;
import static org.apache.uima.fit.util.JCasUtil.select;
import static org.apache.uima.fit.util.JCasUtil.selectBetween;
import static org.apache.uima.fit.util.JCasUtil.selectCovered;
@@ -539,14 +539,14 @@ public class JCasUtilTest extends Compon
assertEquals(6, selectCovered(Token.class, sentences.get(0)).size());
assertEquals(4, selectCovered(Token.class, sentences.get(1)).size());
- assertTrue(isCovered(jCas, sentences.get(0), Token.class));
+ assertTrue(contains(jCas, sentences.get(0), Token.class));
tokens.get(0).removeFromIndexes();
tokens.get(1).removeFromIndexes();
tokens.get(2).removeFromIndexes();
tokens.get(3).removeFromIndexes();
tokens.get(4).removeFromIndexes();
tokens.get(5).removeFromIndexes();
- assertFalse(isCovered(jCas, sentences.get(0), Token.class));
+ assertFalse(contains(jCas, sentences.get(0), Token.class));
}
@Test