This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/master by this push: new badad88 TIKA-2816 -- allow OCR parameter header setting in tika-server to include parameters of type long/Long badad88 is described below commit badad88737578ffd2d1f87b28bdc3502b9b4076c Author: TALLISON <talli...@apache.org> AuthorDate: Tue Jan 15 13:08:39 2019 -0500 TIKA-2816 -- allow OCR parameter header setting in tika-server to include parameters of type long/Long --- .../src/main/java/org/apache/tika/server/resource/TikaResource.java | 6 ++++++ .../src/test/java/org/apache/tika/server/TikaResourceTest.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java index ae701a9..285d3dd 100644 --- a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java +++ b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java @@ -223,6 +223,10 @@ public class TikaResource { clazz = boolean.class; } else if (field.getType() == Boolean.class) { clazz = Boolean.class; + } else if (field.getType() == long.class) { + clazz = long.class; + } else if (field.getType() == Long.class) { + clazz = Long.class; } } @@ -247,6 +251,8 @@ public class TikaResource { m.invoke(object, Boolean.parseBoolean(val)); } else if (clazz == float.class || clazz == Float.class) { m.invoke(object, Float.parseFloat(val)); + } else if (clazz == long.class || clazz == Long.class) { + m.invoke(object, Long.parseLong(val)); } else { throw new IllegalArgumentException("setter must be String, int, float, double or boolean...for now"); } diff --git a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java index 2ca357c..0b1fbb7 100644 --- a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java +++ b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java @@ -233,7 +233,7 @@ public class TikaResourceTest extends CXFTestBase { assertTrue(responseMsg.contains("Example text")); } - //TIKA-2638 + //TIKA-2638 and TIKA-2816 @Test public void testOCRLanguageConfig() throws Exception { if (! new TesseractOCRParser().hasTesseract(new TesseractOCRConfig())) { @@ -244,6 +244,7 @@ public class TikaResourceTest extends CXFTestBase { .accept("text/plain") .header(TikaResource.X_TIKA_PDF_HEADER_PREFIX+"OcrStrategy", "ocr_only") .header(TikaResource.X_TIKA_OCR_HEADER_PREFIX+"Language", "eng+fra") + .header(TikaResource.X_TIKA_OCR_HEADER_PREFIX+"MinFileSizeToOcr", "100000000") .put(ClassLoader.getSystemResourceAsStream("testOCR.pdf")); String responseMsg = getStringFromInputStream((InputStream) response .getEntity());