This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 9313b0c31 Fix for TIKA-4009: GeoTopic Parser package changed
incorrectly from o.a.t.parser.geo from o.a.t.parser.geo.topic
9313b0c31 is described below
commit 9313b0c31df87b0d436f48e0d629fd048cec66e8
Author: Chris Mattmann <chris.mattm...@gmail.com>
AuthorDate: Mon Apr 3 11:28:49 2023 -0700
Fix for TIKA-4009: GeoTopic Parser package changed incorrectly from
o.a.t.parser.geo from o.a.t.parser.geo.topic
---
.../main/java/org/apache/tika/parser/geo/{ => topic}/GeoParser.java | 6 +++---
.../org/apache/tika/parser/geo/{ => topic}/GeoParserConfig.java | 2 +-
.../main/java/org/apache/tika/parser/geo/{ => topic}/GeoTag.java | 4 ++--
.../org/apache/tika/parser/geo/{ => topic}/NameEntityExtractor.java | 2 +-
.../tika/parser/geo/{ => topic}/gazetteer/GeoGazetteerClient.java | 4 ++--
.../org/apache/tika/parser/geo/{ => topic}/gazetteer/Location.java | 2 +-
.../main/resources/META-INF/services/org.apache.tika.parser.Parser | 2 +-
.../java/org/apache/tika/parser/geo/{ => topic}/GeoParserTest.java | 4 ++--
.../org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml | 4 ++--
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoParser.java
similarity index 97%
rename from
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
rename to
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoParser.java
index 3e65f8ddc..e40cb1a33 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.geo;
+package org.apache.tika.parser.geo.topic;
import java.io.IOException;
import java.io.InputStream;
@@ -41,8 +41,8 @@ import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.geo.gazetteer.GeoGazetteerClient;
-import org.apache.tika.parser.geo.gazetteer.Location;
+import org.apache.tika.parser.geo.topic.gazetteer.GeoGazetteerClient;
+import org.apache.tika.parser.geo.topic.gazetteer.Location;
public class GeoParser extends AbstractParser {
private static final long serialVersionUID = -2241391757440215491L;
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoParserConfig.java
similarity index 98%
rename from
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
rename to
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoParserConfig.java
index bc4ce3e7a..107f10bdb 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoParserConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.geo;
+package org.apache.tika.parser.geo.topic;
import java.io.File;
import java.io.IOException;
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoTag.java
similarity index 95%
rename from
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
rename to
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoTag.java
index aedefa802..f0dd7131e 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/GeoTag.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.tika.parser.geo;
+package org.apache.tika.parser.geo.topic;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.tika.parser.geo.gazetteer.Location;
+import org.apache.tika.parser.geo.topic.gazetteer.Location;
public class GeoTag {
Location location = new Location();
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/NameEntityExtractor.java
similarity index 98%
rename from
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
rename to
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/NameEntityExtractor.java
index 27c5d58a6..8ba75eb42 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/NameEntityExtractor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.geo;
+package org.apache.tika.parser.geo.topic;
import static java.nio.charset.StandardCharsets.UTF_8;
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/gazetteer/GeoGazetteerClient.java
similarity index 97%
rename from
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
rename to
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/gazetteer/GeoGazetteerClient.java
index 24239e0ab..6047206c5 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/gazetteer/GeoGazetteerClient.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.geo.gazetteer;
+package org.apache.tika.parser.geo.topic.gazetteer;
import java.lang.reflect.Type;
import java.util.List;
@@ -33,7 +33,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.tika.parser.geo.GeoParserConfig;
+import org.apache.tika.parser.geo.topic.GeoParserConfig;
public class GeoGazetteerClient {
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/gazetteer/Location.java
similarity index 97%
rename from
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
rename to
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/gazetteer/Location.java
index bcbe6f39d..b5a165e91 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/topic/gazetteer/Location.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.geo.gazetteer;
+package org.apache.tika.parser.geo.topic.gazetteer;
import java.io.Serializable;
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
index cea749261..76fcbfed8 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.tika.parser.geo.GeoParser
+org.apache.tika.parser.geo.topic.GeoParser
org.apache.tika.parser.journal.JournalParser
org.apache.tika.parser.sentiment.SentimentAnalysisParser
\ No newline at end of file
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
similarity index 97%
rename from
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
rename to
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
index 733ef29d1..2dba9cedd 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.geo;
+package org.apache.tika.parser.geo.topic;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -107,7 +107,7 @@ public class GeoParserTest extends TikaTest {
TikaConfig config = new TikaConfig(
getResourceAsStream("/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml"));
Parser p = config.getParser();
- GeoParser geoParser = (GeoParser) findParser(p,
org.apache.tika.parser.geo.GeoParser.class);
+ GeoParser geoParser = (GeoParser) findParser(p, GeoParser.class);
assertNotNull(geoParser);
assertEquals("http://localhost/gazetteerRestEndpoint";,
geoParser.getGazetteerRestEndpoint());
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
index bd12c0fe6..9ba943993 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
@@ -18,9 +18,9 @@
<properties>
<parsers>
<parser class="org.apache.tika.parser.DefaultParser">
- <parser-exclude class="org.apache.tika.parser.geo.GeoParser"/>
+ <parser-exclude
class="org.apache.tika.parser.geo.topic.GeoParser"/>
</parser>
- <parser class="org.apache.tika.parser.geo.GeoParser">
+ <parser class="org.apache.tika.parser.geo.topic.GeoParser">
<params>
<param name="gazetteerRestEndpoint"
type="string">http://localhost/gazetteerRestEndpoint</param>
<param name="nerModelUrl"
type="string">file:/ner/model/url</param>
