You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by dm...@apache.org on 2021/12/31 12:42:42 UTC
[tika] branch main updated (5fd2d01 -> 78d180c)
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 5fd2d01 Merge pull request #470 from dameikle/marian_nmt
new 133c53a TIKA-3636: Updated testNoConfig to always run
new 78d180c TIKA-3636: Removed String.format usage as it;s usage failed forbidden-api check
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/tika/language/translate/impl/MarianTranslator.java | 10 +++++-----
.../tika/language/translate/impl/MarianTranslatorTest.java | 10 +++-------
2 files changed, 8 insertions(+), 12 deletions(-)
[tika] 02/02: TIKA-3636: Removed String.format usage as it; s usage failed forbidden-api check
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 78d180c9b1ff89698456e6e1cba845c984d681c9
Author: David Meikle <dm...@apache.org>
AuthorDate: Fri Dec 31 12:42:33 2021 +0000
TIKA-3636: Removed String.format usage as it;s usage failed forbidden-api check
---
.../apache/tika/language/translate/impl/MarianTranslator.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/MarianTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/MarianTranslator.java
index 5faf14c..a98bab7 100644
--- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/MarianTranslator.java
+++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/MarianTranslator.java
@@ -92,8 +92,8 @@ public class MarianTranslator extends AbstractTranslator {
* @throws IOException on any I/O error performing translation.
*/
public String translate(String text, String sourceLanguage, String targetLanguage) throws TikaException, IOException {
- String configPath = config.getProperty(
- String.format("translator.marian.%s_%s.config", sourceLanguage, targetLanguage));
+ String configPath =
+ config.getProperty("translator.marian." + sourceLanguage + "_" + targetLanguage + ".config");
if (!isAvailable(sourceLanguage, targetLanguage)) return text;
@@ -155,7 +155,7 @@ public class MarianTranslator extends AbstractTranslator {
if (!StringUtils.isEmpty(script) && !script.equals("no-script")) {
Path scriptPath = Paths.get(script);
if (!Files.exists(scriptPath) || !Files.isExecutable(scriptPath)) {
- throw new IOException(String.format("Cannot execute configured script at %s",scriptPath));
+ throw new IOException("Cannot execute configured script at " + scriptPath);
}
ProcessBuilder postProcess = new ProcessBuilder();
postProcess.command(script, file.getAbsolutePath());
@@ -203,8 +203,8 @@ public class MarianTranslator extends AbstractTranslator {
* @return
*/
public boolean isAvailable(String sourceLanguage, String targetLanguage) {
- String configPath = config.getProperty(
- String.format("translator.marian.%s_%s.config", sourceLanguage, targetLanguage));
+ String configPath =
+ config.getProperty("translator.marian." + sourceLanguage + "_" + targetLanguage + ".config");
return !marianPath.equals(DEFAULT_PATH) && !StringUtils.isEmpty(configPath);
}
[tika] 01/02: TIKA-3636: Updated testNoConfig to always run
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 133c53a6c882f0490f25c69780664e0e3ea2caef
Author: David Meikle <dm...@apache.org>
AuthorDate: Fri Dec 31 12:41:48 2021 +0000
TIKA-3636: Updated testNoConfig to always run
---
.../tika/language/translate/impl/MarianTranslatorTest.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
index 0fc127a..22afc68 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
@@ -60,14 +60,10 @@ public class MarianTranslatorTest {
@Test
public void testNoConfig() throws Exception {
String source = "Apache Tika is a wonderful tool";
- String expected = "Apache Tika is a wonderful tool";
+ String expected = "Apache Tika is a wonderful tool"; // Pattern from other Translators is to return source
String translated = translator.translate(source, "en", "zz");
- if (translator.isAvailable()) {
- assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
- } else {
- throw new AssumptionViolatedException("Engine not available");
- }
+ assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
+ expected.equalsIgnoreCase(translated));
}
}