Rename current to candidates api.

build.gradle

@@ -58,8 +58,8 @@ task prepareScripts(type: Copy) {
     include '**/*'
     filter(ReplaceTokens, tokens:
             [
-                    SDKMAN_VERSION    : sdkmanCliBuildVersion,
-                    SDKMAN_CURRENT_API: config.sdkmanCurrentApi
+                    SDKMAN_VERSION: sdkmanCliBuildVersion,
+                    SDKMAN_CANDIDATES_API: config.candidatesApi
             ]
     )
 }

config.groovy

@@ -1,9 +1,9 @@
 sdkmanCliVersion = 'master'
 environments {
     local {
-        sdkmanCurrentApi = 'http://localhost:8080/2'
+        candidatesApi = 'http://localhost:8080/2'
     }
     production {
-        sdkmanCurrentApi = 'https://api.sdkman.io/2'
+        candidatesApi = 'https://api.sdkman.io/2'
     }
 }

src/main/bash/sdkman-availability.sh

@@ -26,7 +26,7 @@ function __sdkman_determine_broadcast_id {
 	if [[ "$SDKMAN_OFFLINE_MODE" == "true" || "$COMMAND" == "offline" && "$QUALIFIER" == "enable" ]]; then
 		echo ""
 	else
-		echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CURRENT_API}/broadcast/latest/id")
+		echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CANDIDATES_API}/broadcast/latest/id")
 	fi
 }
 
