From e0ae92fa49bd4433b1fa1c790ddae788ea8d97b0 Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Thu, 30 Mar 2017 08:49:19 +0100 Subject: [PATCH] Remove deprecated method from FilesystemUtils. --- src/test/groovy/sdkman/steps/installation_steps.groovy | 6 +++--- src/test/groovy/sdkman/support/FilesystemUtils.groovy | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/test/groovy/sdkman/steps/installation_steps.groovy b/src/test/groovy/sdkman/steps/installation_steps.groovy index ee5ec146..07d8a26e 100644 --- a/src/test/groovy/sdkman/steps/installation_steps.groovy +++ b/src/test/groovy/sdkman/steps/installation_steps.groovy @@ -4,8 +4,8 @@ import java.nio.file.FileSystems import java.nio.file.Files import static cucumber.api.groovy.EN.And +import static sdkman.support.FilesystemUtils.prepareCandidateBinFolder import static sdkman.support.FilesystemUtils.prepareCandidateWithVersionFolder -import static sdkman.support.FilesystemUtils.prepareLocalCandidateWithVersionFolder And(~'^the candidate "([^"]*)" version "([^"]*)" is installed$') { String candidate, String version -> def file = "${candidatesDir}/${candidate}/${version}" as File @@ -47,7 +47,7 @@ And(~'^the candidate "([^"]*)" does not exist locally$') { String candidate -> } And(~'^I have a local candidate "([^"]*)" version "([^"]*)" at "([^"]*)"$') { String candidate, String version, String directory -> - prepareLocalCandidateWithVersionFolder directory, candidate, version + prepareCandidateBinFolder directory, candidate, version } And(~'^the candidate "([^"]*)" version "([^"]*)" is linked to "([^"]*)"$') { String candidate, String version, String directory -> @@ -69,7 +69,7 @@ And(~'^the candidate "([^"]*)" version "([^"]*)" is already linked to "([^"]*)"$ candidateFolder.mkdirs() def link = fileSystem.getPath("$candidatesDir/$candidate/$version") - def target = prepareLocalCandidateWithVersionFolder(folder, candidate, version) + def target = prepareCandidateBinFolder(folder, candidate, version) Files.createSymbolicLink(link, target) } diff --git a/src/test/groovy/sdkman/support/FilesystemUtils.groovy b/src/test/groovy/sdkman/support/FilesystemUtils.groovy index 06b8bcb5..bc5f8218 100644 --- a/src/test/groovy/sdkman/support/FilesystemUtils.groovy +++ b/src/test/groovy/sdkman/support/FilesystemUtils.groovy @@ -32,12 +32,7 @@ class FilesystemUtils { prepareCandidateBinFolder directory, candidate, version } - @Deprecated - static prepareLocalCandidateWithVersionFolder(String baseDir, String candidate, String version){ - prepareCandidateBinFolder baseDir, candidate, version - } - - private static prepareCandidateBinFolder(String folder, String candidate, String version) { + static prepareCandidateBinFolder(String folder, String candidate, String version) { def fileSystem = FileSystems.default def binFolderPath = fileSystem.getPath("$folder/bin")