Author: tommaso
Date: Thu Oct 25 11:29:11 2012
New Revision: 1402103
URL: http://svn.apache.org/viewvc?rev=1402103&view=rev
Log:
[CLEREZZA-651] - removed some warnings, fixed deprecated methods in
TikaTextExtractor
Modified:
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingException.java
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/UnknownStrategyException.java
incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractor.java
incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/UnsupportedMediaTypeException.java
incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractorTest.java
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/UIMASamplesBundleActivator.java
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/AEProviderTest.java
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/UIMAExecutorTest.java
Modified:
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingException.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingException.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingException.java
(original)
+++
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingException.java
Thu Oct 25 11:29:11 2012
@@ -21,6 +21,7 @@ package org.apache.clerezza.uima.cascons
/**
* An {@link Exception} thrown when mapping a CAS model to RDF
*/
+@SuppressWarnings("serial")
public class CASMappingException extends Exception {
public CASMappingException(Throwable cause) {
super(cause);
Modified:
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java
(original)
+++
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java
Thu Oct 25 11:29:11 2012
@@ -19,7 +19,6 @@
package org.apache.clerezza.uima.casconsumer;
import org.apache.clerezza.uima.utils.UIMABundleActivator;
-import org.apache.clerezza.uima.utils.cl.UIMAResourcesClassLoaderRepository;
/**
* {@link UIMABundleActivator} to register {@link ClerezzaCASConsumer}
component
Modified:
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/UnknownStrategyException.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/UnknownStrategyException.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/UnknownStrategyException.java
(original)
+++
incubator/clerezza/trunk/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/UnknownStrategyException.java
Thu Oct 25 11:29:11 2012
@@ -22,6 +22,7 @@ package org.apache.clerezza.uima.cascons
* Exception raised when an unrecognized (unknown or registered with wrong
name) {@link CASMappingStrategy} is requested
* to the {@link CASMappingStrategiesRepository}
*/
+@SuppressWarnings("serial")
public class UnknownStrategyException extends Throwable {
public UnknownStrategyException(String message) {
super(message);
Modified:
incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractor.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractor.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractor.java
(original)
+++
incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractor.java
Thu Oct 25 11:29:11 2012
@@ -24,7 +24,6 @@ package org.apache.clerezza.uima.metadat
import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.mime.MimeTypes;
import javax.ws.rs.core.MediaType;
import java.io.*;
@@ -40,8 +39,6 @@ public class TikaTextExtractor implement
private TikaConfig config;
- private MimeTypes types;
-
/**
* Construct an instance using the default {@link org.apache.tika.Tika}
configuration.
*/
@@ -51,7 +48,6 @@ public class TikaTextExtractor implement
} catch (Exception e) {
throw new RuntimeException("Error while loading Tika configuration.", e);
}
- types = config.getMimeRepository();
tika = new Tika(config);
}
@@ -68,7 +64,6 @@ public class TikaTextExtractor implement
} catch (Exception e) {
throw new RuntimeException("Error while loading Tika configuration.", e);
}
- types = config.getMimeRepository();
tika = new Tika(config);
}
@@ -76,7 +71,7 @@ public class TikaTextExtractor implement
* {@inheritDoc}
*/
public boolean supports(MediaType mediaType) {
- return this.types.getMimeType(mediaType.getType()) != null;
+ return tika.detect(mediaType.getType()) != null;
}
/**
@@ -90,7 +85,7 @@ public class TikaTextExtractor implement
} catch (IOException e) {
throw new RuntimeException("Error while detecting mime type", e);
}
- if (this.types.getMimeType(mimeType) == null) {
+ if (tika.detect(mimeType) == null) {
throw new UnsupportedMediaTypeException(
String.format("[%s] mime type is not supported", mimeType)
);
Modified:
incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/UnsupportedMediaTypeException.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/UnsupportedMediaTypeException.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/UnsupportedMediaTypeException.java
(original)
+++
incubator/clerezza/trunk/uima/uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/mediatype/UnsupportedMediaTypeException.java
Thu Oct 25 11:29:11 2012
@@ -26,6 +26,7 @@ import javax.ws.rs.core.MediaType;
/**
* When a {@link javax.ws.rs.core.MediaType} is not supported this exception
is thrown
*/
+@SuppressWarnings("serial")
public class UnsupportedMediaTypeException extends Exception {
private static final String UNSUPPORTED = " is not supported";
Modified:
incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractorTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractorTest.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractorTest.java
(original)
+++
incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/mediatype/TikaTextExtractorTest.java
Thu Oct 25 11:29:11 2012
@@ -65,7 +65,7 @@ public class TikaTextExtractorTest {
*/
@Test
public void testSupports() throws UnsupportedMediaTypeException,
IllegalAccessException {
- Class mediaTypeClass = MediaType.class;
+ Class<MediaType> mediaTypeClass = MediaType.class;
for (Field field : mediaTypeClass.getFields()) {
if (field.getType().equals(MediaType.class)) {
MediaType objectInstance = new MediaType();
Modified:
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/UIMASamplesBundleActivator.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/UIMASamplesBundleActivator.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/UIMASamplesBundleActivator.java
(original)
+++
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/UIMASamplesBundleActivator.java
Thu Oct 25 11:29:11 2012
@@ -22,7 +22,6 @@ import opennlp.uima.namefind.NameFinder;
import opennlp.uima.sentdetect.SentenceDetector;
import opennlp.uima.tokenize.Tokenizer;
import org.apache.clerezza.uima.utils.UIMABundleActivator;
-import org.apache.clerezza.uima.utils.cl.UIMAResourcesClassLoaderRepository;
/**
* {@link org.osgi.framework.BundleActivator} for uima.samples module
Modified:
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/AEProviderTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/AEProviderTest.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/AEProviderTest.java
(original)
+++
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/AEProviderTest.java
Thu Oct 25 11:29:11 2012
@@ -23,7 +23,6 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
Modified:
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/UIMAExecutorTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/UIMAExecutorTest.java?rev=1402103&r1=1402102&r2=1402103&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/UIMAExecutorTest.java
(original)
+++
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/UIMAExecutorTest.java
Thu Oct 25 11:29:11 2012
@@ -21,7 +21,6 @@ package org.apache.clerezza.uima.utils;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
/**
* Testcase for {@link UIMAExecutor}
