#7780: removing File.separator

twosigma · Sep 18, 2018 · 7bd324a · 7bd324a
1 parent dbc261b
commit 7bd324a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/kernel/magic/command/MavenJarResolver.java b/kernel/base/src/main/java/com/twosigma/beakerx/kernel/magic/command/MavenJarResolver.java
@@ -24,6 +24,7 @@
 import org.apache.maven.shared.invoker.*;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -158,9 +159,9 @@ private Map<String, Path> jarsFromRepo() {
   private List<String> mavenBuildClasspath() {
     String jarPathsAsString = null;
     try {
-      String absolutePath = new File(pathToMavenRepo).getAbsolutePath() + File.separator + MAVEN_BUILT_CLASSPATH_FILE_NAME;
-      InputStream isPaths = Files.newInputStream(Paths.get(absolutePath));
-      jarPathsAsString = IOUtils.toString(isPaths, StandardCharsets.UTF_8);
+      File fileToClasspath = new File(pathToMavenRepo, MAVEN_BUILT_CLASSPATH_FILE_NAME);
+      InputStream fileInputStream = new FileInputStream(fileToClasspath);
+      jarPathsAsString = IOUtils.toString(fileInputStream, StandardCharsets.UTF_8);
     } catch (IOException e) {
       throw new RuntimeException(e);
     }

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/kernel/magic/command/PomFactory.java b/kernel/base/src/main/java/com/twosigma/beakerx/kernel/magic/command/PomFactory.java
@@ -41,10 +41,10 @@ public String createPom(Params params) throws IOException {
   }
 
   private String configureBuildClasspathPlugin(String pathToMavenRepo, String mavenBuiltClasspathFileName, String pomAsString) {
-    String absolutePath = new File(pathToMavenRepo).getAbsolutePath();
+    String absolutePath = new File(pathToMavenRepo, mavenBuiltClasspathFileName).getAbsolutePath();
     return pomAsString.replace(
             "<outputFile>mavenBuiltClasspathFile</outputFile>",
-            "<outputFile>" + absolutePath + File.separator +mavenBuiltClasspathFileName + "</outputFile>");
+            "<outputFile>" + absolutePath + "</outputFile>");
   }
 
   private String configureGoal(String goal, String pomAsString) {