diff --git a/src/main/java/de/ozgcloud/admin/Root.java b/src/main/java/de/ozgcloud/admin/Root.java index 8fc3d5966abd999afa09d17b2c555cb4cc0b409d..13af4d82bbccf0c18deac076b9358babd4e9a904 100644 --- a/src/main/java/de/ozgcloud/admin/Root.java +++ b/src/main/java/de/ozgcloud/admin/Root.java @@ -30,7 +30,7 @@ import lombok.Getter; @Getter public class Root { private String javaVersion; - private String buildVersion; + private String version; private Instant buildTime; private String buildNumber; } diff --git a/src/main/java/de/ozgcloud/admin/RootController.java b/src/main/java/de/ozgcloud/admin/RootController.java index 887862e364924be5ce3de9b80bb4c4d2afd5a0a7..54cc0572d94c47f3f141071066fd9bf02e776322 100644 --- a/src/main/java/de/ozgcloud/admin/RootController.java +++ b/src/main/java/de/ozgcloud/admin/RootController.java @@ -48,7 +48,7 @@ public class RootController { return Root.builder() .javaVersion(System.getProperty("java.version")) .buildTime(buildProperties.getTime()) - .buildVersion(buildProperties.getVersion()) + .version(buildProperties.getVersion()) .buildNumber(buildProperties.get("number")) .build(); } diff --git a/src/test/java/de/ozgcloud/admin/RootControllerTest.java b/src/test/java/de/ozgcloud/admin/RootControllerTest.java index 88e2bb4aada0d7fd5b28034dd77b3254f5e127d3..9401253fa33c9dd7a7b61a0efc32816dee8ee5c9 100644 --- a/src/test/java/de/ozgcloud/admin/RootControllerTest.java +++ b/src/test/java/de/ozgcloud/admin/RootControllerTest.java @@ -90,7 +90,7 @@ class RootControllerTest { ResultActions result = doRequest(); - result.andExpect(jsonPath("$.buildVersion").value(RootTestFactory.BUILD_VERSION)); + result.andExpect(jsonPath("$.version").value(RootTestFactory.BUILD_VERSION)); } @Test diff --git a/src/test/java/de/ozgcloud/admin/RootTestFactory.java b/src/test/java/de/ozgcloud/admin/RootTestFactory.java index e4a77201b527061485a7dcf7d567dfa161f73f7b..4c0312d9a9014b860c7ef9739245d5c012b1c61e 100644 --- a/src/test/java/de/ozgcloud/admin/RootTestFactory.java +++ b/src/test/java/de/ozgcloud/admin/RootTestFactory.java @@ -40,7 +40,7 @@ public class RootTestFactory { return Root.builder() .buildTime(BUILD_TIME) .javaVersion(JAVA_VERSION) - .buildVersion(BUILD_VERSION) + .version(BUILD_VERSION) .buildNumber(BUILD_NUMBER); } }