[grid] Only using asset storage paths if they are available [skip ci]

Author: diemol

java/server/src/org/openqa/selenium/grid/docker/DockerSessionAssetsPath.java

@@ -19,6 +19,7 @@
 
 import org.openqa.selenium.remote.SessionId;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -39,24 +40,20 @@ public DockerSessionAssetsPath(String hostAssetsPath, String containerAssetsPath
     this.containerAssetsPath = containerAssetsPath;
   }
 
-  public Optional<Path> createHostSessionAssetsPath(SessionId id) {
-    return createSessionAssetsPath(this.hostAssetsPath, id);
+  public String getHostSessionAssetsPath(SessionId id) {
+    return this.hostAssetsPath + File.separator + id;
   }
 
   public Optional<Path> createContainerSessionAssetsPath(SessionId id) {
-    return createSessionAssetsPath(this.containerAssetsPath, id);
-  }
-
-  private Optional<Path> createSessionAssetsPath(String assetsPath, SessionId id) {
-    if (assetsPath == null || assetsPath.isEmpty()) {
+    if (this.containerAssetsPath == null || this.containerAssetsPath.isEmpty()) {
       return Optional.empty();
     }
     try {
-      return Optional.of(Files.createDirectories(Paths.get(assetsPath, id.toString())));
+      return Optional.of(Files.createDirectories(Paths.get(this.containerAssetsPath, id.toString())));
     } catch (IOException e) {
       LOG.log(Level.WARNING,
               "Failed to create path to store session assets, no assets will be stored: " +
-              assetsPath, e);
+              this.containerAssetsPath, e);
     }
     return Optional.empty();
   }

java/server/src/org/openqa/selenium/grid/docker/DockerSessionFactory.java

@@ -208,17 +208,17 @@ public Optional<ActiveSession> apply(CreateSessionRequest sessionRequest) {
 
       SessionId id = new SessionId(response.getSessionId());
       Capabilities capabilities = new ImmutableCapabilities((Map<?, ?>) response.getValue());
-      Optional<Path> containerAssetsPath = assetsPath.createContainerSessionAssetsPath(id);
-      containerAssetsPath.ifPresent(path -> saveSessionCapabilities(capabilities, path));
       Container videoContainer = null;
-      if (isVideoRecordingAvailable && recordVideoForSession(capabilities)) {
-        Map<String, String> envVars = getVideoContainerEnvVars(
-          capabilities,
-          containerInfo.getIp());
-        Optional<Path> hostAssetsPath = assetsPath.createHostSessionAssetsPath(id);
-        if (hostAssetsPath.isPresent()) {
+      if (isVideoRecordingAvailable) {
+        Optional<Path> containerAssetsPath = assetsPath.createContainerSessionAssetsPath(id);
+        containerAssetsPath.ifPresent(path -> saveSessionCapabilities(capabilities, path));
+        if (containerAssetsPath.isPresent() && recordVideoForSession(capabilities)) {
+          Map<String, String> envVars = getVideoContainerEnvVars(
+            capabilities,
+            containerInfo.getIp());
+          String hostAssetsPath = assetsPath.getHostSessionAssetsPath(id);
           Map<String, String> volumeBinds =
-            Collections.singletonMap(hostAssetsPath.get().toString(), "/videos");
+            Collections.singletonMap(hostAssetsPath, "/videos");
           videoContainer = docker.create(image(videoImage).env(envVars).bind(volumeBinds));
           videoContainer.start();
           LOG.info(String.format("Video container started (id: %s)", videoContainer.getId()));