You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2017/05/30 17:43:03 UTC

[tika] branch master updated (95292dd -> 99a6db5)

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.

      from  95292dd   [maven-release-plugin] prepare for next development iteration
       new  49f3530   fix indents/whitespace
       new  f718cb9   fix indents/whitespace
       new  b290cd7   TIKA-1804 -- convert json parsing to SAX in TEIParser, step 1: test current output.
       new  34ae621   update key with signatures
       new  99a6db5   Merge remote-tracking branch 'origin/master'

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 KEYS                                               |  174 ++-
 .../org/apache/tika/parser/journal/TEIParser.java  | 1413 ++++++++++----------
 .../tika/parser/journal/JournalParserTest.java     |   46 +-
 .../org/apache/tika/parser/journal/TEITest.java    |   67 +
 .../src/test/resources/test-documents/testTEI.xml  |  134 ++
 5 files changed, 1081 insertions(+), 753 deletions(-)
 create mode 100644 tika-parsers/src/test/java/org/apache/tika/parser/journal/TEITest.java
 create mode 100644 tika-parsers/src/test/resources/test-documents/testTEI.xml

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].

[tika] 05/05: Merge remote-tracking branch 'origin/master'

Posted by ta...@apache.org.
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

commit 99a6db5c310f4d8d1d114f3eb0da97b12cf38bbe
Merge: 34ae621 95292dd
Author: tballison <ta...@mitre.org>
AuthorDate: Tue May 30 13:42:42 2017 -0400

    Merge remote-tracking branch 'origin/master'

 pom.xml                    | 2 +-
 tika-app/pom.xml           | 2 +-
 tika-batch/pom.xml         | 2 +-
 tika-bundle/pom.xml        | 2 +-
 tika-core/pom.xml          | 2 +-
 tika-dl/pom.xml            | 2 +-
 tika-eval/pom.xml          | 2 +-
 tika-example/pom.xml       | 2 +-
 tika-java7/pom.xml         | 2 +-
 tika-langdetect/pom.xml    | 2 +-
 tika-parent/pom.xml        | 2 +-
 tika-parsers/pom.xml       | 2 +-
 tika-serialization/pom.xml | 2 +-
 tika-server/pom.xml        | 2 +-
 tika-translate/pom.xml     | 2 +-
 tika-xmp/pom.xml           | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.

[tika] 03/05: TIKA-1804 -- convert json parsing to SAX in TEIParser, step 1: test current output.

Posted by ta...@apache.org.
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

commit b290cd79d652741a0c8249f3860583b4169f6455
Author: tballison <ta...@mitre.org>
AuthorDate: Thu May 25 09:41:38 2017 -0400

    TIKA-1804 -- convert json parsing to SAX in TEIParser, step 1: test current output.
---
 .../org/apache/tika/parser/journal/TEITest.java    |  67 +++++++++++
 .../src/test/resources/test-documents/testTEI.xml  | 134 +++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/journal/TEITest.java b/tika-parsers/src/test/java/org/apache/tika/parser/journal/TEITest.java
new file mode 100644
index 0000000..0c456de
--- /dev/null
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/journal/TEITest.java
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tika.parser.journal;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.tika.TikaTest;
+import org.apache.tika.io.IOUtils;
+import org.apache.tika.metadata.Metadata;
+import org.junit.Test;
+
+public class TEITest extends TikaTest {
+
+    @Test
+    public void testCurrent() throws Exception {
+        TEIParser teiParser = new TEIParser();
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        try (InputStream is = getResourceAsStream("/test-documents/testTEI.xml")) {
+            IOUtils.copy(is, bos);
+        }
+        String xml = new String (bos.toByteArray(), StandardCharsets.UTF_8);
+        Metadata metadata = teiParser.parse(xml);
+        assertEquals("Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, " +
+                "Montbonnot Saint-Martin, null \"38330, 38330, 38330, 38330\" " +
+                "France, France, France, France ", metadata.get("Address"));
+        String[] keywords = new String[]{
+                "\"F22 [Analysis of Algorithms and Problem Complexity]: Nonnumerical Algorithms and Problems\\u2014Sequencing\"",
+                "\"and scheduling; D41 [Operating Systems]: Process management\\u2014Scheduling, Concurrency\"",
+                "\"Keywords\"",
+                "\"Parallel Computing, Algorithms, Scheduling, Parallel Tasks,\"",
+                "\"Moldable Tasks, Bi-criteria\""
+        };
+        assertArrayEquals(keywords, metadata.getValues("Keyword"));
+        assertEquals("Pierre-François  Dutot 1 Lionel  Eyraud 1 Grégory  Gr´ 1 Grégory  Mouní 1 Denis  Trystram 1 ",
+                metadata.get("Authors"));
+        assertEquals("Bi-criteria Algorithm for Scheduling Jobs on Cluster Platforms *",
+                metadata.get("Title"));
+        assertEquals("1 ID-IMAG ID-IMAG ID-IMAG ID-IMAG", metadata.get("Affiliation"));
+        assertEquals("[Affiliation {orgName=ID-IMAG ID-IMAG ID-IMAG ID-IMAG , " +
+                        "address=Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, " +
+                        "null \"38330, 38330, 38330, 38330\" France, France, France, France}" +
+                        "[Affiliation {orgName=ID-IMAG ID-IMAG ID-IMAG ID-IMAG , " +
+                        "address=Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, " +
+                        "null \"38330, 38330, 38330, 38330\" France, France, France, France}]",
+                metadata.get("FullAffiliations"));
+    }
+}
diff --git a/tika-parsers/src/test/resources/test-documents/testTEI.xml b/tika-parsers/src/test/resources/test-documents/testTEI.xml
new file mode 100644
index 0000000..dcba596
--- /dev/null
+++ b/tika-parsers/src/test/resources/test-documents/testTEI.xml
@@ -0,0 +1,134 @@
+<TEI xmlns="http://www.tei-c.org/ns/1.0"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://www.tei-c.org/ns/1.0 C:\grobid\grobid-home/schemas/xsd/Grobid.xsd"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+    <teiHeader xml:lang="en">
+        <encodingDesc>
+            <appInfo>
+                <application version="0.4.2-SNAPSHOT" ident="GROBID" when="2017-05-25T13:02+0000">
+                    <ref target="https://github.com/kermitt2/grobid">GROBID - A machine learning software for extracting information from scholarly documents</ref>
+                </application>
+            </appInfo>
+        </encodingDesc>
+        <fileDesc>
+            <titleStmt>
+                <title level="a" type="main">Bi-criteria Algorithm for Scheduling Jobs on Cluster Platforms *</title>
+            </titleStmt>
+            <publicationStmt>
+                <publisher/>
+                <availability status="unknown"><licence/></availability>
+                <date>June 27–30, 2004</date>
+            </publicationStmt>
+            <sourceDesc>
+                <biblStruct>
+                    <analytic>
+                        <author>
+                            <persName xmlns="http://www.tei-c.org/ns/1.0"><forename type="first">Pierre-François</forename><surname>Dutot</surname></persName>
+                            <email>pfdutot@imag.fr</email>
+                            <affiliation key="aff0">
+                                <orgName type="department" key="dep1">ID-IMAG</orgName>
+                                <orgName type="department" key="dep2">ID-IMAG</orgName>
+                                <orgName type="department" key="dep3">ID-IMAG</orgName>
+                                <orgName type="institution">ID-IMAG</orgName>
+                                <address>
+                                    <addrLine>51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann</addrLine>
+                                    <postCode>38330, 38330, 38330, 38330</postCode>
+                                    <settlement>Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin</settlement>
+                                    <country>France, France, France, France</country>
+                                </address>
+                            </affiliation>
+                        </author>
+                        <author>
+                            <persName xmlns="http://www.tei-c.org/ns/1.0"><forename type="first">Lionel</forename><surname>Eyraud</surname></persName>
+                            <email>Lionel.Eyraud@imag.fr</email>
+                            <affiliation key="aff0">
+                                <orgName type="department" key="dep1">ID-IMAG</orgName>
+                                <orgName type="department" key="dep2">ID-IMAG</orgName>
+                                <orgName type="department" key="dep3">ID-IMAG</orgName>
+                                <orgName type="institution">ID-IMAG</orgName>
+                                <address>
+                                    <addrLine>51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann</addrLine>
+                                    <postCode>38330, 38330, 38330, 38330</postCode>
+                                    <settlement>Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin</settlement>
+                                    <country>France, France, France, France</country>
+                                </address>
+                            </affiliation>
+                        </author>
+                        <author>
+                            <persName xmlns="http://www.tei-c.org/ns/1.0"><forename type="first">Grégory</forename><surname>Gr´</surname></persName>
+                            <affiliation key="aff0">
+                                <orgName type="department" key="dep1">ID-IMAG</orgName>
+                                <orgName type="department" key="dep2">ID-IMAG</orgName>
+                                <orgName type="department" key="dep3">ID-IMAG</orgName>
+                                <orgName type="institution">ID-IMAG</orgName>
+                                <address>
+                                    <addrLine>51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann</addrLine>
+                                    <postCode>38330, 38330, 38330, 38330</postCode>
+                                    <settlement>Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin</settlement>
+                                    <country>France, France, France, France</country>
+                                </address>
+                            </affiliation>
+                        </author>
+                        <author>
+                            <persName xmlns="http://www.tei-c.org/ns/1.0"><forename type="first">Grégory</forename><surname>Mouní</surname></persName>
+                            <email>Gregory.Mounie@imag.fr</email>
+                            <affiliation key="aff0">
+                                <orgName type="department" key="dep1">ID-IMAG</orgName>
+                                <orgName type="department" key="dep2">ID-IMAG</orgName>
+                                <orgName type="department" key="dep3">ID-IMAG</orgName>
+                                <orgName type="institution">ID-IMAG</orgName>
+                                <address>
+                                    <addrLine>51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann</addrLine>
+                                    <postCode>38330, 38330, 38330, 38330</postCode>
+                                    <settlement>Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin</settlement>
+                                    <country>France, France, France, France</country>
+                                </address>
+                            </affiliation>
+                        </author>
+                        <author>
+                            <persName xmlns="http://www.tei-c.org/ns/1.0"><forename type="first">Denis</forename><surname>Trystram</surname></persName>
+                            <email>Denis.Trystram@imag.fr</email>
+                            <affiliation key="aff0">
+                                <orgName type="department" key="dep1">ID-IMAG</orgName>
+                                <orgName type="department" key="dep2">ID-IMAG</orgName>
+                                <orgName type="department" key="dep3">ID-IMAG</orgName>
+                                <orgName type="institution">ID-IMAG</orgName>
+                                <address>
+                                    <addrLine>51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann, 51 avenue Jean Kuntzmann</addrLine>
+                                    <postCode>38330, 38330, 38330, 38330</postCode>
+                                    <settlement>Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin, Montbonnot Saint-Martin</settlement>
+                                    <country>France, France, France, France</country>
+                                </address>
+                            </affiliation>
+                        </author>
+                        <title level="a" type="main">Bi-criteria Algorithm for Scheduling Jobs on Cluster Platforms *</title>
+                    </analytic>
+                    <monogr>
+                        <meeting> <address><addrLine>Barcelona, Spain</addrLine></address>
+                        </meeting>
+                        <imprint>
+                            <date type="published">June 27–30, 2004</date>
+                        </imprint>
+                    </monogr>
+                    <note>Permission to make digital or hard copies of all or part of this work for personal or classroom use is granted without fee provided that copies are not made or distributed for profit or commercial advantage and that copies bear this notice and the full citation on the first page. To copy otherwise, to republish, to post on servers or to redistribute to lists, requires prior specific permission and/or a fee. ACM 1-58113-840-7/04/0006 ...$5.00.</note>
+                </biblStruct>
+            </sourceDesc>
+        </fileDesc>
+        <profileDesc>
+            <textClass>
+                <keywords>
+                    <term>F22 [Analysis of Algorithms and Problem Complexity]: Nonnumerical Algorithms and Problems—Sequencing</term>
+                    <term>and scheduling; D41 [Operating Systems]: Process management—Scheduling, Concurrency</term>
+                    <term>Keywords</term>
+                    <term>Parallel Computing, Algorithms, Scheduling, Parallel Tasks,</term>
+                    <term>Moldable Tasks, Bi-criteria</term>
+                </keywords>
+            </textClass>
+            <abstract>
+                <p>We describe in this paper a new method for building an efficient algorithm for scheduling jobs in a cluster. Jobs are considered as parallel tasks (PT) which can be scheduled on any number of processors. The main feature is to consider two criteria that are optimized together. These criteria are the makespan and the weighted minimal average completion time (minsum). They are chosen for their complementarity, to be able to represent both user-oriented objectives and sys [...]
+            </abstract>
+        </profileDesc>
+    </teiHeader>
+    <text xml:lang="en">
+    </text>
+</TEI>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.

