Spring/spring-credhub
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add methods to check for version 2.0 vs 2.1.

Browse Source
This commit is contained in:
Scott Frederick
2019-02-11 09:23:14 -06:00
parent 2927213a8d
commit 940917cb1c
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-credhub-core/src/main/java/org/springframework/credhub/support/info/VersionInfo.java
View File

@@ -66,4 +66,22 @@ public class VersionInfo {
public boolean isVersion2() {
return this.version.startsWith("2.");
}
/**
* Determine if the CredHub server implements the v2.0 API.
*
* @return {@code true} if the server implements the CredHub v2.1 API; {@code false} otherwise
*/
public boolean isVersion2_0() {
return this.version.startsWith("2.0");
}
/**
* Determine if the CredHub server implements the v2.1 API.
*
* @return {@code true} if the server implements the CredHub v2.1 API; {@code false} otherwise
*/
public boolean isVersion2_1() {
return this.version.startsWith("2.1");
}
}

21
spring-credhub-core/src/test/java/org/springframework/credhub/support/info/VersionInfoTests.java
View File

@@ -33,10 +33,12 @@ public class VersionInfoTests extends JsonParsingUnitTestsBase {
assertThat(versionInfo.getVersion()).isEqualTo("1.9.0");
assertThat(versionInfo.isVersion1()).isTrue();
assertThat(versionInfo.isVersion2()).isFalse();
assertThat(versionInfo.isVersion2_0()).isFalse();
assertThat(versionInfo.isVersion2_1()).isFalse();
}
@Test
public void deserializeWithV2() {
public void deserializeWithV2_0() {
String json = "{\n" +
" \"version\": \"2.0.2\"\n" +
"}";
@@ -46,5 +48,22 @@ public class VersionInfoTests extends JsonParsingUnitTestsBase {
assertThat(versionInfo.getVersion()).isEqualTo("2.0.2");
assertThat(versionInfo.isVersion1()).isFalse();
assertThat(versionInfo.isVersion2()).isTrue();
assertThat(versionInfo.isVersion2_0()).isTrue();
assertThat(versionInfo.isVersion2_1()).isFalse();
}
@Test
public void deserializeWithV2_1() {
String json = "{\n" +
" \"version\": \"2.1.2\"\n" +
"}";
VersionInfo versionInfo = parseResponse(json, VersionInfo.class);
assertThat(versionInfo.getVersion()).isEqualTo("2.1.2");
assertThat(versionInfo.isVersion1()).isFalse();
assertThat(versionInfo.isVersion2()).isTrue();
assertThat(versionInfo.isVersion2_0()).isFalse();
assertThat(versionInfo.isVersion2_1()).isTrue();
}
}