Author: tallison
Date: Thu Jul 23 13:00:00 2015
New Revision: 1692383
URL: http://svn.apache.org/r1692383
Log:
TIKA-1690: revert changes made in r1678515 that added fileUrl capability in
tika-server
Removed:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaUtils.java
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/MetadataResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/RecursiveMetadataResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/MetadataResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/MetadataResource.java?rev=1692383&r1=1692382&r2=1692383&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/MetadataResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/MetadataResource.java
Thu Jul 23 13:00:00 2015
@@ -57,7 +57,7 @@ public class MetadataResource {
@Produces({"text/csv", "application/json", "application/rdf+xml"})
public Response getMetadata(InputStream is, @Context HttpHeaders
httpHeaders, @Context UriInfo info) throws Exception {
return Response.ok(
- parseMetadata(TikaUtils.getInputSteam(is, httpHeaders),
httpHeaders.getRequestHeaders(), info)).build();
+ parseMetadata(is, httpHeaders.getRequestHeaders(),
info)).build();
}
/**
@@ -93,7 +93,7 @@ public class MetadataResource {
Response.Status defaultErrorResponse = Response.Status.BAD_REQUEST;
Metadata metadata = null;
try {
- metadata = parseMetadata(TikaUtils.getInputSteam(is, httpHeaders),
httpHeaders.getRequestHeaders(), info);
+ metadata = parseMetadata(is, httpHeaders.getRequestHeaders(),
info);
// once we've parsed the document successfully, we should use
NOT_FOUND
// if we did not see the field
defaultErrorResponse = Response.Status.NOT_FOUND;
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/RecursiveMetadataResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/RecursiveMetadataResource.java?rev=1692383&r1=1692382&r2=1692383&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/RecursiveMetadataResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/RecursiveMetadataResource.java
Thu Jul 23 13:00:00 2015
@@ -56,7 +56,6 @@ public class RecursiveMetadataResource {
@PUT
@Produces("application/json")
public Response getMetadata(InputStream is, @Context HttpHeaders
httpHeaders, @Context UriInfo info) throws Exception {
- is = TikaUtils.getInputSteam(is, httpHeaders);
return Response.ok(
parseMetadata(is, httpHeaders.getRequestHeaders(),
info)).build();
}
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java?rev=1692383&r1=1692382&r2=1692383&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
Thu Jul 23 13:00:00 2015
@@ -334,8 +334,8 @@ public class TikaResource {
@PUT
@Consumes("*/*")
@Produces("text/plain")
- public StreamingOutput getText(final InputStream is, @Context HttpHeaders
httpHeaders, @Context final UriInfo info) throws IOException {
- return produceText(TikaUtils.getInputSteam(is, httpHeaders),
httpHeaders.getRequestHeaders(), info);
+ public StreamingOutput getText(final InputStream is, @Context HttpHeaders
httpHeaders, @Context final UriInfo info) {
+ return produceText(is, httpHeaders.getRequestHeaders(), info);
}
public StreamingOutput produceText(final InputStream is,
MultivaluedMap<String, String> httpHeaders, final UriInfo info) {
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java?rev=1692383&r1=1692382&r2=1692383&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
Thu Jul 23 13:00:00 2015
@@ -136,7 +136,6 @@ public class UnpackerResource {
MutableInt count = new MutableInt();
pc.set(EmbeddedDocumentExtractor.class, new
MyEmbeddedDocumentExtractor(count, files));
- is = TikaUtils.getInputSteam(is, httpHeaders);
TikaResource.parse(parser, logger, info.getPath(), is, ch, metadata,
pc);
if (count.intValue() == 0 && !saveAll) {
