You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by tp...@apache.org on 2014/07/22 22:44:27 UTC
svn commit: r1612700 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/image/
main/java/org/apache/tika/parser/iptc/ main/java/org/apache/tika/parser/rtf/
test/java/org/apache/tika/parser/crypto/
test/java/org/apache/tika/parser/micro...
Author: tpalsulich
Date: Tue Jul 22 20:44:26 2014
New Revision: 1612700
URL: http://svn.apache.org/r1612700
Log:
Use String.contains instead of String.indexOf > -1
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java?rev=1612700&r1=1612699&r2=1612700&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java Tue Jul 22 20:44:26 2014
@@ -286,10 +286,10 @@ public class ImageMetadataExtractor {
if(directory.containsTag(ExifSubIFDDirectory.TAG_FLASH)) {
String flash = directory.getDescription(ExifSubIFDDirectory.TAG_FLASH);
- if(flash.indexOf("Flash fired") > -1) {
+ if(flash.contains("Flash fired")) {
metadata.set(Metadata.FLASH_FIRED, Boolean.TRUE.toString());
}
- else if(flash.indexOf("Flash did not fire") > -1) {
+ else if(flash.contains("Flash did not fire")) {
metadata.set(Metadata.FLASH_FIRED, Boolean.FALSE.toString());
}
else {
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java?rev=1612700&r1=1612699&r2=1612700&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java Tue Jul 22 20:44:26 2014
@@ -598,13 +598,13 @@ public class IptcAnpaParser implements P
// we have an author candidate
int term = tmp_line.length();
- term = Math.min(term, (tmp_line.indexOf("<") > -1 ? tmp_line.indexOf("<") : term));
- term = Math.min(term, (tmp_line.indexOf("=") > -1 ? tmp_line.indexOf("=") : term));
- term = Math.min(term, (tmp_line.indexOf("\n") > -1 ? tmp_line.indexOf("\n") : term));
+ term = Math.min(term, (tmp_line.contains("<") ? tmp_line.indexOf("<") : term));
+ term = Math.min(term, (tmp_line.contains("=") ? tmp_line.indexOf("=") : term));
+ term = Math.min(term, (tmp_line.contains("\n") ? tmp_line.indexOf("\n") : term));
term = (term > 0 ) ? term : tmp_line.length();
bdy_author += tmp_line.substring(tmp_line.indexOf(" "), term);
metastarted = true;
- longline = ((tmp_line.indexOf("=") > -1) && (!longline.equals(longkey)) ? longkey : "");
+ longline = ((tmp_line.contains("=")) && (!longline.equals(longkey)) ? longkey : "");
}
else if (FORMAT == this.FMT_IPTC_BLM) {
String byline = " by ";
@@ -612,14 +612,14 @@ public class IptcAnpaParser implements P
longkey = "bdy_author";
int term = tmp_line.length();
- term = Math.min(term, (tmp_line.indexOf("<") > -1 ? tmp_line.indexOf("<") : term));
- term = Math.min(term, (tmp_line.indexOf("=") > -1 ? tmp_line.indexOf("=") : term));
- term = Math.min(term, (tmp_line.indexOf("\n") > -1 ? tmp_line.indexOf("\n") : term));
+ term = Math.min(term, (tmp_line.contains("<") ? tmp_line.indexOf("<") : term));
+ term = Math.min(term, (tmp_line.contains("=") ? tmp_line.indexOf("=") : term));
+ term = Math.min(term, (tmp_line.contains("\n") ? tmp_line.indexOf("\n") : term));
term = (term > 0 ) ? term : tmp_line.length();
// for bloomberg, the author line sits below their copyright statement
bdy_author += tmp_line.substring(tmp_line.toLowerCase().indexOf(byline) + byline.length(), term) + " ";
metastarted = true;
- longline = ((tmp_line.indexOf("=") > -1) && (!longline.equals(longkey)) ? longkey : "");
+ longline = ((tmp_line.contains("=")) && (!longline.equals(longkey)) ? longkey : "");
}
else if(tmp_line.toLowerCase().startsWith("c.")) {
// the author line for bloomberg is a multiline starting with c.2011 Bloomberg News
@@ -646,8 +646,8 @@ public class IptcAnpaParser implements P
// we have a source candidate
int term = tmp_line.length();
- term = Math.min(term, (tmp_line.indexOf("<") > -1 ? tmp_line.indexOf("<") : term));
- term = Math.min(term, (tmp_line.indexOf("=") > -1 ? tmp_line.indexOf("=") : term));
+ term = Math.min(term, (tmp_line.contains("<") ? tmp_line.indexOf("<") : term));
+ term = Math.min(term, (tmp_line.contains("=") ? tmp_line.indexOf("=") : term));
// term = Math.min(term, (tmp_line.indexOf("\n") > -1 ? tmp_line.indexOf("\n") : term));
term = (term > 0 ) ? term : tmp_line.length();
bdy_source += tmp_line.substring(tmp_line.indexOf(" ") + 1, term) + " ";
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java?rev=1612700&r1=1612699&r2=1612700&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java Tue Jul 22 20:44:26 2014
@@ -1416,7 +1416,7 @@ final class TextExtractor {
s = s.substring(9).trim();
// TODO: what other instructions can be in a
// HYPERLINK destination?
- final boolean isLocalLink = s.indexOf("\\l ") != -1;
+ final boolean isLocalLink = s.contains("\\l ");
int idx = s.indexOf('"');
if (idx != -1) {
int idx2 = s.indexOf('"', 1+idx);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java?rev=1612700&r1=1612699&r2=1612700&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java Tue Jul 22 20:44:26 2014
@@ -40,7 +40,7 @@ public class Pkcs7ParserTest extends Tik
} catch (NullPointerException npe) {
fail("should not get NPE");
} catch (TikaException te) {
- assertTrue(te.toString().indexOf("cannot parse detached pkcs7 signature") != -1);
+ assertTrue(te.toString().contains("cannot parse detached pkcs7 signature"));
} finally {
input.close();
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java?rev=1612700&r1=1612699&r2=1612700&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java Tue Jul 22 20:44:26 2014
@@ -163,16 +163,16 @@ public class WordParserTest extends Tika
@Test
public void testEmbeddedRTF() throws Exception {
String result = getXML("testWORD_embedded_rtf.doc").xml;
- assertTrue(result.indexOf("<div class=\"embedded\" id=\"_1404039792\" />") != -1);
- assertTrue(result.indexOf("_1404039792.rtf") != -1);
+ assertTrue(result.contains("<div class=\"embedded\" id=\"_1404039792\" />"));
+ assertTrue(result.contains("_1404039792.rtf"));
}
// TIKA-1019
@Test
public void testDocumentLink() throws Exception {
String result = getXML("testDocumentLink.doc").xml;
- assertTrue(result.indexOf("<div class=\"embedded\" id=\"_1327495610\" />") != -1);
- assertTrue(result.indexOf("_1327495610.unknown") != -1);
+ assertTrue(result.contains("<div class=\"embedded\" id=\"_1327495610\" />"));
+ assertTrue(result.contains("_1327495610.unknown"));
}
@Test
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java?rev=1612700&r1=1612699&r2=1612700&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java Tue Jul 22 20:44:26 2014
@@ -655,7 +655,7 @@ public class PDFParserTest extends TikaT
//This just tests that a RuntimeException is not thrown.
//TODO: find a better test file for this issue.
String xml = getXML("/testPDF_acroform3.pdf").xml;
- assertTrue("found", (xml.indexOf("<li>aTextField: TIKA-1226</li>") > -1));
+ assertTrue("found", (xml.contains("<li>aTextField: TIKA-1226</li>")));
}
@Test // TIKA-1228, TIKA-1268