[hotfix][tests] Remove optional usage

spotify · Nov 15, 2019 · 4d033ce · 4d033ce
1 parent 04aabae
commit 4d033ce
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/...-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/FlinkDistribution.java b/...-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/FlinkDistribution.java
@@ -67,7 +67,7 @@ public final class FlinkDistribution implements ExternalResource {
 
  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
- private final Optional<Path> logBackupDir;
+ private final Path logBackupDir;
 
  private final TemporaryFolder temporaryFolder = new TemporaryFolder();
 
@@ -86,9 +86,7 @@ public FlinkDistribution() {
  Assert.fail("The distDir property was not set. You can set it when running maven via -DdistDir=<path> .");
  }
  final String backupDirProperty = System.getProperty("logBackupDir");
- logBackupDir = backupDirProperty == null
- ? Optional.empty()
- : Optional.of(Paths.get(backupDirProperty));
+ logBackupDir = backupDirProperty == null ? null : Paths.get(backupDirProperty);
  originalFlinkDir = Paths.get(distDirProperty);
  }
 
@@ -123,16 +121,16 @@ public void afterTestSuccess() {
 
  @Override
  public void afterTestFailure() {
- logBackupDir.ifPresent(backupLocation -> {
+ if (logBackupDir != null) {
  final UUID id = UUID.randomUUID();
- LOG.info("Backing up logs to {}/{}.", backupLocation, id);
+ LOG.info("Backing up logs to {}/{}.", logBackupDir, id);
  try {
- Files.createDirectories(backupLocation);
- FileUtils.copyDirectory(log.toFile(), backupLocation.resolve(id.toString()).toFile());
+ Files.createDirectories(logBackupDir);
+ FileUtils.copyDirectory(log.toFile(), logBackupDir.resolve(id.toString()).toFile());
  } catch (IOException e) {
  LOG.warn("An error occurred while backing up logs.", e);
  }
- });
+ }
 
  afterTestSuccess();
  }