[#360] fix windows path that was screwing remote S3 keys

ICIJ · Mar 6, 2020 · cd99ac8 · cd99ac8
1 parent da40556
commit cd99ac8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/datashare-api/pom.xml b/datashare-api/pom.xml
@@ -24,9 +24,9 @@
             <artifactId>guice</artifactId>
         </dependency>
         <dependency>
-             <groupId>com.google.guava</groupId>
-             <artifactId>guava</artifactId>
-         </dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
 
         <!-- Unidecode -->
         <dependency>
@@ -94,11 +94,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-           <groupId>org.mockito</groupId>
-           <artifactId>mockito-all</artifactId>
-           <version>2.0.2-beta</version>
-           <scope>test</scope>
-       </dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>2.0.2-beta</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-assistedinject</artifactId>

diff --git a/datashare-api/src/main/java/org/icij/datashare/text/nlp/AbstractModels.java b/datashare-api/src/main/java/org/icij/datashare/text/nlp/AbstractModels.java
@@ -97,7 +97,7 @@ protected boolean isPresent(Language language, ClassLoader loader) {
     }
 
     protected void downloadIfNecessary(Language language, ClassLoader loader) {
-        String remoteKey = getModelsFilesystemPath(language).toString();
+        String remoteKey = getModelsFilesystemPath(language).toString().replace("\\", "/");
         RemoteFiles remoteFiles = getRemoteFiles();
         try {
             if (isPresent(language, loader) && remoteFiles.isSync(remoteKey, BASE_DIR.toFile())) {

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
         <datashare-mitie.version>${project.version}</datashare-mitie.version>
         <datashare-ixapipe.version>${project.version}</datashare-ixapipe.version>
         <guice.version>4.1.0</guice.version>
-        <amazon.version>1.11.238</amazon.version>
+        <amazon.version>1.11.327</amazon.version>
 
         <extract.version>3.3.4</extract.version>
         <opennlp.version>1.6.0</opennlp.version>