From ba669ab6a57b0a4462280d10fa503be3ba4b4bf4 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 2 Apr 2024 13:51:16 +0200
Subject: [PATCH] adjust naming buildVersion -> version
---
src/main/java/de/ozgcloud/admin/Root.java | 2 +-
src/main/java/de/ozgcloud/admin/RootController.java | 2 +-
src/test/java/de/ozgcloud/admin/RootControllerTest.java | 2 +-
src/test/java/de/ozgcloud/admin/RootTestFactory.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/ozgcloud/admin/Root.java b/src/main/java/de/ozgcloud/admin/Root.java
index 8fc3d596..13af4d82 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 887862e3..54cc0572 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 88e2bb4a..9401253f 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 e4a77201..4c0312d9 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);
}
}
--
GitLab