@@ -87,7 +87,7 @@ function __sdkman_update_broadcast {
 
 		echo "$broadcast_live_id" > "$broadcast_id_file"
 
-		BROADCAST_LIVE_TEXT=$(__sdkman_secure_curl "${SDKMAN_CURRENT_API}/broadcast/latest")
+		BROADCAST_LIVE_TEXT=$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/broadcast/latest")
 		echo "$BROADCAST_LIVE_TEXT" > "$broadcast_text_file"
 		if [[ "$COMMAND" != "broadcast" ]]; then
 			__sdkman_echo_cyan "$BROADCAST_LIVE_TEXT"

src/main/bash/sdkman-cache.sh

@@ -48,10 +48,10 @@ function ___sdkman_check_version_cache {
 		__sdkman_echo_debug "Version cache needs updating..."
 		if [[ "$sdkman_beta_channel" == "true" ]]; then
 			__sdkman_echo_debug "Refreshing version cache with BETA version."
-			version_url="${SDKMAN_CURRENT_API}/broker/download/sdkman/version/beta"
+			version_url="${SDKMAN_CANDIDATES_API}/broker/download/sdkman/version/beta"
 		else
 			__sdkman_echo_debug "Refreshing version cache with STABLE version."
-			version_url="${SDKMAN_CURRENT_API}/broker/download/sdkman/version/stable"
+			version_url="${SDKMAN_CANDIDATES_API}/broker/download/sdkman/version/stable"
 		fi
 
 		SDKMAN_REMOTE_VERSION=$(__sdkman_secure_curl_with_timeouts "$version_url")

src/main/bash/sdkman-env-helpers.sh

@@ -61,10 +61,10 @@ function __sdkman_determine_version {
 
 	else
 		if [[ -z "$version" ]]; then
-			version=$(__sdkman_secure_curl "${SDKMAN_CURRENT_API}/candidates/default/${candidate}")
+			version=$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/default/${candidate}")
 		fi
 
-		local validation_url="${SDKMAN_CURRENT_API}/candidates/validate/${candidate}/${version}/$(echo $SDKMAN_PLATFORM | tr '[:upper:]' '[:lower:]')"
+		local validation_url="${SDKMAN_CANDIDATES_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"

src/main/bash/sdkman-init.sh

@@ -30,8 +30,8 @@ if [ -z "$SDKMAN_VERSION" ]; then
 	export SDKMAN_VERSION="@SDKMAN_VERSION@"
 fi
 
-if [ -z "$SDKMAN_CURRENT_API" ]; then
-	export SDKMAN_CURRENT_API="@SDKMAN_CURRENT_API@"
+if [ -z "$SDKMAN_CANDIDATES_API" ]; then
+	export SDKMAN_CANDIDATES_API="@SDKMAN_CANDIDATES_API@"
 fi
 
 if [ -z "$SDKMAN_DIR" ]; then

src/main/bash/sdkman-install.sh

@@ -123,14 +123,14 @@ function __sdkman_download {
 	if [ ! -f "${archives_folder}/${candidate}-${version}.zip" ]; then
 
 		local platform_parameter="$(echo $SDKMAN_PLATFORM | tr '[:upper:]' '[:lower:]')"
-		local download_url="${SDKMAN_CURRENT_API}/broker/download/${candidate}/${version}/${platform_parameter}"
+		local download_url="${SDKMAN_CANDIDATES_API}/broker/download/${candidate}/${version}/${platform_parameter}"
 		local base_name="$(head /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
 		local zip_archive_target="${SDKMAN_DIR}/archives/${candidate}-${version}.zip"
 
 		#pre-installation hook: implements function __sdkman_pre_installation_hook
 		local pre_installation_hook="${SDKMAN_DIR}/tmp/hook_pre_${candidate}_${version}.sh"
-		__sdkman_echo_debug "Get pre-installation hook: ${SDKMAN_CURRENT_API}/hooks/pre/${candidate}/${version}/${platform_parameter}"
-		__sdkman_secure_curl "${SDKMAN_CURRENT_API}/hooks/pre/${candidate}/${version}/${platform_parameter}" > "$pre_installation_hook"
+		__sdkman_echo_debug "Get pre-installation hook: ${SDKMAN_CANDIDATES_API}/hooks/pre/${candidate}/${version}/${platform_parameter}"
+		__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/hooks/pre/${candidate}/${version}/${platform_parameter}" > "$pre_installation_hook"
 		__sdkman_echo_debug "Copy remote pre-installation hook: $pre_installation_hook"
 		source "$pre_installation_hook"
 		__sdkman_pre_installation_hook || return 1
@@ -152,8 +152,8 @@ function __sdkman_download {
 		#post-installation hook: implements function __sdkman_post_installation_hook
 		#responsible for taking `binary_input` and producing `zip_output`
 		local post_installation_hook="${SDKMAN_DIR}/tmp/hook_post_${candidate}_${version}.sh"
-		__sdkman_echo_debug "Get post-installation hook: ${SDKMAN_CURRENT_API}/hooks/post/${candidate}/${version}/${platform_parameter}"
-		__sdkman_secure_curl "${SDKMAN_CURRENT_API}/hooks/post/${candidate}/${version}/${platform_parameter}" > "$post_installation_hook"
+		__sdkman_echo_debug "Get post-installation hook: ${SDKMAN_CANDIDATES_API}/hooks/post/${candidate}/${version}/${platform_parameter}"
+		__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/hooks/post/${candidate}/${version}/${platform_parameter}" > "$post_installation_hook"
 		__sdkman_echo_debug "Copy remote pre-installation hook: $pre_installation_hook"
 		source "$post_installation_hook"
 		__sdkman_post_installation_hook || return 1

src/main/bash/sdkman-list.sh

@@ -30,7 +30,7 @@ function __sdkman_list_candidates {
 	if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then
 		__sdkman_echo_red "This command is not available while offline."
 	else
-		__sdkman_page echo "$(__sdkman_secure_curl "${SDKMAN_CURRENT_API}/candidates/list")"
+		__sdkman_page echo "$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/list")"
 	fi
 }
 
@@ -44,7 +44,7 @@ function __sdkman_list_versions {
 	if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then
 		__sdkman_offline_list "$candidate" "$versions_csv"
 	else
-		__sdkman_echo_no_colour "$(__sdkman_secure_curl "${SDKMAN_CURRENT_API}/candidates/${candidate}/${SDKMAN_PLATFORM}/versions/list?current=${CURRENT}&installed=${versions_csv}")"
+		__sdkman_echo_no_colour "$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/${candidate}/${SDKMAN_PLATFORM}/versions/list?current=${CURRENT}&installed=${versions_csv}")"
 	fi
 }
 

src/main/bash/sdkman-selfupdate.sh

@@ -29,7 +29,7 @@ function __sdk_selfupdate {
 	else
 		export sdkman_debug_mode
 		export sdkman_beta_channel
-		__sdkman_secure_curl "${SDKMAN_CURRENT_API}/selfupdate?beta=${sdkman_beta_channel}" | bash
+		__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/selfupdate?beta=${sdkman_beta_channel}" | bash
 	fi
 	unset SDKMAN_FORCE_SELFUPDATE
 }

src/main/bash/sdkman-update.sh

@@ -17,7 +17,7 @@
 #
 
 function __sdk_update {
-	local candidates_uri="${SDKMAN_CURRENT_API}/candidates/all"
+	local candidates_uri="${SDKMAN_CANDIDATES_API}/candidates/all"
 	__sdkman_echo_debug "Using candidates endpoint: $candidates_uri"
 
 	local fresh_candidates_csv=$(__sdkman_secure_curl_with_timeouts "$candidates_uri")

src/main/bash/sdkman-upgrade.sh

@@ -94,7 +94,7 @@ function __sdkman_determine_upgradable_version {
 	fi
 
 	# Resolve remote default version
-	remote_default_version="$(__sdkman_secure_curl "${SDKMAN_CURRENT_API}/candidates/default/${candidate}")"
+	remote_default_version="$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/default/${candidate}")"
 	if [ -z "$remote_default_version" ]; then
 		return 2
 	fi

src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy

@@ -16,7 +16,7 @@ class SdkmanBashEnvBuilder {
     private List candidates = ['groovy', 'grails', 'java']
     private boolean offlineMode = false
     private String broadcast = "This is a LIVE broadcast!"
-    private String currentService = "http://localhost:8080/2"
+    private String candidatesApi = "http://localhost:8080/2"
     private String sdkmanVersion = "5.0.0"
     private String jdkHome = "/path/to/my/jdk"
     private String httpProxy
@@ -62,8 +62,8 @@ class SdkmanBashEnvBuilder {
         this
     }
 
-    SdkmanBashEnvBuilder withCurrentService(String service) {
-        this.currentService = service
+    SdkmanBashEnvBuilder withCandidatesApi(String service) {
+        this.candidatesApi = service
         this
     }
 
@@ -113,7 +113,7 @@ class SdkmanBashEnvBuilder {
                 SDKMAN_DIR           : sdkmanDir.absolutePath,
                 SDKMAN_CANDIDATES_DIR: sdkmanCandidatesDir.absolutePath,
                 SDKMAN_OFFLINE_MODE  : "$offlineMode",
-                SDKMAN_CURRENT_API   : currentService,
+                SDKMAN_CANDIDATES_API           : candidatesApi,
                 SDKMAN_VERSION       : sdkmanVersion,
                 sdkman_debug_mode    : 'true',
                 JAVA_HOME            : jdkHome

src/test/groovy/sdkman/specs/BetaChannelBootstrapSpec.groovy

@@ -5,9 +5,9 @@ import sdkman.support.SdkmanEnvSpecification
 class BetaChannelBootstrapSpec extends SdkmanEnvSpecification {
 
     static final TWO_DAYS_AGO = System.currentTimeMillis() - (48 * 60 * 60 * 1000)
-    static final CURRENT_API = "http://localhost:8080/2"
-    static final CLI_STABLE_ENDPOINT = "$CURRENT_API/broker/download/sdkman/version/stable"
-    static final CLI_BETA_ENDPOINT = "$CURRENT_API/broker/download/sdkman/version/beta"
+    static final CANDIDATES_API = "http://localhost:8080/2"
+    static final CLI_STABLE_ENDPOINT = "$CANDIDATES_API/broker/download/sdkman/version/stable"
+    static final CLI_BETA_ENDPOINT = "$CANDIDATES_API/broker/download/sdkman/version/beta"
 
     File versionCache
 

src/test/groovy/sdkman/specs/CandidatesCacheUpdateSpec.groovy

@@ -4,10 +4,10 @@ import sdkman.support.SdkmanEnvSpecification
 
 class CandidatesCacheUpdateSpec extends SdkmanEnvSpecification {
 
-    static final CURRENT_API = "http://localhost:8080/2"
+    static final CANDIDATES_API = "http://localhost:8080/2"
 
-    static final BROADCAST_API_LATEST_ID_ENDPOINT = "$CURRENT_API/broadcast/latest/id"
-    static final CANDIDATES_ALL_ENDPOINT = "$CURRENT_API/candidates/all"
+    static final BROADCAST_API_LATEST_ID_ENDPOINT = "$CANDIDATES_API/broadcast/latest/id"
+    static final CANDIDATES_ALL_ENDPOINT = "$CANDIDATES_API/candidates/all"
 
     File candidatesCache
 

src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy

@@ -8,8 +8,8 @@ import static java.nio.file.Files.createSymbolicLink
 
 class CurrentCommandSpec extends SdkmanEnvSpecification {
 
-    static final CURRENT_API = "http://localhost:8080/2"
-    static final BROADCAST_API_LATEST_ID_ENDPOINT = "$CURRENT_API/broadcast/latest/id"
+    static final CANDIDATES_API = "http://localhost:8080/2"
+    static final BROADCAST_API_LATEST_ID_ENDPOINT = "$CANDIDATES_API/broadcast/latest/id"
 
     def setup() {
         curlStub.primeWith(BROADCAST_API_LATEST_ID_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")

src/test/groovy/sdkman/specs/VersionCacheBootstrapSpec.groovy

@@ -8,10 +8,10 @@ class VersionCacheBootstrapSpec extends SdkmanEnvSpecification {
 
     static final MORE_THAN_A_DAY_IN_MILLIS = 24 * 61 * 60 * 1000
 
-    static final CURRENT_API = "http://localhost:8080/2"
-    static final CLI_VERSION_STABLE_ENDPOINT = "$CURRENT_API/broker/download/sdkman/version/stable"
-    static final CLI_VERSION_BETA_ENDPOINT = "$CURRENT_API/broker/download/sdkman/version/beta"
-    static final CANDIDATES_ENDPOINT = "$CURRENT_API/candidates"
+    static final CANDIDATES_API = "http://localhost:8080/2"
+    static final CLI_VERSION_STABLE_ENDPOINT = "$CANDIDATES_API/broker/download/sdkman/version/stable"
+    static final CLI_VERSION_BETA_ENDPOINT = "$CANDIDATES_API/broker/download/sdkman/version/beta"
+    static final CANDIDATES_ENDPOINT = "$CANDIDATES_API/candidates"
 
     File versionCache
 

src/test/groovy/sdkman/steps/initialisation_steps.groovy

@@ -91,7 +91,7 @@ And(~'^a machine with "(.*)" installed$') { String platform ->
 And(~'^an initialised environment$') {->
     bash = SdkmanBashEnvBuilder.create(sdkmanBaseDir)
         .withOfflineMode(offlineMode)
-        .withCurrentService(serviceUrlEnv)
+        .withCandidatesApi(serviceUrlEnv)
         .withJdkHome(javaHome)
         .withHttpProxy(HTTP_PROXY)
         .withVersionCache(sdkmanVersion)
@@ -103,7 +103,7 @@ And(~'^an initialised environment$') {->
 And(~'^an outdated initialised environment$') {->
     bash = SdkmanBashEnvBuilder.create(sdkmanBaseDir)
         .withOfflineMode(offlineMode)
-        .withCurrentService(serviceUrlEnv)
+        .withCandidatesApi(serviceUrlEnv)
         .withJdkHome(javaHome)
         .withHttpProxy(HTTP_PROXY)
         .withVersionCache(sdkmanVersionOutdated)