From 36788730b01586fa470d75d4c77055087fd889f6 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Fri, 4 Nov 2016 18:11:28 +0000
Subject: [PATCH] Cut validation over to new candidate validation endpoint.

---
 src/main/bash/sdkman-env-helpers.sh            |  2 +-
 src/test/groovy/sdkman/steps/stub_steps.groovy | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/bash/sdkman-env-helpers.sh b/src/main/bash/sdkman-env-helpers.sh
index a2164445..93df0a45 100644
--- a/src/main/bash/sdkman-env-helpers.sh
+++ b/src/main/bash/sdkman-env-helpers.sh
@@ -62,7 +62,7 @@ function __sdkman_determine_version {
 		VERSION=$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/default")
 
 	else
-		local validation_url="${SDKMAN_LEGACY_API}/candidates/${candidate}/${version}/$(echo $SDKMAN_PLATFORM | tr '[:upper:]' '[:lower:]')"
+		local validation_url="${SDKMAN_CURRENT_API}/candidates/validate/${candidate}/${version}/$(echo $SDKMAN_PLATFORM | tr '[:upper:]' '[:lower:]')"
 		VERSION_VALID=$(__sdkman_secure_curl "$validation_url")
 		__sdkman_echo_debug "Validate $candidate $version for $SDKMAN_PLATFORM: $VERSION_VALID"
 		__sdkman_echo_debug "Validation URL: $validation_url"
diff --git a/src/test/groovy/sdkman/steps/stub_steps.groovy b/src/test/groovy/sdkman/steps/stub_steps.groovy
index 70f884ff..2d19091f 100644
--- a/src/test/groovy/sdkman/steps/stub_steps.groovy
+++ b/src/test/groovy/sdkman/steps/stub_steps.groovy
@@ -18,25 +18,25 @@ And(~'^an available selfupdate$') { ->
 }
 
 And(~'^the candidate "([^"]*)" version "([^"]*)" is available for download$') { String candidate, String version ->
-    primeEndpointWithString("/candidates/${candidate}/${version}/${PLATFORM}", "valid")
+    primeEndpointWithString("/candidates/validate/${candidate}/${version}/${PLATFORM}", "valid")
     primeDownloadFor(SERVICE_UP_URL, candidate, version, PLATFORM)
     primeEndpointWithString("/hooks/post/${candidate}/${version}/${PLATFORM}", 'mv $binary_input $zip_output') //bash command
 }
 
 And(~'^the candidate "([^"]*)" version "([^"]*)" is not available for download$') { String candidate, String version ->
-    primeEndpointWithString("/candidates/${candidate}/${version}/${PLATFORM}", "invalid")
+    primeEndpointWithString("/candidates/validate/${candidate}/${version}/${PLATFORM}", "invalid")
 }
 
 And(~/^the candidate "(.*?)" version "(.*?)" is available for download on "(.*?)"$/) { String candidate, String version, String platform ->
     String lowerCaseUname = UnixUtils.asUname(platform).toLowerCase()
-    primeEndpointWithString("/candidates/${candidate}/${version}/${lowerCaseUname}", "valid")
+    primeEndpointWithString("/candidates/validate/${candidate}/${version}/${lowerCaseUname}", "valid")
     primeEndpointWithString("/hooks/post/${candidate}/${version}/${lowerCaseUname}", 'mv $binary_input $zip_output') //bash command
     primeDownloadFor(SERVICE_UP_URL, candidate, version, lowerCaseUname)
 }
 
 And(~/^the candidate "(.*?)" version "(.*?)" is not available for download on "(.*?)"$/) { String candidate, String version, String platform ->
     String lowerCaseUname = UnixUtils.asUname(platform).toLowerCase()
-    primeEndpointWithString("/candidates/${candidate}/${version}/${lowerCaseUname}", "invalid")
+    primeEndpointWithString("/candidates/validate/${candidate}/${version}/${lowerCaseUname}", "invalid")
 }
 
 And(~'^a "([^"]*)" list view is available for consumption$') { String candidate ->
@@ -44,11 +44,11 @@ And(~'^a "([^"]*)" list view is available for consumption$') { String candidate
 }
 
 And(~'^the candidate "([^"]*)" version "([^"]*)" is a valid candidate version$') { String candidate, String version ->
-    primeEndpointWithString("/candidates/${candidate}/${version}/${PLATFORM}", "valid")
+    primeEndpointWithString("/candidates/validate/${candidate}/${version}/${PLATFORM}", "valid")
 }
 
 And(~'^the candidate "([^"]*)" version "([^"]*)" is not a valid candidate version$') { String candidate, String version ->
-    primeEndpointWithString("/candidates/${candidate}/${version}/${PLATFORM}", "invalid")
+    primeEndpointWithString("/candidates/validate/${candidate}/${version}/${PLATFORM}", "invalid")
 }
 
 And(~/^the candidate "(.*?)" has a version list available$/) { String candidate ->