[tika] 04/05: update key with signatures

Posted by ta...@apache.org.
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

commit 34ae6214a43f634c461033fc27efb3911272cafa
Author: tballison <ta...@mitre.org>
AuthorDate: Tue May 30 13:41:45 2017 -0400

    update key with signatures
---
 KEYS | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 150 insertions(+), 24 deletions(-)

diff --git a/KEYS b/KEYS
index 5345fdc..03f07ea 100644
--- a/KEYS
+++ b/KEYS
@@ -352,6 +352,11 @@ sig          00B6899D 2017-05-17  Christopher L Tubbs II (Christopher) <ctubbsii
 sig          26518FEE 2017-05-18  Dale LaBossiere (CODE SIGNING KEY) <dl...@apache.org>
 sig 3        A400FD50 2017-05-16  Akira Ajisaka <aa...@apache.org>
 sig          9FCC82D0 2017-05-17  Benedikt Ritter (CODE SIGNING KEY) <br...@apache.org>
+sig          1AD84DFF 2017-05-26  Daniel Ruggeri (http://home.apache.org/~druggeri/) <dr...@apache.org>
+sig          9C1750C5 2017-05-26  Coty Sutherland <cs...@fedoraproject.org>
+sig          8BD1DCE8 2017-05-26  BigBlueHat <by...@bigbluehat.com>
+sig          47085518 2017-05-26  Marcus Christie (CODE SIGNING KEY) <ma...@apache.org>
+sig 3        0FB52BC6 2017-05-24  Ashish Paliwal <ap...@apache.org>
 sub   4096R/B0007A00 2017-05-16
 sig          EF0CF38A 2017-05-16  Tim Allison (ASF signing key) <ta...@apache.org>
 
@@ -382,28 +387,149 @@ tjJXXZ6bMJiV6PzCHXnQ5BEKTOE59+7TDxrlUrSYaDO5Aix3qEiyMhZZdZGv+2J2
 vXoThynV5N1GL3WDlctrg/r/BfbDW6y1OnhqZCdWy23wa6XV/IcNlr/YpwWNeYwC
 M/THN3qdwRj4o0FRbZIytQT+f0J1aPiKrTvZA30S3ocm99vwdI+zAW6iuEqZlVbB
 nPWFf4tJS69CjQKjHJ5WDjjs78vj+mIfoz/KUOln8ilwnl9Nq70hWGl1LIRgGA6C
-WLkCDQRZG1PtARAAtzHZX3pvUkBfkGn7GNxTtgY5ArRtXHrUBBMhba4LDKMUeonl
-OZz+7yd1ADoXDsA3OulcSYxB9XOD/W2qlgElrzF8NM5KcMca9te+rPci2Glq1smz
-OoLEvSqH/ykccglxbUXMXr5ov0GO4xOw4X+Mg6avTxPb1OXtYfaVLlX1cOAWCihe
-6aHlWb90Y2qqzNYd2uuouQOB2j4KOOJx0AMugSE8r1/o8NMvUZl9OYh8RLSMOa/V
-sbdmiyP9dlBFuSuGS8rBeM6iVMJoCupzkblm8FxwA/dmnJm8BIzYpt0BJqlwdzgj
-xRZO2xgGbx5yOe2fFkct9DEo2uP4QU47M16WxURKOY127ZDh3vS0PYGObel+dEAa
-n+2rAGLs//2ZhNgQIfct/IVHz9mJIqXr4NIN4aHR6iOGAtsgmLX+ZmG93yLkTOvn
-TKzIdbtQar7PJeQHzqwOwdOHfQ3vLiDF8fF0qrROMLVVzto20DoKm/dAqP2zQULC
-8ERrAy0AblMle7kuNwfdpch+fCQmrOe0Hd0DOHvRhRogPX3JLM9zi9TMf2uPpxyg
-32zOCZJMzwjYhwNxsgptPZ2aqvTuZr9WsmvWtNMbq8ngJo7/ioccKL5mYcZxp/uZ
-HhuQZmhc/eEIZIO9T5A2QLsNXnCy2gy/PGeoAqvv5683TbgfiJQz1C3mxBMAEQEA
-AYkCHwQYAQgACQUCWRtT7QIbDAAKCRDkAy3E7wzziuW2EACL1cfxjs3c6Yi/kwsH
-4xkLcGNmzTwLQJxOGx0+DWbPITM4mn4UXWsdMwDd50cG6jqXvatSp2Tv8N23/in+
-gQStZJ/CP6ItSg/RmXhs2DkQfvAZ+59DgACXtWLdLwvTGWIXXD1A2ATLmm7fjYQL
-yMmBzFdXCqlTxz6n7czXFbqFY7+o4OOGeAc9GacrYTxQt2xUvZ6jPrdle42M2dpz
-59hJh8CN065dgg5kU721f1vUqWXpdk/Lh++FJgo/O6fGZonZLZGW/u0BwpKDQe7x
-WRSHeGJ7YAevaxomdKqU3HrvkDDzkXwPjf85PrXtX7+nMwNGfGU8ewF7yCqFhp1J
-ALK/fpU2Vesd7Vg2qJI2YjpC+adhN1xdrzSD3OrJsFLZSO7bYQwc//s79XImc8f0
-BpUsvVhS456luUuclgpWoXaac+kODa/CGauooxaxYdXEcw1qXBc3gB94UW7LkGtn
-okaPb71vgUerYEVGkQkpKJTDsdOKLbRuWAWvjUDwzftUeJ9JY5sbDbKeYgon77JF
-MidkNRNMN+A6ya6AAMPYkE1ubrJ1G3C2Sewk9SWGZOi94+tOLdDKgG8syEr0+jcS
-DnEvQLJElLTZj0BAcfxRUA4yKGf+pSR0/mxA1iqOXgPI5c78Z8KJWaMskQwatNbg
-7O6yC0thE+4UcUfNqnRhkKoQYw==
-=NlkM
+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
+sgtLYRPuFHFHzap0YZCqEGM=
+=/R0q
 -----END PGP PUBLIC KEY BLOCK-----

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.

[tika] 01/05: fix indents/whitespace

Posted by ta...@apache.org.
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

commit 49f3530ea3540af21e0f6eda23fcd4c89728e5e4
Author: tballison <ta...@mitre.org>
AuthorDate: Thu May 25 08:41:14 2017 -0400

    fix indents/whitespace
---
 .../tika/parser/journal/JournalParserTest.java     | 46 +++++++++++-----------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
index 35cacaa..79c9ef8 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,11 +17,13 @@
 
 package org.apache.tika.parser.journal;
 
+import static org.apache.tika.parser.journal.GrobidRESTParser.canRun;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
-import static org.apache.tika.parser.journal.GrobidRESTParser.canRun;
+
 import java.io.InputStream;
+
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.sax.BodyContentHandler;
@@ -30,23 +32,23 @@ import org.xml.sax.ContentHandler;
 
 public class JournalParserTest {
 
-  @Test
-  public void testJournalParser() {
-    String path = "/test-documents/testJournalParser.pdf";
-    ContentHandler handler = new BodyContentHandler();
-    Metadata metadata = new Metadata();
-    
-    assumeTrue(canRun());
-    
-    InputStream stream = JournalParserTest.class.getResourceAsStream(path);
-    JournalParser jParser = new JournalParser();
-    try {
-      jParser.parse(stream, handler, metadata, new ParseContext());
-    } catch (Exception e){
-       e.printStackTrace();
-       fail(e.getMessage());
-    }
+    @Test
+    public void testJournalParser() {
+        String path = "/test-documents/testJournalParser.pdf";
+        ContentHandler handler = new BodyContentHandler();
+        Metadata metadata = new Metadata();
+
+        assumeTrue(canRun());
 
-    assertNotNull(metadata.get("grobid:header_Title"));
-  }
+        InputStream stream = JournalParserTest.class.getResourceAsStream(path);
+        JournalParser jParser = new JournalParser();
+        try {
+            jParser.parse(stream, handler, metadata, new ParseContext());
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+
+        assertNotNull(metadata.get("grobid:header_Title"));
+    }
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.

[tika] 02/05: fix indents/whitespace

Posted by ta...@apache.org.
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

commit f718cb9fbb2402745b0da69d1acd3b89a5a12246
Author: tballison <ta...@mitre.org>
AuthorDate: Thu May 25 09:20:43 2017 -0400

    fix indents/whitespace
---
 .../org/apache/tika/parser/journal/TEIParser.java  | 1413 ++++++++++----------
 1 file changed, 706 insertions(+), 707 deletions(-)

diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/journal/TEIParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/journal/TEIParser.java
index 4cff1d3..9806162 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/journal/TEIParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/journal/TEIParser.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,590 +22,589 @@ import java.util.List;
 
 import org.apache.tika.metadata.Metadata;
 import org.json.JSONArray;
-import org.json.JSONObject;
 import org.json.JSONException;
+import org.json.JSONObject;
 import org.json.XML;
 
 public class TEIParser {
 
-  public TEIParser() {
-  }
-
-  public Metadata parse(String source) {
-    JSONObject obj = XML.toJSONObject(source);
-    Metadata metadata = new Metadata();
-    createGrobidMetadata(source, obj, metadata);
-    return metadata;
-  }
-
-private void createGrobidMetadata(String source, JSONObject obj,
-      Metadata metadata) {
-    if (obj != null) {
-    try{
-      JSONObject teiHeader = obj.getJSONObject("TEI")
-          .getJSONObject("teiHeader");
-      if (teiHeader.has("text")) {
-        parseText(teiHeader.getJSONObject("text"), metadata);
-      }
-
-      if (teiHeader.has("fileDesc")) {
-        parseFileDesc(teiHeader.getJSONObject("fileDesc"), metadata);
-
-      }
-      if (teiHeader.has("profileDesc")) {
-        parseProfileDesc(teiHeader.getJSONObject("profileDesc"), metadata);
-      }
-      }
-      catch(JSONException e){
-        System.out.println("No TEI Object found.");
-      }
+    public TEIParser() {
     }
 
-    addStaticMet(source, obj, metadata);
-  }
+    public Metadata parse(String source) {
+        JSONObject obj = XML.toJSONObject(source);
+        Metadata metadata = new Metadata();
+        createGrobidMetadata(source, obj, metadata);
+        return metadata;
+    }
 
-  private void addStaticMet(String source, JSONObject obj, Metadata metadata) {
-    metadata.add("Class", Metadata.class.getName());
-    metadata.add("TEIJSONSource", obj.toString());
-    metadata.add("TEIXMLSource", source);
-  }
+    private void createGrobidMetadata(String source, JSONObject obj,
+                                      Metadata metadata) {
+        if (obj != null) {
+            try {
+                JSONObject teiHeader = obj.getJSONObject("TEI")
+                        .getJSONObject("teiHeader");
+                if (teiHeader.has("text")) {
+                    parseText(teiHeader.getJSONObject("text"), metadata);
+                }
 
-  private void parseText(JSONObject text, Metadata metadata) {
-    if (text.has("xml:lang")) {
-      metadata.add("Language", text.getString("xml:lang"));
-    }
-  }
+                if (teiHeader.has("fileDesc")) {
+                    parseFileDesc(teiHeader.getJSONObject("fileDesc"), metadata);
 
-  private void parseFileDesc(JSONObject fileDesc, Metadata metadata) {
-    if (fileDesc.has("titleStmt")) {
-      parseTitleStmt(fileDesc.getJSONObject("titleStmt"), metadata);
-    }
+                }
+                if (teiHeader.has("profileDesc")) {
+                    parseProfileDesc(teiHeader.getJSONObject("profileDesc"), metadata);
+                }
+            } catch (JSONException e) {
+                System.out.println("No TEI Object found.");
+            }
+        }
 
-    if (fileDesc.has("sourceDesc")) {
-      parseSourceDesc(fileDesc.getJSONObject("sourceDesc"), metadata);
-    }
-  }
-
-  private void parseTitleStmt(JSONObject titleStmt, Metadata metadata) {
-    if (titleStmt.has("title")) {
-      JSONObject title = titleStmt.getJSONObject("title");
-      if (title.has("content")) {
-        metadata.add("Title", title.getString("content"));
-      }
+        addStaticMet(source, obj, metadata);
     }
-  }
 
-  private void parseSourceDesc(JSONObject sourceDesc, Metadata metadata) {
-    if (sourceDesc.has("biblStruct")) {
-      parseBiblStruct(sourceDesc.getJSONObject("biblStruct"), metadata);
+    private void addStaticMet(String source, JSONObject obj, Metadata metadata) {
+        metadata.add("Class", Metadata.class.getName());
+        metadata.add("TEIJSONSource", obj.toString());
+        metadata.add("TEIXMLSource", source);
     }
-  }
-
-  private void parseBiblStruct(JSONObject biblStruct, Metadata metadata) {
-    if (biblStruct.has("analytic")
-        && biblStruct.get("analytic") instanceof JSONObject) {
-      JSONObject analytic = biblStruct.getJSONObject("analytic");
-      if (analytic.has("author")) {
-        Object authorObj = analytic.get("author");
-
-        List<Author> authorList = new ArrayList<Author>();
-        if (authorObj instanceof JSONObject) {
-          parseAuthor((JSONObject) authorObj, authorList);
-        } else if (authorObj instanceof JSONArray) {
-          JSONArray authors = (JSONArray) authorObj;
-          if (authors.length() > 0) {
-            for (int i = 0; i < authors.length(); i++) {
-              JSONObject author = authors.getJSONObject(i);
-              parseAuthor(author, authorList);
-            }
-          }
 
-          metadata.add("Address", getMetadataAddresses(authorList));
-          metadata.add("Affiliation", getMetadataAffiliations(authorList));
-          metadata.add("Authors", getMetadataAuthors(authorList));
-          metadata.add("FullAffiliations",
-              getMetadataFullAffiliations(authorList));
+    private void parseText(JSONObject text, Metadata metadata) {
+        if (text.has("xml:lang")) {
+            metadata.add("Language", text.getString("xml:lang"));
         }
-
-      }
-    } else {
-      metadata.add("Error", "Unable to parse: no analytic section in JSON");
     }
 
-  }
+    private void parseFileDesc(JSONObject fileDesc, Metadata metadata) {
+        if (fileDesc.has("titleStmt")) {
+            parseTitleStmt(fileDesc.getJSONObject("titleStmt"), metadata);
+        }
 
-  private String getMetadataFullAffiliations(List<Author> authorList) {
-    List<Affiliation> unique = new ArrayList<Affiliation>();
-    StringBuilder metAffils = new StringBuilder();
+        if (fileDesc.has("sourceDesc")) {
+            parseSourceDesc(fileDesc.getJSONObject("sourceDesc"), metadata);
+        }
+    }
 
-    for (Author a : authorList) {
-      for (Affiliation af : a.getAffiliations()) {
-        if (!unique.contains(af)) {
-          unique.add(af);
+    private void parseTitleStmt(JSONObject titleStmt, Metadata metadata) {
+        if (titleStmt.has("title")) {
+            JSONObject title = titleStmt.getJSONObject("title");
+            if (title.has("content")) {
+                metadata.add("Title", title.getString("content"));
+            }
         }
-      }
     }
-    metAffils.append("[");
-    for (Affiliation af : unique) {
-      metAffils.append(af.toString());
-      metAffils.append(",");
+
+    private void parseSourceDesc(JSONObject sourceDesc, Metadata metadata) {
+        if (sourceDesc.has("biblStruct")) {
+            parseBiblStruct(sourceDesc.getJSONObject("biblStruct"), metadata);
+        }
     }
-    metAffils.append(metAffils.deleteCharAt(metAffils.length() - 1));
-    metAffils.append("]");
-    return metAffils.toString();
-  }
-
-  private String getMetadataAuthors(List<Author> authorList) {
-    // generates Chris A. Mattmann 1, 2 Daniel J. Crichton 1 Nenad Medvidovic 2
-    // Steve Hughes 1
-    List<Affiliation> unique = new ArrayList<Affiliation>();
-    StringBuilder metAuthors = new StringBuilder();
-
-    for (Author a : authorList) {
-      for (Affiliation af : a.getAffiliations()) {
-        if (!unique.contains(af)) {
-          unique.add(af);
-        }
-      }
+
+    private void parseBiblStruct(JSONObject biblStruct, Metadata metadata) {
+        if (biblStruct.has("analytic")
+                && biblStruct.get("analytic") instanceof JSONObject) {
+            JSONObject analytic = biblStruct.getJSONObject("analytic");
+            if (analytic.has("author")) {
+                Object authorObj = analytic.get("author");
+
+                List<Author> authorList = new ArrayList<Author>();
+                if (authorObj instanceof JSONObject) {
+                    parseAuthor((JSONObject) authorObj, authorList);
+                } else if (authorObj instanceof JSONArray) {
+                    JSONArray authors = (JSONArray) authorObj;
+                    if (authors.length() > 0) {
+                        for (int i = 0; i < authors.length(); i++) {
+                            JSONObject author = authors.getJSONObject(i);
+                            parseAuthor(author, authorList);
+                        }
+                    }
+
+                    metadata.add("Address", getMetadataAddresses(authorList));
+                    metadata.add("Affiliation", getMetadataAffiliations(authorList));
+                    metadata.add("Authors", getMetadataAuthors(authorList));
+                    metadata.add("FullAffiliations",
+                            getMetadataFullAffiliations(authorList));
+                }
+
+            }
+        } else {
+            metadata.add("Error", "Unable to parse: no analytic section in JSON");
+        }
+
     }
 
-    for (Author a : authorList) {
-      metAuthors.append(printOrBlank(a.getFirstName()));
-      metAuthors.append(printOrBlank(a.getMiddleName()));
-      metAuthors.append(printOrBlank(a.getSurName()));
+    private String getMetadataFullAffiliations(List<Author> authorList) {
+        List<Affiliation> unique = new ArrayList<Affiliation>();
+        StringBuilder metAffils = new StringBuilder();
 
-      StringBuilder affilBuilder = new StringBuilder();
-      for (int idx = 0; idx < unique.size(); idx++) {
-        Affiliation af = unique.get(idx);
-        if (a.getAffiliations().contains(af)) {
-          affilBuilder.append((idx + 1));
-          affilBuilder.append(",");
+        for (Author a : authorList) {
+            for (Affiliation af : a.getAffiliations()) {
+                if (!unique.contains(af)) {
+                    unique.add(af);
+                }
+            }
+        }
+        metAffils.append("[");
+        for (Affiliation af : unique) {
+            metAffils.append(af.toString());
+            metAffils.append(",");
+        }
+        metAffils.append(metAffils.deleteCharAt(metAffils.length() - 1));
+        metAffils.append("]");
+        return metAffils.toString();
+    }
+
+    private String getMetadataAuthors(List<Author> authorList) {
+        // generates Chris A. Mattmann 1, 2 Daniel J. Crichton 1 Nenad Medvidovic 2
+        // Steve Hughes 1
+        List<Affiliation> unique = new ArrayList<Affiliation>();
+        StringBuilder metAuthors = new StringBuilder();
+
+        for (Author a : authorList) {
+            for (Affiliation af : a.getAffiliations()) {
+                if (!unique.contains(af)) {
+                    unique.add(af);
+                }
+            }
         }
-      }
 
-      if (affilBuilder.length() > 0)
-        affilBuilder.deleteCharAt(affilBuilder.length() - 1);
+        for (Author a : authorList) {
+            metAuthors.append(printOrBlank(a.getFirstName()));
+            metAuthors.append(printOrBlank(a.getMiddleName()));
+            metAuthors.append(printOrBlank(a.getSurName()));
+
+            StringBuilder affilBuilder = new StringBuilder();
+            for (int idx = 0; idx < unique.size(); idx++) {
+                Affiliation af = unique.get(idx);
+                if (a.getAffiliations().contains(af)) {
+                    affilBuilder.append((idx + 1));
+                    affilBuilder.append(",");
+                }
+            }
+
+            if (affilBuilder.length() > 0)
+                affilBuilder.deleteCharAt(affilBuilder.length() - 1);
+
+            metAuthors.append(affilBuilder.toString());
+            metAuthors.append(" ");
+        }
 
-      metAuthors.append(affilBuilder.toString());
-      metAuthors.append(" ");
+        return metAuthors.toString();
     }
 
-    return metAuthors.toString();
-  }
+    private String getMetadataAffiliations(List<Author> authorList) {
+        // generates 1 Jet Propulsion Laboratory California Institute of Technology
+        // ; 2 Computer Science Department University of Southern California
+        List<Affiliation> unique = new ArrayList<Affiliation>();
+        StringBuilder metAffil = new StringBuilder();
 
-  private String getMetadataAffiliations(List<Author> authorList) {
-    // generates 1 Jet Propulsion Laboratory California Institute of Technology
-    // ; 2 Computer Science Department University of Southern California
-    List<Affiliation> unique = new ArrayList<Affiliation>();
-    StringBuilder metAffil = new StringBuilder();
+        for (Author a : authorList) {
+            for (Affiliation af : a.getAffiliations()) {
+                if (!unique.contains(af)) {
+                    unique.add(af);
+                }
+            }
+        }
 
-    for (Author a : authorList) {
-      for (Affiliation af : a.getAffiliations()) {
-        if (!unique.contains(af)) {
-          unique.add(af);
+        int count = 1;
+        for (Affiliation a : unique) {
+            metAffil.append(count);
+            metAffil.append(" ");
+            metAffil.append(a.getOrgName().toString());
+            metAffil.deleteCharAt(metAffil.length() - 1);
+            metAffil.append("; ");
+            count++;
         }
-      }
-    }
 
-    int count = 1;
-    for (Affiliation a : unique) {
-      metAffil.append(count);
-      metAffil.append(" ");
-      metAffil.append(a.getOrgName().toString());
-      metAffil.deleteCharAt(metAffil.length() - 1);
-      metAffil.append("; ");
-      count++;
-    }
+        if (count > 1) {
+            metAffil.deleteCharAt(metAffil.length() - 1);
+            metAffil.deleteCharAt(metAffil.length() - 1);
+        }
 
-    if (count > 1) {
-      metAffil.deleteCharAt(metAffil.length() - 1);
-      metAffil.deleteCharAt(metAffil.length() - 1);
+        return metAffil.toString();
     }
 
-    return metAffil.toString();
-  }
+    private String getMetadataAddresses(List<Author> authorList) {
+        // generates: "Pasadena, CA 91109, USA Los Angeles, CA 90089, USA",
+        List<Address> unique = new ArrayList<Address>();
+        StringBuilder metAddress = new StringBuilder();
 
-  private String getMetadataAddresses(List<Author> authorList) {
-    // generates: "Pasadena, CA 91109, USA Los Angeles, CA 90089, USA",
-    List<Address> unique = new ArrayList<Address>();
-    StringBuilder metAddress = new StringBuilder();
+        for (Author a : authorList) {
+            for (Affiliation af : a.getAffiliations()) {
+                if (!unique.contains(af.getAddress())) {
+                    unique.add(af.getAddress());
+                }
+            }
+        }
 
-    for (Author a : authorList) {
-      for (Affiliation af : a.getAffiliations()) {
-        if (!unique.contains(af.getAddress())) {
-          unique.add(af.getAddress());
+        for (Address ad : unique) {
+            metAddress.append(ad.toString());
+            metAddress.append(" ");
         }
-      }
-    }
 
-    for (Address ad : unique) {
-      metAddress.append(ad.toString());
-      metAddress.append(" ");
+        return metAddress.toString();
     }
 
-    return metAddress.toString();
-  }
+    private void parseAuthor(JSONObject authorObj, List<Author> authorList) {
+        Author author = new Author();
 
-  private void parseAuthor(JSONObject authorObj, List<Author> authorList) {
-    Author author = new Author();
+        if (authorObj.has("persName")) {
+            JSONObject persName = authorObj.getJSONObject("persName");
 
-    if (authorObj.has("persName")) {
-      JSONObject persName = authorObj.getJSONObject("persName");
+            if (persName.has("forename")) {
 
-      if (persName.has("forename")) {
+                Object foreNameObj = persName.get("forename");
 
-        Object foreNameObj = persName.get("forename");
+                if (foreNameObj instanceof JSONObject) {
+                    parseNamePart((JSONObject) foreNameObj, author);
+                } else if (foreNameObj instanceof JSONArray) {
+                    JSONArray foreName = persName.getJSONArray("forename");
 
-        if (foreNameObj instanceof JSONObject) {
-          parseNamePart((JSONObject) foreNameObj, author);
-        } else if (foreNameObj instanceof JSONArray) {
-          JSONArray foreName = persName.getJSONArray("forename");
+                    if (foreName.length() > 0) {
+                        for (int i = 0; i < foreName.length(); i++) {
+                            JSONObject namePart = foreName.getJSONObject(i);
+                            parseNamePart(namePart, author);
+                        }
+                    }
+                }
+            }
 
-          if (foreName.length() > 0) {
-            for (int i = 0; i < foreName.length(); i++) {
-              JSONObject namePart = foreName.getJSONObject(i);
-              parseNamePart(namePart, author);
+            if (persName.has("surname")) {
+                author.setSurName(persName.getString("surname"));
             }
-          }
-        }
-      }
 
-      if (persName.has("surname")) {
-        author.setSurName(persName.getString("surname"));
-      }
+            if (authorObj.has("affiliation")) {
+                parseAffiliation(authorObj.get("affiliation"), author);
+            }
 
-      if (authorObj.has("affiliation")) {
-        parseAffiliation(authorObj.get("affiliation"), author);
-      }
+        }
 
+        authorList.add(author);
     }
 
-    authorList.add(author);
-  }
-
-  private void parseNamePart(JSONObject namePart, Author author) {
-    if (namePart.has("type") && namePart.has("content")) {
-      String type = namePart.getString("type");
-      String content = namePart.getString("content");
+    private void parseNamePart(JSONObject namePart, Author author) {
+        if (namePart.has("type") && namePart.has("content")) {
+            String type = namePart.getString("type");
+            String content = namePart.getString("content");
 
-      if (type.equals("first")) {
-        author.setFirstName(content);
-      }
+            if (type.equals("first")) {
+                author.setFirstName(content);
+            }
 
-      if (type.equals("middle")) {
-        author.setMiddleName(content);
-      }
-    }
-  }
-
-  private void parseAffiliation(Object affiliationJSON, Author author) {
-    if (affiliationJSON instanceof JSONObject) {
-      parseOneAffiliation((JSONObject) affiliationJSON, author);
-    } else if (affiliationJSON instanceof JSONArray) {
-      JSONArray affiliationArray = (JSONArray) affiliationJSON;
-      if (affiliationArray != null && affiliationArray.length() > 0) {
-        for (int i = 0; i < affiliationArray.length(); i++) {
-          JSONObject affiliationObj = affiliationArray.getJSONObject(i);
-          parseOneAffiliation(affiliationObj, author);
-        }
-      }
+            if (type.equals("middle")) {
+                author.setMiddleName(content);
+            }
+        }
     }
-  }
-
-  private void parseOneAffiliation(JSONObject affiliationObj, Author author) {
 
-    Affiliation affiliation = new Affiliation();
-    if (affiliationObj.has("address")) {
-      parseAddress(affiliationObj.getJSONObject("address"), affiliation);
+    private void parseAffiliation(Object affiliationJSON, Author author) {
+        if (affiliationJSON instanceof JSONObject) {
+            parseOneAffiliation((JSONObject) affiliationJSON, author);
+        } else if (affiliationJSON instanceof JSONArray) {
+            JSONArray affiliationArray = (JSONArray) affiliationJSON;
+            if (affiliationArray != null && affiliationArray.length() > 0) {
+                for (int i = 0; i < affiliationArray.length(); i++) {
+                    JSONObject affiliationObj = affiliationArray.getJSONObject(i);
+                    parseOneAffiliation(affiliationObj, author);
+                }
+            }
+        }
     }
 
-    if (affiliationObj.has("orgName")) {
-      OrgName orgName = new OrgName();
-      Object orgObject = affiliationObj.get("orgName");
-      if (orgObject instanceof JSONObject) {
-        parseOrgName((JSONObject) orgObject, orgName);
-      } else if (orgObject instanceof JSONArray) {
-        JSONArray orgNames = (JSONArray) orgObject;
-        if (orgNames != null && orgNames.length() > 0) {
-          for (int i = 0; i < orgNames.length(); i++) {
-            parseOrgName(orgNames.getJSONObject(i), orgName);
-          }
+    private void parseOneAffiliation(JSONObject affiliationObj, Author author) {
+
+        Affiliation affiliation = new Affiliation();
+        if (affiliationObj.has("address")) {
+            parseAddress(affiliationObj.getJSONObject("address"), affiliation);
         }
 
-        affiliation.setOrgName(orgName);
-      }
+        if (affiliationObj.has("orgName")) {
+            OrgName orgName = new OrgName();
+            Object orgObject = affiliationObj.get("orgName");
+            if (orgObject instanceof JSONObject) {
+                parseOrgName((JSONObject) orgObject, orgName);
+            } else if (orgObject instanceof JSONArray) {
+                JSONArray orgNames = (JSONArray) orgObject;
+                if (orgNames != null && orgNames.length() > 0) {
+                    for (int i = 0; i < orgNames.length(); i++) {
+                        parseOrgName(orgNames.getJSONObject(i), orgName);
+                    }
+                }
+
+                affiliation.setOrgName(orgName);
+            }
+
+        }
 
+        author.getAffiliations().add(affiliation);
     }
 
-    author.getAffiliations().add(affiliation);
-  }
+    private void parseAddress(JSONObject addressObj, Affiliation affiliation) {
+        Address address = new Address();
 
-  private void parseAddress(JSONObject addressObj, Affiliation affiliation) {
-    Address address = new Address();
+        if (addressObj.has("region")) {
+            address.setRegion(addressObj.getString("region"));
+        }
 
-    if (addressObj.has("region")) {
-      address.setRegion(addressObj.getString("region"));
-    }
+        if (addressObj.has("postCode")) {
+            address.setPostCode(JSONObject.valueToString(addressObj.get("postCode")));
+        }
 
-    if (addressObj.has("postCode")) {
-      address.setPostCode(JSONObject.valueToString(addressObj.get("postCode")));
-    }
+        if (addressObj.has("settlement")) {
+            address.setSettlment(addressObj.getString("settlement"));
+        }
 
-    if (addressObj.has("settlement")) {
-      address.setSettlment(addressObj.getString("settlement"));
-    }
+        if (addressObj.has("country")) {
+            Country country = new Country();
+            Object countryObj = addressObj.get("country");
 
-    if (addressObj.has("country")) {
-      Country country = new Country();
-      Object countryObj = addressObj.get("country");
+            if (countryObj instanceof JSONObject) {
+                JSONObject countryJson = addressObj.getJSONObject("country");
 
-      if (countryObj instanceof JSONObject) {
-        JSONObject countryJson = addressObj.getJSONObject("country");
+                if (countryJson.has("content")) {
+                    country.setContent(countryJson.getString("content"));
+                }
 
-        if (countryJson.has("content")) {
-          country.setContent(countryJson.getString("content"));
+                if (countryJson.has("key")) {
+                    country.setKey(countryJson.getString("key"));
+                }
+            } else if (countryObj instanceof String) {
+                country.setContent((String) countryObj);
+            }
+            address.setCountry(country);
         }
 
-        if (countryJson.has("key")) {
-          country.setKey(countryJson.getString("key"));
-        }
-      } else if (countryObj instanceof String) {
-        country.setContent((String) countryObj);
-      }
-      address.setCountry(country);
+        affiliation.setAddress(address);
     }
 
-    affiliation.setAddress(address);
-  }
+    private void parseOrgName(JSONObject orgObj, OrgName orgName) {
+        OrgTypeName typeName = new OrgTypeName();
+        if (orgObj.has("content")) {
+            typeName.setName(orgObj.getString("content"));
+        }
 
-  private void parseOrgName(JSONObject orgObj, OrgName orgName) {
-    OrgTypeName typeName = new OrgTypeName();
-    if (orgObj.has("content")) {
-      typeName.setName(orgObj.getString("content"));
-    }
+        if (orgObj.has("type")) {
+            typeName.setType(orgObj.getString("type"));
+        }
 
-    if (orgObj.has("type")) {
-      typeName.setType(orgObj.getString("type"));
+        orgName.getTypeNames().add(typeName);
     }
 
-    orgName.getTypeNames().add(typeName);
-  }
+    private void parseProfileDesc(JSONObject profileDesc, Metadata metadata) {
+        if (profileDesc.has("abstract")) {
+            if (profileDesc.has("p")) {
+                metadata.add("Abstract", profileDesc.getString("p"));
+            }
+        }
 
-  private void parseProfileDesc(JSONObject profileDesc, Metadata metadata) {
-    if (profileDesc.has("abstract")) {
-      if (profileDesc.has("p")) {
-        metadata.add("Abstract", profileDesc.getString("p"));
-      }
-    }
+        if (profileDesc.has("textClass")) {
+            JSONObject textClass = profileDesc.getJSONObject("textClass");
+
+            if (textClass.has("keywords")) {
+                Object keywordsObj = textClass.get("keywords");
+                // test AJ15.pdf
+                if (keywordsObj instanceof String) {
+                    metadata.add("Keyword", (String) keywordsObj);
+                } else if (keywordsObj instanceof JSONObject) {
+                    JSONObject keywords = textClass.getJSONObject("keywords");
+                    if (keywords.has("term")) {
+                        JSONArray termArr = keywords.getJSONArray("term");
+                        for (int i = 0; i < termArr.length(); i++) {
+                            metadata.add("Keyword", JSONObject.valueToString(termArr.get(i)));
+                        }
+                    }
+                }
 
-    if (profileDesc.has("textClass")) {
-      JSONObject textClass = profileDesc.getJSONObject("textClass");
-
-      if (textClass.has("keywords")) {
-        Object keywordsObj = textClass.get("keywords");
-        // test AJ15.pdf
-        if (keywordsObj instanceof String) {
-          metadata.add("Keyword", (String) keywordsObj);
-        } else if (keywordsObj instanceof JSONObject) {
-          JSONObject keywords = textClass.getJSONObject("keywords");
-          if (keywords.has("term")) {
-            JSONArray termArr = keywords.getJSONArray("term");
-            for (int i = 0; i < termArr.length(); i++) {
-              metadata.add("Keyword", JSONObject.valueToString(termArr.get(i)));
             }
-          }
         }
 
-      }
     }
 
-  }
+    private String printOrBlank(String val) {
+        if (val != null && !val.equals("")) {
+            return val + " ";
+        } else
+            return " ";
+    }
 
-  private String printOrBlank(String val) {
-    if (val != null && !val.equals("")) {
-      return val + " ";
-    } else
-      return " ";
-  }
+    class Author {
 
-  class Author {
+        private String surName;
 
-    private String surName;
+        private String middleName;
 
-    private String middleName;
+        private String firstName;
 
-    private String firstName;
+        private List<Affiliation> affiliations;
 
-    private List<Affiliation> affiliations;
+        public Author() {
+            this.surName = null;
+            this.middleName = null;
+            this.firstName = null;
+            this.affiliations = new ArrayList<Affiliation>();
+        }
 
-    public Author() {
-      this.surName = null;
-      this.middleName = null;
-      this.firstName = null;
-      this.affiliations = new ArrayList<Affiliation>();
-    }
+        /**
+         * @return the surName
+         */
+        public String getSurName() {
+            return surName;
+        }
 
-    /**
-     * @return the surName
-     */
-    public String getSurName() {
-      return surName;
-    }
+        /**
+         * @param surName
+         *          the surName to set
+         */
+        public void setSurName(String surName) {
+            this.surName = surName;
+        }
 
-    /**
-     * @param surName
-     *          the surName to set
-     */
-    public void setSurName(String surName) {
-      this.surName = surName;
-    }
+        /**
+         * @return the middleName
+         */
+        public String getMiddleName() {
+            return middleName;
+        }
 
-    /**
-     * @return the middleName
-     */
-    public String getMiddleName() {
-      return middleName;
-    }
+        /**
+         * @param middleName
+         *          the middleName to set
+         */
+        public void setMiddleName(String middleName) {
+            this.middleName = middleName;
+        }
 
-    /**
-     * @param middleName
-     *          the middleName to set
-     */
-    public void setMiddleName(String middleName) {
-      this.middleName = middleName;
-    }
+        /**
+         * @return the firstName
+         */
+        public String getFirstName() {
+            return firstName;
+        }
 
-    /**
-     * @return the firstName
-     */
-    public String getFirstName() {
-      return firstName;
-    }
+        /**
+         * @param firstName
+         *          the firstName to set
+         */
+        public void setFirstName(String firstName) {
+            this.firstName = firstName;
+        }
 
-    /**
-     * @param firstName
-     *          the firstName to set
-     */
-    public void setFirstName(String firstName) {
-      this.firstName = firstName;
-    }
+        /**
+         * @return the affiliations
+         */
+        public List<Affiliation> getAffiliations() {
+            return affiliations;
+        }
 
-    /**
-     * @return the affiliations
-     */
-    public List<Affiliation> getAffiliations() {
-      return affiliations;
-    }
+        /**
+         * @param affiliations
+         *          the affiliations to set
+         */
+        public void setAffiliations(List<Affiliation> affiliations) {
+            this.affiliations = affiliations;
+        }
 
-    /**
-     * @param affiliations
-     *          the affiliations to set
-     */
-    public void setAffiliations(List<Affiliation> affiliations) {
-      this.affiliations = affiliations;
-    }
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
+        @Override
+        public String toString() {
+            return "Author [surName=" + surName + ", middleName=" + middleName != null ? middleName
+                    : "" + ", firstName=" + firstName + ", affiliations=" + affiliations
+                    + "]";
+        }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-      return "Author [surName=" + surName + ", middleName=" + middleName != null ? middleName
-          : "" + ", firstName=" + firstName + ", affiliations=" + affiliations
-              + "]";
     }
 
-  }
+    class Affiliation {
 
-  class Affiliation {
+        private OrgName orgName;
 
-    private OrgName orgName;
+        private Address address;
 
-    private Address address;
+        public Affiliation() {
+            this.orgName = new OrgName();
+            this.address = new Address();
+        }
 
-    public Affiliation() {
-      this.orgName = new OrgName();
-      this.address = new Address();
-    }
+        /**
+         * @return the orgName
+         */
+        public OrgName getOrgName() {
+            return orgName;
+        }
 
-    /**
-     * @return the orgName
-     */
-    public OrgName getOrgName() {
-      return orgName;
-    }
+        /**
+         * @param orgName
+         *          the orgName to set
+         */
+        public void setOrgName(OrgName orgName) {
+            this.orgName = orgName;
+        }
 
-    /**
-     * @param orgName
-     *          the orgName to set
-     */
-    public void setOrgName(OrgName orgName) {
-      this.orgName = orgName;
-    }
+        /**
+         * @return the address
+         */
+        public Address getAddress() {
+            return address;
+        }
 
-    /**
-     * @return the address
-     */
-    public Address getAddress() {
-      return address;
-    }
+        /**
+         * @param address
+         *          the address to set
+         */
+        public void setAddress(Address address) {
+            this.address = address;
+        }
 
-    /**
-     * @param address
-     *          the address to set
-     */
-    public void setAddress(Address address) {
-      this.address = address;
-    }
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        @Override
+        public boolean equals(Object obj) {
+            Affiliation otherA = (Affiliation) obj;
+            return this.getAddress().equals(otherA.getAddress())
+                    && this.getOrgName().equals(otherA.getOrgName());
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-      Affiliation otherA = (Affiliation) obj;
-      return this.getAddress().equals(otherA.getAddress())
-          && this.getOrgName().equals(otherA.getOrgName());
+        }
 
-    }
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
+        @Override
+        public String toString() {
+            return "Affiliation {orgName=" + orgName + ", address=" + address + "}";
+        }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-      return "Affiliation {orgName=" + orgName + ", address=" + address + "}";
     }
 
-  }
-
-  class OrgName {
-    private List<OrgTypeName> typeNames;
+    class OrgName {
+        private List<OrgTypeName> typeNames;
 
-    public OrgName() {
-      this.typeNames = new ArrayList<OrgTypeName>();
-    }
+        public OrgName() {
+            this.typeNames = new ArrayList<OrgTypeName>();
+        }
 
-    /**
-     * @return the typeNames
-     */
-    public List<OrgTypeName> getTypeNames() {
-      return typeNames;
-    }
+        /**
+         * @return the typeNames
+         */
+        public List<OrgTypeName> getTypeNames() {
+            return typeNames;
+        }
 
-    /**
-     * @param typeNames
-     *          the typeNames to set
-     */
-    public void setTypeNames(List<OrgTypeName> typeNames) {
-      this.typeNames = typeNames;
-    }
+        /**
+         * @param typeNames
+         *          the typeNames to set
+         */
+        public void setTypeNames(List<OrgTypeName> typeNames) {
+            this.typeNames = typeNames;
+        }
 
     /*
      * (non-Javadoc)
@@ -613,287 +612,287 @@ private void createGrobidMetadata(String source, JSONObject obj,
      * @see java.lang.Object#toString()
      */
 
-    @Override
-    public String toString() {
-      StringBuilder builder = new StringBuilder();
-      for (OrgTypeName on : this.typeNames) {
-        builder.append(on.getName());
-        builder.append(" ");
-      }
-      return builder.toString();
-    }
+        @Override
+        public String toString() {
+            StringBuilder builder = new StringBuilder();
+            for (OrgTypeName on : this.typeNames) {
+                builder.append(on.getName());
+                builder.append(" ");
+            }
+            return builder.toString();
+        }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-      OrgName otherA = (OrgName) obj;
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        @Override
+        public boolean equals(Object obj) {
+            OrgName otherA = (OrgName) obj;
+
+            if (otherA.getTypeNames() != null) {
+                if (this.typeNames == null) {
+                    return false;
+                } else {
+                    return this.typeNames.size() == otherA.getTypeNames().size();
+                }
+            } else {
+                if (this.typeNames == null) {
+                    return true;
+                } else
+                    return false;
+            }
 
-      if (otherA.getTypeNames() != null) {
-        if (this.typeNames == null) {
-          return false;
-        } else {
-          return this.typeNames.size() == otherA.getTypeNames().size();
         }
-      } else {
-        if (this.typeNames == null) {
-          return true;
-        } else
-          return false;
-      }
 
     }
 
-  }
+    class OrgTypeName {
+        private String name;
+        private String type;
 
-  class OrgTypeName {
-    private String name;
-    private String type;
+        public OrgTypeName() {
+            this.name = null;
+            this.type = null;
+        }
 
-    public OrgTypeName() {
-      this.name = null;
-      this.type = null;
-    }
+        /**
+         * @return the name
+         */
+        public String getName() {
+            return name;
+        }
 
-    /**
-     * @return the name
-     */
-    public String getName() {
-      return name;
-    }
+        /**
+         * @param name
+         *          the name to set
+         */
+        public void setName(String name) {
+            this.name = name;
+        }
 
-    /**
-     * @param name
-     *          the name to set
-     */
-    public void setName(String name) {
-      this.name = name;
-    }
+        /**
+         * @return the type
+         */
+        public String getType() {
+            return type;
+        }
 
-    /**
-     * @return the type
-     */
-    public String getType() {
-      return type;
-    }
+        /**
+         * @param type
+         *          the type to set
+         */
+        public void setType(String type) {
+            this.type = type;
+        }
 
-    /**
-     * @param type
-     *          the type to set
-     */
-    public void setType(String type) {
-      this.type = type;
-    }
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        @Override
+        public boolean equals(Object obj) {
+            OrgTypeName otherOrgName = (OrgTypeName) obj;
+            return this.type.equals(otherOrgName.getType())
+                    && this.name.equals(otherOrgName.getName());
+        }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-      OrgTypeName otherOrgName = (OrgTypeName) obj;
-      return this.type.equals(otherOrgName.getType())
-          && this.name.equals(otherOrgName.getName());
     }
 
-  }
+    private class Address {
 
-  private class Address {
+        private String region;
+        private String postCode;
+        private String settlment;
+        private Country country;
 
-    private String region;
-    private String postCode;
-    private String settlment;
-    private Country country;
+        public Address() {
+            this.region = null;
+            this.postCode = null;
+            this.settlment = null;
+            this.country = new Country();
+        }
 
-    public Address() {
-      this.region = null;
-      this.postCode = null;
-      this.settlment = null;
-      this.country = new Country();
-    }
+        /**
+         * @return the region
+         */
+        public String getRegion() {
+            return region;
+        }
 
-    /**
-     * @return the region
-     */
-    public String getRegion() {
-      return region;
-    }
+        /**
+         * @param region
+         *          the region to set
+         */
+        public void setRegion(String region) {
+            this.region = region;
+        }
 
-    /**
-     * @param region
-     *          the region to set
-     */
-    public void setRegion(String region) {
-      this.region = region;
-    }
+        /**
+         * @return the postCode
+         */
+        public String getPostCode() {
+            return postCode;
+        }
 
-    /**
-     * @return the postCode
-     */
-    public String getPostCode() {
-      return postCode;
-    }
+        /**
+         * @param postCode
+         *          the postCode to set
+         */
+        public void setPostCode(String postCode) {
+            this.postCode = postCode;
+        }
 
-    /**
-     * @param postCode
-     *          the postCode to set
-     */
-    public void setPostCode(String postCode) {
-      this.postCode = postCode;
-    }
+        /**
+         * @return the settlment
+         */
+        public String getSettlment() {
+            return settlment;
+        }
 
-    /**
-     * @return the settlment
-     */
-    public String getSettlment() {
-      return settlment;
-    }
+        /**
+         * @param settlment
+         *          the settlment to set
+         */
+        public void setSettlment(String settlment) {
+            this.settlment = settlment;
+        }
 
-    /**
-     * @param settlment
-     *          the settlment to set
-     */
-    public void setSettlment(String settlment) {
-      this.settlment = settlment;
-    }
+        /**
+         * @return the country
+         */
+        public Country getCountry() {
+            return country;
+        }
 
-    /**
-     * @return the country
-     */
-    public Country getCountry() {
-      return country;
-    }
+        /**
+         * @param country
+         *          the country to set
+         */
+        public void setCountry(Country country) {
+            this.country = country;
+        }
 
-    /**
-     * @param country
-     *          the country to set
-     */
-    public void setCountry(Country country) {
-      this.country = country;
-    }
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        @Override
+        public boolean equals(Object obj) {
+            Address otherA = (Address) obj;
+            if (this.settlment == null) {
+                return otherA.getSettlment() == null;
+            } else if (this.country == null) {
+                return otherA.getCountry() == null;
+            } else if (this.postCode == null) {
+                return otherA.getPostCode() == null;
+            } else if (this.region == null) {
+                return otherA.getRegion() == null;
+            }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-      Address otherA = (Address) obj;
-      if (this.settlment == null) {
-        return otherA.getSettlment() == null;
-      } else if (this.country == null) {
-        return otherA.getCountry() == null;
-      } else if (this.postCode == null) {
-        return otherA.getPostCode() == null;
-      } else if (this.region == null) {
-        return otherA.getRegion() == null;
-      }
-
-      return this.settlment.equals(otherA.getSettlment())
-          && this.country.equals(otherA.getCountry())
-          && this.postCode.equals(otherA.getPostCode())
-          && this.region.equals(otherA.getRegion());
-    }
+            return this.settlment.equals(otherA.getSettlment())
+                    && this.country.equals(otherA.getCountry())
+                    && this.postCode.equals(otherA.getPostCode())
+                    && this.region.equals(otherA.getRegion());
+        }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-      StringBuilder builder = new StringBuilder();
-      builder.append(settlment);
-      builder.append(", ");
-      builder.append(region);
-      builder.append(" ");
-      builder.append(postCode);
-      builder.append(" ");
-      builder.append(country.getContent());
-      return builder.toString();
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
+        @Override
+        public String toString() {
+            StringBuilder builder = new StringBuilder();
+            builder.append(settlment);
+            builder.append(", ");
+            builder.append(region);
+            builder.append(" ");
+            builder.append(postCode);
+            builder.append(" ");
+            builder.append(country.getContent());
+            return builder.toString();
+        }
     }
-  }
-
-  private class Country {
-    private String key;
-    private String content;
 
-    public Country() {
-      this.key = null;
-      this.content = null;
-    }
+    private class Country {
+        private String key;
+        private String content;
 
-    /**
-     * @return the key
-     */
-    public String getKey() {
-      return key;
-    }
+        public Country() {
+            this.key = null;
+            this.content = null;
+        }
 
-    /**
-     * @param key
-     *          the key to set
-     */
-    public void setKey(String key) {
-      this.key = key;
-    }
+        /**
+         * @return the key
+         */
+        public String getKey() {
+            return key;
+        }
 
-    /**
-     * @return the content
-     */
-    public String getContent() {
-      return content;
-    }
+        /**
+         * @param key
+         *          the key to set
+         */
+        public void setKey(String key) {
+            this.key = key;
+        }
 
-    /**
-     * @param content
-     *          the content to set
-     */
-    public void setContent(String content) {
-      this.content = content;
-    }
+        /**
+         * @return the content
+         */
+        public String getContent() {
+            return content;
+        }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-      Country otherC = (Country) obj;
+        /**
+         * @param content
+         *          the content to set
+         */
+        public void setContent(String content) {
+            this.content = content;
+        }
 
-      if (this.key == null) {
-        if (otherC.getKey() != null) {
-          return false;
-        } else {
-          if (this.content == null) {
-            if (otherC.getContent() != null) {
-              return false;
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        @Override
+        public boolean equals(Object obj) {
+            Country otherC = (Country) obj;
+
+            if (this.key == null) {
+                if (otherC.getKey() != null) {
+                    return false;
+                } else {
+                    if (this.content == null) {
+                        if (otherC.getContent() != null) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    } else {
+                        return content.equals(otherC.getContent());
+                    }
+                }
             } else {
-              return true;
+                if (this.content == null) {
+                    if (otherC.getContent() != null) {
+                        return false;
+                    } else {
+                        return this.key.equals(otherC.getKey());
+                    }
+                } else {
+                    return this.key.equals(otherC.getKey())
+                            && this.content.equals(otherC.getContent());
+                }
             }
-          } else {
-            return content.equals(otherC.getContent());
-          }
-        }
-      } else {
-        if (this.content == null) {
-          if (otherC.getContent() != null) {
-            return false;
-          } else {
-            return this.key.equals(otherC.getKey());
-          }
-        } else {
-          return this.key.equals(otherC.getKey())
-              && this.content.equals(otherC.getContent());
         }
-      }
-    }
 
-  }
+    }
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.