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 2016/08/01 14:54:15 UTC
svn commit: r1754764 - in /uima/uimafit/trunk/uimafit-core/src:
main/java/org/apache/uima/fit/descriptor/
main/java/org/apache/uima/fit/factory/
test/java/org/apache/uima/fit/factory/testAes/ test/resources/data/reference/
Author: rec
Date: Mon Aug 1 14:54:15 2016
New Revision: 1754764
URL: http://svn.apache.org/viewvc?rev=1754764&view=rev
Log:
[UIMA-5035] Add support for mime type capabilities
Added:
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/descriptor/MimeTypeCapability.java (with props)
Modified:
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java
uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/testAes/SerializationTestAnnotator.java
uima/uimafit/trunk/uimafit-core/src/test/resources/data/reference/SerializationTestAnnotator.xml
Added: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/descriptor/MimeTypeCapability.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/descriptor/MimeTypeCapability.java?rev=1754764&view=auto
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/descriptor/MimeTypeCapability.java (added)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/descriptor/MimeTypeCapability.java Mon Aug 1 14:54:15 2016
@@ -0,0 +1,48 @@
+/*
+ * 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.descriptor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Provides information on the MIME types supported by a component.
+ *
+ * <pre><code>
+ * {@literal @}MimeTypeCapability({ "application/xml", "text/html" })
+ * </code></pre>
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface MimeTypeCapability {
+ /**
+ * The MIME types supported by this component.
+ *
+ * @return the supported MIME types
+ */
+ String[] value() default NO_DEFAULT_VALUE;
+
+ /**
+ * Provides the default value that tells the CapabilityFactory that no value has been provided.
+ */
+ public static final String NO_DEFAULT_VALUE = "org.apache.uima.fit.descriptor.MimeTypeCapability.NO_DEFAULT_VALUE";
+}
Propchange: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/descriptor/MimeTypeCapability.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java?rev=1754764&r1=1754763&r2=1754764&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java Mon Aug 1 14:54:15 2016
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.uima.analysis_engine.TypeOrFeature;
import org.apache.uima.analysis_engine.impl.TypeOrFeature_impl;
import org.apache.uima.fit.descriptor.LanguageCapability;
+import org.apache.uima.fit.descriptor.MimeTypeCapability;
import org.apache.uima.fit.descriptor.SofaCapability;
import org.apache.uima.fit.descriptor.TypeCapability;
import org.apache.uima.fit.internal.ReflectionUtil;
@@ -63,6 +64,16 @@ public final class CapabilityFactory {
capability.setLanguagesSupported(languages);
}
+ if (ReflectionUtil.isAnnotationPresent(componentClass, MimeTypeCapability.class)) {
+ MimeTypeCapability annotation = ReflectionUtil.getAnnotation(componentClass,
+ MimeTypeCapability.class);
+ String[] mimeTypes = annotation.value();
+ if (mimeTypes.length == 1 && mimeTypes[0].equals(MimeTypeCapability.NO_DEFAULT_VALUE)) {
+ mimeTypes = new String[0];
+ }
+ capability.setMimeTypesSupported(mimeTypes);
+ }
+
if (ReflectionUtil.isAnnotationPresent(componentClass, SofaCapability.class)) {
SofaCapability annotation = ReflectionUtil.getAnnotation(componentClass, SofaCapability.class);
String[] inputSofas = annotation.inputSofas();
Modified: uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/testAes/SerializationTestAnnotator.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/testAes/SerializationTestAnnotator.java?rev=1754764&r1=1754763&r2=1754764&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/testAes/SerializationTestAnnotator.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/testAes/SerializationTestAnnotator.java Mon Aug 1 14:54:15 2016
@@ -21,6 +21,7 @@ package org.apache.uima.fit.factory.test
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.descriptor.LanguageCapability;
+import org.apache.uima.fit.descriptor.MimeTypeCapability;
import org.apache.uima.fit.descriptor.SofaCapability;
import org.apache.uima.jcas.JCas;
@@ -28,6 +29,7 @@ import org.apache.uima.jcas.JCas;
* Used to test if metadata gets correctly serialized to XML.
*/
@LanguageCapability({"en", "de"})
+@MimeTypeCapability({ "application/xml", "text/html" })
@SofaCapability(inputSofas = "input1", outputSofas = "output1")
public class SerializationTestAnnotator extends JCasAnnotator_ImplBase {
Modified: uima/uimafit/trunk/uimafit-core/src/test/resources/data/reference/SerializationTestAnnotator.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/test/resources/data/reference/SerializationTestAnnotator.xml?rev=1754764&r1=1754763&r2=1754764&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/test/resources/data/reference/SerializationTestAnnotator.xml (original)
+++ uima/uimafit/trunk/uimafit-core/src/test/resources/data/reference/SerializationTestAnnotator.xml Mon Aug 1 14:54:15 2016
@@ -87,6 +87,10 @@
<language>en</language>
<language>de</language>
</languagesSupported>
+ <mimeTypesSupported>
+ <mimeType>application/xml</mimeType>
+ <mimeType>text/html</mimeType>
+ </mimeTypesSupported>
</capability>
</capabilities>
<operationalProperties>