From db5d301dc75c91b234ed8fe277e81766a58c50e3 Mon Sep 17 00:00:00 2001 From: PeterAlfredLee Date: Tue, 13 Oct 2020 16:06:38 +0800 Subject: [PATCH] Modify some code use for-each loop --- .../java/org/apache/tika/cli/TikaCLI.java | 4 +- .../java/org/apache/tika/fork/ForkClient.java | 4 +- .../org/apache/tika/io/FilenameUtils.java | 4 +- .../language/LanguageProfilerBuilder.java | 9 +- .../org/apache/tika/metadata/Metadata.java | 25 +++-- .../java/org/apache/tika/mime/MimeTypes.java | 6 +- .../org/apache/tika/utils/ParserUtils.java | 4 +- .../apache/tika/detect/MagicDetectorTest.java | 4 +- .../apache/tika/detect/TextDetectorTest.java | 4 +- .../metadata/filter/MockUpperCaseFilter.java | 4 +- .../apache/tika/eval/io/ExtractReader.java | 3 +- .../apache/tika/eval/ProfilerBatchTest.java | 4 +- .../org/apache/tika/example/RecentFiles.java | 4 +- .../fuzzing/general/GeneralTransformer.java | 6 +- .../langdetect/opennlp/OpenNLPDetector.java | 6 +- .../apache/tika/parser/crypto/TSDParser.java | 12 +-- .../apache/tika/parser/pdf/PDFParserTest.java | 4 +- .../parser/microsoft/JackcessExtractor.java | 7 +- .../tika/parser/microsoft/ListManager.java | 4 +- .../ooxml/OOXMLExtractorFactory.java | 3 +- .../XSLFPowerPointExtractorDecorator.java | 33 ++++--- .../org/apache/tika/parser/dbf/DBFReader.java | 4 +- .../tika/parser/ocr/TesseractOCRConfig.java | 8 +- .../tf/TensorflowRESTCaptioner.java | 4 +- .../parser/ctakes/CTAKESContentHandler.java | 4 +- .../tika/parser/geo/NameEntityExtractor.java | 12 +-- .../parser/ner/grobid/GrobidNERecogniser.java | 96 +++++++++---------- .../parser/ner/nltk/NLTKNERecogniser.java | 5 +- .../tika/parser/isatab/ISATabUtils.java | 50 +++++----- .../JsonMetadataDeserializer.java | 4 +- .../serialization/JsonMetadataSerializer.java | 4 +- .../org/apache/tika/server/TikaServerCli.java | 6 +- .../tika/server/TikaServerWatchDog.java | 8 +- 33 files changed, 169 insertions(+), 190 deletions(-) diff --git a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java index a3cb9b3e6b3..613537de2a7 100644 --- a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java +++ b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java @@ -146,8 +146,8 @@ public static void main(String[] args) throws Exception { } if (args.length > 0) { - for (int i = 0; i < args.length; i++) { - cli.process(args[i]); + for (String arg : args) { + cli.process(arg); } if (cli.pipeMode) { cli.process("-"); diff --git a/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java b/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java index c79e31c83c2..0c91cef85c1 100644 --- a/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java +++ b/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java @@ -203,8 +203,8 @@ public synchronized Throwable call(String method, Object... args) List r = new ArrayList<>(resources); output.writeByte(ForkServer.CALL); output.writeUTF(method); - for (int i = 0; i < args.length; i++) { - sendObject(args[i], r); + for (Object arg : args) { + sendObject(arg, r); } return waitForResponse(r); } diff --git a/tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java b/tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java index 59caf7b2778..d94d10d3994 100644 --- a/tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java +++ b/tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java @@ -38,8 +38,8 @@ public class FilenameUtils { static { - for (int i=0; i> i = metadata.entrySet().iterator(); - i.hasNext();) { - h += getMetadataEntryHashCode(i.next()); + for (Entry stringEntry : metadata.entrySet()) { + h += getMetadataEntryHashCode(stringEntry); } return h; } @@ -534,9 +533,9 @@ public boolean equals(Object o) { } String[] names = names(); - for (int i = 0; i < names.length; i++) { - String[] otherValues = other._getValues(names[i]); - String[] thisValues = _getValues(names[i]); + for (String name : names) { + String[] otherValues = other._getValues(name); + String[] thisValues = _getValues(name); if (otherValues.length != thisValues.length) { return false; } @@ -552,13 +551,13 @@ public boolean equals(Object o) { public String toString() { StringBuffer buf = new StringBuffer(); String[] names = names(); - for (int i = 0; i < names.length; i++) { - String[] values = _getValues(names[i]); - for (int j = 0; j < values.length; j++) { - if (buf.length() > 0) { - buf.append(" "); - } - buf.append(names[i]).append("=").append(values[j]); + for (String name : names) { + String[] values = _getValues(name); + for (String value : values) { + if (buf.length() > 0) { + buf.append(" "); + } + buf.append(name).append("=").append(value); } } return buf.toString(); diff --git a/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java b/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java index 7629c528a2d..4498f7d39ab 100644 --- a/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java +++ b/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java @@ -560,10 +560,8 @@ private List applyHint(List possibleTypes, MimeType hint) { if (possibleTypes == null || possibleTypes.isEmpty()) { return Collections.singletonList(hint); } else { - for (int i=0; i loadExtract(Path extractFile) throws ExtractReaderExceptio metadataList.size() > 1) { StringBuilder sb = new StringBuilder(); Metadata containerMetadata = metadataList.get(0); - for (int i = 0; i < metadataList.size(); i++) { - Metadata m = metadataList.get(i); + for (Metadata m : metadataList) { String c = m.get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT); if (c != null) { sb.append(c); diff --git a/tika-eval/src/test/java/org/apache/tika/eval/ProfilerBatchTest.java b/tika-eval/src/test/java/org/apache/tika/eval/ProfilerBatchTest.java index 9d0e37e9531..7cfa9cdc2f1 100644 --- a/tika-eval/src/test/java/org/apache/tika/eval/ProfilerBatchTest.java +++ b/tika-eval/src/test/java/org/apache/tika/eval/ProfilerBatchTest.java @@ -86,9 +86,7 @@ public static void tearDown() throws IOException { DirectoryStream dStream = Files.newDirectoryStream(dbDir); - Iterator it = dStream.iterator(); - while (it.hasNext()) { - Path p = it.next(); + for (Path p : dStream) { Files.delete(p); } dStream.close(); diff --git a/tika-example/src/main/java/org/apache/tika/example/RecentFiles.java b/tika-example/src/main/java/org/apache/tika/example/RecentFiles.java index 5a8b765d978..6c79b647bad 100755 --- a/tika-example/src/main/java/org/apache/tika/example/RecentFiles.java +++ b/tika-example/src/main/java/org/apache/tika/example/RecentFiles.java @@ -71,8 +71,8 @@ public String generateRSS(Path indexFile) throws CorruptIndexException, TopScoreDocCollector collector = TopScoreDocCollector.create(20,10000); searcher.search(query, collector); ScoreDoc[] hits = collector.topDocs().scoreDocs; - for (int i = 0; i < hits.length; i++) { - Document doc = searcher.doc(hits[i].doc); + for (ScoreDoc hit : hits) { + Document doc = searcher.doc(hit.doc); output.append(getRSSItem(doc)); } diff --git a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/general/GeneralTransformer.java b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/general/GeneralTransformer.java index 32ede3bf04b..d0478fdd7aa 100644 --- a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/general/GeneralTransformer.java +++ b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/general/GeneralTransformer.java @@ -80,14 +80,14 @@ public void transform(InputStream is, OutputStream os) throws IOException, TikaE //TODO -- make this actually streaming ByteArrayOutputStream bos = new ByteArrayOutputStream(); IOUtils.copy(is, bos); - for (int i = 0; i < transformerIndices.length; i++) { + for (int transformerIndex : transformerIndices) { byte[] bytes = bos.toByteArray(); bos = new ByteArrayOutputStream(); - transformers[transformerIndices[i]].transform( + transformers[transformerIndex].transform( new ByteArrayInputStream(bytes), bos); bos.flush(); if (bos.toByteArray().length == 0) { - LOG.warn("zero length: "+transformers[transformerIndices[i]]); + LOG.warn("zero length: " + transformers[transformerIndex]); } } os.write(bos.toByteArray()); diff --git a/tika-langdetect/tika-langdetect-opennlp/src/main/java/org/apache/tika/langdetect/opennlp/OpenNLPDetector.java b/tika-langdetect/tika-langdetect-opennlp/src/main/java/org/apache/tika/langdetect/opennlp/OpenNLPDetector.java index 6a67bc48066..6451c3029ee 100644 --- a/tika-langdetect/tika-langdetect-opennlp/src/main/java/org/apache/tika/langdetect/opennlp/OpenNLPDetector.java +++ b/tika-langdetect/tika-langdetect-opennlp/src/main/java/org/apache/tika/langdetect/opennlp/OpenNLPDetector.java @@ -155,9 +155,9 @@ public void addText(char[] cbuf, int off, int len) { public List detectAll() { Language[] langs = detector.predictLanguages(buffer.toString()); List results = new ArrayList<>(); - for (int i = 0; i < langs.length; i++) { - LanguageResult r = new LanguageResult(langs[i].getLang(), getConfidence(langs[i].getConfidence()), - (float)langs[i].getConfidence()); + for (Language lang : langs) { + LanguageResult r = new LanguageResult(lang.getLang(), getConfidence(lang.getConfidence()), + (float) lang.getConfidence()); results.add(r); } return results; diff --git a/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/TSDParser.java b/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/TSDParser.java index f8410665603..1b48ccbc44e 100644 --- a/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/TSDParser.java +++ b/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/TSDParser.java @@ -117,13 +117,13 @@ private List extractMetas(InputStream stream) { TimeStampToken[] tokens = cmsTimeStampedData.getTimeStampTokens(); - for (int i = 0; i < tokens.length; i++) { + for (TimeStampToken token : tokens) { TSDMetas tsdMetas = new TSDMetas(true, - tokens[i].getTimeStampInfo().getGenTime(), - tokens[i].getTimeStampInfo().getPolicy().getId(), - tokens[i].getTimeStampInfo().getSerialNumber(), - tokens[i].getTimeStampInfo().getTsa(), - tokens[i].getTimeStampInfo().getHashAlgorithm().getAlgorithm().getId()); + token.getTimeStampInfo().getGenTime(), + token.getTimeStampInfo().getPolicy().getId(), + token.getTimeStampInfo().getSerialNumber(), + token.getTimeStampInfo().getTsa(), + token.getTimeStampInfo().getHashAlgorithm().getAlgorithm().getId()); tsdMetasList.add(tsdMetas); } diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java index 54d49158506..fea0bffa13a 100644 --- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java +++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java @@ -104,8 +104,8 @@ public void testXMLProfiler() throws Exception { int xmlProfilers = 0; for (Metadata metadata : metadataList) { String[] parsedBy = metadata.getValues("X-Parsed-By"); - for (int i = 0; i < parsedBy.length; i++) { - if (parsedBy[i].equals(XMLProfiler.class.getCanonicalName())) { + for (String s : parsedBy) { + if (s.equals(XMLProfiler.class.getCanonicalName())) { xmlProfilers++; } } diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java index 1443d063589..05ec115e862 100644 --- a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java +++ b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java @@ -143,12 +143,7 @@ public void parse(Database db, XHTMLContentHandler xhtml) throws IOException, SA } - Iterator it = db.newIterable(). - setIncludeLinkedTables(false). - setIncludeSystemTables(false).iterator(); - - while (it.hasNext()) { - Table table = it.next(); + for (Table table : db.newIterable().setIncludeLinkedTables(false).setIncludeSystemTables(false)) { String tableName = table.getName(); List columns = table.getColumns(); xhtml.startElement("table", "name", tableName); diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java index 6c5a5f1a181..e8a799a5df0 100644 --- a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java +++ b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java @@ -139,8 +139,8 @@ private String convertToNewNumberText(String numberText, byte[] numberOffsets) { StringBuilder sb = new StringBuilder(); int last = 0; - for (int i = 0; i < numberOffsets.length; i++) { - int offset = (int) numberOffsets[i]; + for (byte numberOffset : numberOffsets) { + int offset = (int) numberOffset; if (offset == 0) { break; diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java index b70046323ec..f0af25b9d8e 100644 --- a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java +++ b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java @@ -280,8 +280,7 @@ private static POIXMLTextExtractor tryXSLF(OPCPackage pkg, boolean eventBased) t XSLFRelation[] xslfRelations = org.apache.poi.xslf.extractor.XSLFPowerPointExtractor.SUPPORTED_TYPES; - for (int i = 0; i < xslfRelations.length; i++) { - XSLFRelation xslfRelation = xslfRelations[i]; + for (XSLFRelation xslfRelation : xslfRelations) { if (xslfRelation.getContentType().equals(targetContentType)) { if (eventBased) { return new XSLFEventBasedPowerPointExtractor(pkg); diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java index c63fcb3700d..2b7e5ce8ee1 100644 --- a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java +++ b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java @@ -142,27 +142,26 @@ protected void buildXHTML(XHTMLContentHandler xhtml) throws SAXException, IOExce List comments = slide.getComments(); if (comments != null) { StringBuilder authorStringBuilder = new StringBuilder(); - for (int i = 0; i < comments.size(); i++) { + for (XSLFComment comment : comments) { authorStringBuilder.setLength(0); - XSLFComment comment = comments.get(i); xhtml.startElement("p", "class", "slide-comment"); - if (comment.getAuthor() != null) { - authorStringBuilder.append(comment.getAuthor()); - } - if (comment.getAuthorInitials() != null) { - if (authorStringBuilder.length() > 0) { - authorStringBuilder.append(" "); - } - authorStringBuilder.append("("+comment.getAuthorInitials()+")"); - } - if (comment.getText() != null && authorStringBuilder.length() > 0) { - authorStringBuilder.append(" - "); - } + if (comment.getAuthor() != null) { + authorStringBuilder.append(comment.getAuthor()); + } + if (comment.getAuthorInitials() != null) { if (authorStringBuilder.length() > 0) { - xhtml.startElement("b"); - xhtml.characters(authorStringBuilder.toString()); - xhtml.endElement("b"); + authorStringBuilder.append(" "); } + authorStringBuilder.append("(" + comment.getAuthorInitials() + ")"); + } + if (comment.getText() != null && authorStringBuilder.length() > 0) { + authorStringBuilder.append(" - "); + } + if (authorStringBuilder.length() > 0) { + xhtml.startElement("b"); + xhtml.characters(authorStringBuilder.toString()); + xhtml.endElement("b"); + } xhtml.characters(comment.getText()); xhtml.endElement("p"); diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFReader.java b/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFReader.java index b70898b9567..9ec2d6a2074 100644 --- a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFReader.java +++ b/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFReader.java @@ -167,8 +167,8 @@ private boolean fillRow(DBFRow row) throws IOException, TikaException { row.setDeleted(isDeleted); boolean readSomeContent = false; - for (int i = 0; i < cells.length; i++) { - if (cells[i].read(is)) { + for (DBFCell cell : cells) { + if (cell.read(is)) { readSomeContent = true; } } diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java b/tika-parser-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java index bdd6eb590ac..7b11a7d3040 100644 --- a/tika-parser-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java +++ b/tika-parser-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java @@ -445,8 +445,8 @@ public int getDepth() { */ public void setDepth(int depth) { int[] allowedValues = {2, 4, 8, 16, 32, 64, 256, 4096}; - for (int i = 0; i < allowedValues.length; i++) { - if (depth == allowedValues[i]) { + for (int allowedValue : allowedValues) { + if (depth == allowedValue) { this.depth = depth; return; } @@ -493,8 +493,8 @@ public void setFilter(String filter) { } String[] allowedFilters = {"Point", "Hermite", "Cubic", "Box", "Gaussian", "Catrom", "Triangle", "Quadratic", "Mitchell"}; - for (int i = 0; i < allowedFilters.length; i++) { - if (filter.equalsIgnoreCase(allowedFilters[i])) { + for (String allowedFilter : allowedFilters) { + if (filter.equalsIgnoreCase(allowedFilter)) { this.filter = filter; return; } diff --git a/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java index 04292ee1c68..49f0b2cb1bf 100644 --- a/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java +++ b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java @@ -152,8 +152,8 @@ public List recognise(InputStream stream, if (response.getStatusLine().getStatusCode() == 200) { JSONObject jReply = (JSONObject) new JSONParser().parse(replyMessage); JSONArray jCaptions = (JSONArray) jReply.get("captions"); - for (int i = 0; i < jCaptions.size(); i++) { - JSONObject jCaption = (JSONObject) jCaptions.get(i); + for (Object caption : jCaptions) { + JSONObject jCaption = (JSONObject) caption; String sentence = (String) jCaption.get("sentence"); Double confidence = (Double) jCaption.get("confidence"); capObjs.add(new CaptionObject(sentence, LABEL_LANG, confidence)); diff --git a/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java index 422b4b52061..84ff807973a 100644 --- a/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java +++ b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java @@ -139,9 +139,7 @@ public void endDocument() throws SAXException { metadata.add(CTAKES_META_PREFIX + "schema", config.getAnnotationPropsAsString()); CTAKESAnnotationProperty[] annotationPros = config.getAnnotationProps(); Collection collection = JCasUtil.select(jcas, IdentifiedAnnotation.class); - Iterator iterator = collection.iterator(); - while (iterator.hasNext()) { - IdentifiedAnnotation annotation = iterator.next(); + for (IdentifiedAnnotation annotation : collection) { StringBuilder annotationBuilder = new StringBuilder(); annotationBuilder.append(annotation.getCoveredText()); if (annotationPros != null) { diff --git a/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java index c998e40ae19..23dc98fdb94 100644 --- a/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java +++ b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java @@ -90,12 +90,12 @@ public void getBestNameEntity() { if (this.locationNameEntities.size() == 0) return; - for (int i = 0; i < this.locationNameEntities.size(); ++i) { - if (tf.containsKey(this.locationNameEntities.get(i))) - tf.put(this.locationNameEntities.get(i), - tf.get(this.locationNameEntities.get(i)) + 1); - else - tf.put(this.locationNameEntities.get(i), 1); + for (String locationNameEntity : this.locationNameEntities) { + if (tf.containsKey(locationNameEntity)) { + tf.put(locationNameEntity, tf.get(locationNameEntity) + 1); + } else { + tf.put(locationNameEntity, 1); + } } int max = 0; List> list = new ArrayList>( diff --git a/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java index 696836e3365..9185d601d5f 100644 --- a/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java +++ b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java @@ -169,54 +169,54 @@ public Map> recognise(String text) { String result = response.readEntity(String.class); JSONObject jsonObject = convertToJSONObject(result); JSONArray measurements = convertToJSONArray(jsonObject, "measurements"); - for(int i=0; i> recognise(String text) { String result = response.readEntity(String.class); JSONParser parser = new JSONParser(); JSONObject j = (JSONObject) parser.parse(result); - Iterator keys = j.keySet().iterator(); - while( keys.hasNext() ) { - String key = (String)keys.next(); + for (Object o : j.keySet()) { + String key = (String) o; if ( !key.equals("result") ) { ENTITY_TYPES.add(key); entities.put(key.toUpperCase(Locale.ENGLISH), new HashSet((Collection) j.get(key))); diff --git a/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java index 1745da3aa1b..eea2381b04e 100644 --- a/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java +++ b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java @@ -169,33 +169,31 @@ private static void extractMetadata(Reader reader, Metadata metadata, String stu Map map = new HashMap(); try (CSVParser csvParser = new CSVParser(reader, CSVFormat.TDF)) { - Iterator iterator = csvParser.iterator(); - while (iterator.hasNext()) { - CSVRecord record = iterator.next(); - String field = record.get(0); - if ((field.toUpperCase(Locale.ENGLISH).equals(field)) && (record.size() == 1)) { - investigationSection = Arrays.asList(sections).contains(field); - studySection = (studyFileName != null) && (field.equals(studySectionField)); - } else { - if (investigationSection) { - addMetadata(field, record, metadata); - } else if (studySection) { - if (studyTarget) { - break; - } - String value = record.get(1); - map.put(field, value); - studyTarget = (field.equals(studyFileNameField)) && (value.equals(studyFileName)); - if (studyTarget) { - mapStudyToMetadata(map, metadata); - studySection = false; - } - } else if (studyTarget) { - addMetadata(field, record, metadata); - } - } - } + for (CSVRecord record : csvParser) { + String field = record.get(0); + if ((field.toUpperCase(Locale.ENGLISH).equals(field)) && (record.size() == 1)) { + investigationSection = Arrays.asList(sections).contains(field); + studySection = (studyFileName != null) && (field.equals(studySectionField)); + } else { + if (investigationSection) { + addMetadata(field, record, metadata); + } else if (studySection) { + if (studyTarget) { + break; + } + String value = record.get(1); + map.put(field, value); + studyTarget = (field.equals(studyFileNameField)) && (value.equals(studyFileName)); + if (studyTarget) { + mapStudyToMetadata(map, metadata); + studySection = false; + } + } else if (studyTarget) { + addMetadata(field, record, metadata); + } + } + } } catch (IOException ioe) { throw ioe; } diff --git a/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataDeserializer.java b/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataDeserializer.java index 451e201ba2e..fae01416d22 100644 --- a/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataDeserializer.java +++ b/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataDeserializer.java @@ -62,9 +62,7 @@ public Metadata deserialize(JsonElement element, Type type, m.set(key, v.getAsString()); } else if (v.isJsonArray()){ JsonArray vArr = v.getAsJsonArray(); - Iterator itr = vArr.iterator(); - while (itr.hasNext()){ - JsonElement valueItem = itr.next(); + for (JsonElement valueItem : vArr) { m.add(key, valueItem.getAsString()); } diff --git a/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java b/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java index ae49fc8ee6f..602c346c3ec 100644 --- a/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java +++ b/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java @@ -73,8 +73,8 @@ public JsonElement serialize(Metadata metadata, Type type, JsonSerializationCont root.addProperty(n, vals[0]); } else { JsonArray jArr = new JsonArray(); - for (int i = 0; i < vals.length; i++) { - jArr.add(new JsonPrimitive(vals[i])); + for (String val : vals) { + jArr.add(new JsonPrimitive(val)); } root.add(n, jArr); } diff --git a/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java b/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java index 9f7b444f977..9d034e7379d 100644 --- a/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java +++ b/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java @@ -167,9 +167,9 @@ private static void execute(String[] args) throws Exception { private static String[] stripChildArgs(String[] args) { List ret = new ArrayList<>(); - for (int i = 0; i < args.length; i++) { - if (! args[i].startsWith("-J")) { - ret.add(args[i]); + for (String arg : args) { + if (!arg.startsWith("-J")) { + ret.add(arg); } } return ret.toArray(new String[ret.size()]); diff --git a/tika-server/src/main/java/org/apache/tika/server/TikaServerWatchDog.java b/tika-server/src/main/java/org/apache/tika/server/TikaServerWatchDog.java index bb4767884ad..d630d6a0906 100644 --- a/tika-server/src/main/java/org/apache/tika/server/TikaServerWatchDog.java +++ b/tika-server/src/main/java/org/apache/tika/server/TikaServerWatchDog.java @@ -194,11 +194,11 @@ private static String extractJavaPath(String[] args) { private static List extractJVMArgs(String[] args) { List jvmArgs = new ArrayList<>(); boolean foundHeadlessOption = false; - for (int i = 0; i < args.length; i++) { - if (args[i].startsWith("-J")) { - jvmArgs.add("-"+args[i].substring(2)); + for (String arg : args) { + if (arg.startsWith("-J")) { + jvmArgs.add("-" + arg.substring(2)); } - if (args[i].contains("java.awt.headless")) { + if (arg.contains("java.awt.headless")) { foundHeadlessOption = true; } }