This is an automated email from the ASF dual-hosted git repository.
mawiesne pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opennlp-addons.git
The following commit(s) were added to refs/heads/main by this push:
new 2dfd945 Bump org.apache.lucene to version 8.11.4 in
geoentitylinker-addon (#85)
2dfd945 is described below
commit 2dfd945a68366a458f2a342ced7c842ca6ff2b10
Author: Martin Wiesner <[email protected]>
AuthorDate: Mon May 26 14:25:50 2025 +0200
Bump org.apache.lucene to version 8.11.4 in geoentitylinker-addon (#85)
- adds missing @Override where applicable
- optimizes ordering of imports along the path
---
geoentitylinker-addon/pom.xml | 2 +-
.../opennlp/addons/geoentitylinker/GeoEntityLinker.java | 5 ++---
.../addons/modelbuilder/impls/GenericModelableImpl.java | 10 ++++------
.../cmdline/builder/XMLDictionaryToTableTool.java | 13 ++++++-------
4 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/geoentitylinker-addon/pom.xml b/geoentitylinker-addon/pom.xml
index ae0da35..f3b1a5d 100644
--- a/geoentitylinker-addon/pom.xml
+++ b/geoentitylinker-addon/pom.xml
@@ -34,7 +34,7 @@
<name>Apache OpenNLP GeoentityLinker Addon</name>
<properties>
- <lucene.version>7.7.3</lucene.version>
+ <lucene.version>8.11.4</lucene.version>
<spatial4j.version>0.5</spatial4j.version>
</properties>
diff --git
a/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java
b/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java
index 769bbbc..7c67aba 100644
---
a/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java
+++
b/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/GeoEntityLinker.java
@@ -30,10 +30,10 @@ import
opennlp.addons.geoentitylinker.scoring.ModelBasedScorer;
import opennlp.addons.geoentitylinker.scoring.PlacetypeScorer;
import opennlp.addons.geoentitylinker.scoring.ProvinceProximityScorer;
import opennlp.tools.entitylinker.BaseLink;
+import opennlp.tools.entitylinker.EntityLinker;
+import opennlp.tools.entitylinker.EntityLinkerProperties;
import opennlp.tools.entitylinker.LinkedSpan;
import opennlp.tools.util.Span;
-import opennlp.tools.entitylinker.EntityLinkerProperties;
-import opennlp.tools.entitylinker.EntityLinker;
/**
* Links location entities to the USGS and GeoNames gazetteers, and uses
several
@@ -113,7 +113,6 @@ public class GeoEntityLinker implements
EntityLinker<LinkedSpan<BaseLink>> {
if (!scorers.isEmpty()) {
for (LinkedEntityScorer<? extends BaseLink, AdminBoundaryContext> scorer
: scorers) {
- @SuppressWarnings("rawtypes")
LinkedEntityScorer<BaseLink, AdminBoundaryContext> s =
(LinkedEntityScorer) scorer;
s.score(spans, doctext, sentences, linkerProperties, context);
}
diff --git
a/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/GenericModelableImpl.java
b/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/GenericModelableImpl.java
index 2630bc4..b58af17 100644
---
a/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/GenericModelableImpl.java
+++
b/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/GenericModelableImpl.java
@@ -28,21 +28,20 @@ import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import opennlp.addons.modelbuilder.Modelable;
-import opennlp.tools.namefind.TokenNameFinderFactory;
-import opennlp.tools.util.MarkableFileInputStreamFactory;
+import opennlp.addons.modelbuilder.Modelable;
import opennlp.tools.namefind.NameFinderME;
import opennlp.tools.namefind.NameSample;
import opennlp.tools.namefind.NameSampleDataStream;
+import opennlp.tools.namefind.TokenNameFinderFactory;
import opennlp.tools.namefind.TokenNameFinderModel;
-
+import opennlp.tools.util.MarkableFileInputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
import opennlp.tools.util.TrainingParameters;
/**
- * Creates annotations, writes annotations to file, and creates a model and
writes to a file
+ * Creates annotations, writes annotations to file, and creates a model and
writes to a file.
*/
public class GenericModelableImpl implements Modelable {
@@ -95,7 +94,6 @@ public class GenericModelableImpl implements Modelable {
TokenNameFinderModel model;
model = NameFinderME.train("en", entityType, sampleStream,
TrainingParameters.defaultParams(), new
TokenNameFinderFactory());
- sampleStream.close();
model.serialize(modelOut);
System.out.println("\tmodel generated");
} catch (Exception e) {
diff --git
a/morfologik-addon/src/main/java/opennlp/morfologik/cmdline/builder/XMLDictionaryToTableTool.java
b/morfologik-addon/src/main/java/opennlp/morfologik/cmdline/builder/XMLDictionaryToTableTool.java
index c53a4b8..77e33bc 100644
---
a/morfologik-addon/src/main/java/opennlp/morfologik/cmdline/builder/XMLDictionaryToTableTool.java
+++
b/morfologik-addon/src/main/java/opennlp/morfologik/cmdline/builder/XMLDictionaryToTableTool.java
@@ -40,14 +40,17 @@ public class XMLDictionaryToTableTool extends
BasicCmdLineTool {
private String SEPARATOR;
+ @Override
public String getShortDescription() {
return "reads an OpenNLP XML tag dictionary and outputs it in a tab
separated file";
}
+ @Override
public String getHelp() {
return getBasicHelp(Params.class);
}
+ @Override
public void run(String[] args) {
Params params = validateAndParseParams(args, Params.class);
@@ -80,7 +83,7 @@ public class XMLDictionaryToTableTool extends
BasicCmdLineTool {
}
}
}
- writer.close();
+ writer.flush();
System.out.println("Created dictionary: " + dictOutFile.toPath());
} catch (IOException e) {
throw new TerminateToolException(-1, "Error while writing output: "
@@ -106,21 +109,17 @@ public class XMLDictionaryToTableTool extends
BasicCmdLineTool {
private boolean valid(String word, String tag) {
if(word.contains(SEPARATOR) || tag.contains(SEPARATOR)) {
- System.out
- .println("Warn: invalid entry because contains separator - word: "
+ System.out.println("Warn: invalid entry because contains separator -
word: "
+ word + " tag: " + tag);
return false;
}
-
return true;
}
private String createEntry(String word, String tag) {
String entry = SEPARATOR +// base
- word + SEPARATOR +
- tag;
-
+ word + SEPARATOR + tag;
return entry;
}
