Remove deprecated method from FilesystemUtils.

This commit is contained in:
Marco Vermeulen
2017-03-30 08:49:19 +01:00
parent 929e392616
commit e0ae92fa49
2 changed files with 4 additions and 9 deletions

View File

@@ -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)
}

View File

@@ -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")