Rename HCP to SAP

See gh-9747
This commit is contained in:
Benjamin Ihrig
2017-07-13 09:17:47 +02:00
committed by Stephane Nicoll
parent 884e3ecb4b
commit c02d5d52c6
2 changed files with 9 additions and 7 deletions

View File

@@ -54,9 +54,9 @@ public enum CloudPlatform {
},
/**
* SAP Hana Cloud platform.
* SAP Cloud platform.
*/
HCP {
SAP {
@Override
public boolean isActive(Environment environment) {
@@ -67,6 +67,7 @@ public enum CloudPlatform {
/**
* Determines if the platform is active (i.e. the application is running in it).
*
* @param environment the environment
* @return if the platform is active.
*/
@@ -75,6 +76,7 @@ public enum CloudPlatform {
/**
* Returns if the platform is behind a load balancer and uses
* {@literal X-Forwarded-For} headers.
*
* @return if {@literal X-Forwarded-For} headers are used
*/
public boolean isUsingForwardHeaders() {
@@ -83,6 +85,7 @@ public enum CloudPlatform {
/**
* Returns the active {@link CloudPlatform} or {@code null} if one cannot be deduced.
*
* @param environment the environment
* @return the {@link CloudPlatform} or {@code null}
*/

View File

@@ -16,13 +16,12 @@
package org.springframework.boot.cloud;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.springframework.core.env.Environment;
import org.springframework.mock.env.MockEnvironment;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link CloudPlatform}.
*
@@ -72,11 +71,11 @@ public class CloudPlatformTests {
}
@Test
public void getActiveWhenHasHcLandscapeShouldReturnHcp() throws Exception {
public void getActiveWhenHasHcLandscapeShouldReturnSap() throws Exception {
Environment environment = new MockEnvironment().withProperty("HC_LANDSCAPE",
"---");
CloudPlatform platform = CloudPlatform.getActive(environment);
assertThat(platform).isEqualTo(CloudPlatform.HCP);
assertThat(platform).isEqualTo(CloudPlatform.SAP);
assertThat(platform.isActive(environment)).isTrue();
}