diff options
3 files changed, 5 insertions, 3 deletions
diff --git a/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java index 27c23d8d3e6..5893429f5d0 100644 --- a/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/DefaultLanguageDetectorContextGenerator.java @@ -19,14 +19,15 @@ public class DefaultLanguageDetectorContextGenerator extends opennlp.tools.langd } @Override - public String[] getContext(CharSequence document) { + @SuppressWarnings("unchecked") + public <T extends CharSequence> T[] getContext(CharSequence document) { int[] normalized = normalizer.normalize(document).codePoints().map(Character::toLowerCase).toArray(); Set<String> grams = new HashSet<>(); for (int i = 0; i < normalized.length; i++) for (int j = minLength; j <= maxLength && i + j < normalized.length; j++) grams.add(new String(normalized, i, j)); - return grams.toArray(new String[grams.size()]); + return (T[])grams.toArray(new String[grams.size()]); } } diff --git a/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java index d7a7d3a4744..b89e93c9d24 100644 --- a/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java +++ b/opennlp-linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpDetector.java @@ -83,6 +83,7 @@ class OpenNlpDetector implements Detector { return new Detection(detectLanguage(input), UTF_8.name(), false); } + @SuppressWarnings("removal") private Language detectLanguage(String input) { var prediction = detector.probingPredictLanguages(input, config).getLanguages()[0]; var result = prediction.getConfidence() > 0.02 ? languagesByISO3.get(prediction.getLang()) : null; diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 830cba715e1..a646b7cfbc3 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -128,7 +128,7 @@ org.apache.maven.plugin-tools:maven-plugin-annotations:3.9.0 org.apache.maven.plugins:maven-jar-plugin:3.3.0 org.apache.maven.shared:file-management:3.1.0 org.apache.maven.wagon:wagon-provider-api:3.5.3 -org.apache.opennlp:opennlp-tools:1.9.4 +org.apache.opennlp:opennlp-tools:2.3.0 org.apache.velocity:velocity-engine-core:2.3 org.apache.yetus:audience-annotations:0.12.0 org.apache.zookeeper:zookeeper:3.8.0 |